qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject svn commit: r1619095 - in /qpid/branches/0.30/qpid/java: ./ broker/pom.xml broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
Date Wed, 20 Aug 2014 13:05:11 GMT
Author: robbie
Date: Wed Aug 20 13:05:10 2014
New Revision: 1619095

URL: http://svn.apache.org/r1619095
Log:
QPID-6023: make the broker module depend on the 1.0 websocket plugin, thus adding it to the
brokers binary release assembly.

The license and notice files for the broker assembly already have relevant Jetty entries,
no change needed for the additional dependency.

merge from trunk r1619065

Modified:
    qpid/branches/0.30/qpid/java/   (props changed)
    qpid/branches/0.30/qpid/java/broker/pom.xml
    qpid/branches/0.30/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE

Propchange: qpid/branches/0.30/qpid/java/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java:r1619065

Modified: qpid/branches/0.30/qpid/java/broker/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker/pom.xml?rev=1619095&r1=1619094&r2=1619095&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker/pom.xml (original)
+++ qpid/branches/0.30/qpid/java/broker/pom.xml Wed Aug 20 13:05:10 2014
@@ -148,6 +148,13 @@
       <scope>runtime</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>qpid-broker-plugins-websocket</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+
     <!-- optional modules -->
     <dependency>
       <groupId>org.apache.qpid</groupId>

Modified: qpid/branches/0.30/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1619095&r1=1619094&r2=1619095&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
(original)
+++ qpid/branches/0.30/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
Wed Aug 20 13:05:10 2014
@@ -62,6 +62,8 @@ From: 'Mort Bay Consulting' (http://www.
     License: Apache Software License - Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0)
   License: Eclipse Public License - Version 1.0  (http://www.eclipse.org/org/documents/epl-v10.php)
   - Jetty :: Utilities (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-util:jar:8.1.14.v20131031
     License: Apache Software License - Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0)
   License: Eclipse Public License - Version 1.0  (http://www.eclipse.org/org/documents/epl-v10.php)
+  - Jetty :: Websocket (http://www.eclipse.org/jetty) org.eclipse.jetty:jetty-websocket:jar:8.1.14.v20131031
+    License: Apache Software License - Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0)
   License: Eclipse Public License - Version 1.0  (http://www.eclipse.org/org/documents/epl-v10.php)
 
 From: 'QOS.ch' (http://www.qos.ch)
   - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.6.4
@@ -114,6 +116,8 @@ From: 'The Apache Software Foundation' (
     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
   - Qpid Memory Message Store Broker Plug-in (http://qpid.apache.org/qpid-java-build/broker-plugins/qpid-broker-plugins-memory-store)
org.apache.qpid:qpid-broker-plugins-memory-store:jar
     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Qpid WebSocket Broker Plug-in (http://qpid.apache.org/qpid-java-build/broker-plugins/qpid-broker-plugins-websocket)
org.apache.qpid:qpid-broker-plugins-websocket:jar
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
   - Qpid Common (http://qpid.apache.org/qpid-java-build/management/qpid-common) org.apache.qpid:qpid-common:jar
     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
   - Qpid Management Common (http://qpid.apache.org/qpid-java-build/management/qpid-management-common)
org.apache.qpid:qpid-management-common:jar



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message