summaryrefslogtreecommitdiff
path: root/qpid/java/broker
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2014-04-10 11:52:47 +0000
committerRobert Gemmell <robbie@apache.org>2014-04-10 11:52:47 +0000
commit113040bb168f4bcd9aaeeeecae38f0510093aca4 (patch)
tree411365cc5d2124795dc25bc0107b86b68b032733 /qpid/java/broker
parent83b53840f665b76d6d58a29d0580b7837107daf9 (diff)
downloadqpid-python-113040bb168f4bcd9aaeeeecae38f0510093aca4.tar.gz
QPID-5676, QPID-5677, QPID-5048: go back to using the original BCEL dependency, update dependency related info accordingly
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586273 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
-rw-r--r--qpid/java/broker/src/main/assembly/NOTICE4
-rw-r--r--qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE4
2 files changed, 2 insertions, 6 deletions
diff --git a/qpid/java/broker/src/main/assembly/NOTICE b/qpid/java/broker/src/main/assembly/NOTICE
index 40ed809f89..6950a91fb3 100644
--- a/qpid/java/broker/src/main/assembly/NOTICE
+++ b/qpid/java/broker/src/main/assembly/NOTICE
@@ -91,7 +91,3 @@ Copyright 2007 The Apache Software Foundation
###############################################
-Apache ServiceMix
-Copyright 2005-2011 The Apache Software Foundation
-
-###############################################
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 7f02b1cb5b..866ff6c1ec 100644
--- a/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -26,6 +26,8 @@
From: 'an unknown organization'
- Guava: Google Core Libraries for Java (http://code.google.com/p/guava-libraries/guava) com.google.guava:guava:bundle:14.0.1
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - bcel org.apache.bcel:bcel:jar:5.2
+
- CryptoJS (http://webjars.org) org.webjars:cryptojs:jar:3.1.2
License: New BSD (http://opensource.org/licenses/BSD-3-Clause)
@@ -118,8 +120,6 @@ 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 Management Common (http://qpid.apache.org/qpid-java-build/management/qpid-management-common) org.apache.qpid:qpid-management-common:jar
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Apache ServiceMix :: Bundles :: bcel (http://servicemix.apache.org/bundles-pom/org.apache.servicemix.bundles.bcel/) org.apache.servicemix.bundles:org.apache.servicemix.bundles.bcel:bundle:5.2_4
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'The Dojo Foundation' (http://dojotoolkit.org/foundation)
- Dojo Toolkit :: Bundles (http://dojotoolkit.org) org.dojotoolkit:dojo:pom:1.9.1