diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-04-05 15:28:49 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-04-05 15:28:49 +0000 |
| commit | a563ea78ca5cb45948fc143dc7f21415ca7cd5a2 (patch) | |
| tree | 3d0a57e25575121358f660e9fe55d718c7f933c8 /qpid/java/broker-plugins | |
| parent | 7344c8879c319c4ca6ab57963e6147d878a4e154 (diff) | |
| download | qpid-python-a563ea78ca5cb45948fc143dc7f21415ca7cd5a2.tar.gz | |
QPID-5048: add dependency change verifcation reference files and LICENSE, NOTICE & README files for use in the binary release assemblies
Work by me and Andrew MacBean <andymacbean@gmail.com>.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585102 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
| -rw-r--r-- | qpid/java/broker-plugins/management-http/pom.xml | 6 | ||||
| -rw-r--r-- | qpid/java/broker-plugins/websocket/pom.xml | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/qpid/java/broker-plugins/management-http/pom.xml b/qpid/java/broker-plugins/management-http/pom.xml index afb295f7cd..a2128d587a 100644 --- a/qpid/java/broker-plugins/management-http/pom.xml +++ b/qpid/java/broker-plugins/management-http/pom.xml @@ -55,6 +55,12 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/qpid/java/broker-plugins/websocket/pom.xml b/qpid/java/broker-plugins/websocket/pom.xml index 49e08c94ec..c60945119d 100644 --- a/qpid/java/broker-plugins/websocket/pom.xml +++ b/qpid/java/broker-plugins/websocket/pom.xml @@ -45,6 +45,12 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> |