diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-08-20 10:17:26 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-08-20 10:17:26 +0000 |
| commit | 82389047ae804c4740b06e7f90eddb4fb1106ad4 (patch) | |
| tree | feed17c283d5d8c446c9cf8d43171f3ec7760f22 /qpid/java | |
| parent | 0a8364aeb6fd44519bb2887f2628f08297f1591f (diff) | |
| download | qpid-python-82389047ae804c4740b06e7f90eddb4fb1106ad4.tar.gz | |
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.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619065 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/broker/pom.xml | 7 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/qpid/java/broker/pom.xml b/qpid/java/broker/pom.xml index 0a0b63ea06..d561df2bb1 100644 --- a/qpid/java/broker/pom.xml +++ b/qpid/java/broker/pom.xml @@ -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> diff --git a/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index eb080385e5..a50f17aea0 100644 --- a/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -62,6 +62,8 @@ From: 'Mort Bay Consulting' (http://www.mortbay.com) 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' (http://www.apache.org/) 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 |