diff options
| author | Robert Gemmell <robbie@apache.org = robbie = Robert Gemmell robbie@apache.org@apache.org> | 2014-04-13 14:12:54 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org = robbie = Robert Gemmell robbie@apache.org@apache.org> | 2014-04-13 14:12:54 +0000 |
| commit | d7d571683dc08a486b84fb71923100ea7b1bfe8d (patch) | |
| tree | bfe2381da7f1f7647f22daa400bbe14b954ea636 | |
| parent | 66ae5ca004bfe0d3a56065e003aa92437f9f7342 (diff) | |
| download | qpid-python-d7d571683dc08a486b84fb71923100ea7b1bfe8d.tar.gz | |
QPID-5676, QPID-5677, QPID-5048: go back to using the original BCEL dependency, update dependency related info accordingly
merge from trunk r1586273
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.28@1586998 13f79535-47bb-0310-9956-ffa450edef68
4 files changed, 6 insertions, 13 deletions
diff --git a/qpid/java/broker-core/pom.xml b/qpid/java/broker-core/pom.xml index a26e781da4..a78c2eba30 100644 --- a/qpid/java/broker-core/pom.xml +++ b/qpid/java/broker-core/pom.xml @@ -112,8 +112,8 @@ </dependency> <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.bcel</artifactId> + <groupId>org.apache.bcel</groupId> + <artifactId>bcel</artifactId> <exclusions> <exclusion> <!-- Qpid doesn't require BCEL InstructionFinder, so does not need jakarta-regexp. --> 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 diff --git a/qpid/java/resources/java-binary-release/NOTICE b/qpid/java/resources/java-binary-release/NOTICE index 8c86b0662c..4e549fd730 100644 --- a/qpid/java/resources/java-binary-release/NOTICE +++ b/qpid/java/resources/java-binary-release/NOTICE @@ -116,10 +116,7 @@ Copyright 2007 The Apache Software Foundation ############################################### -Apache ServiceMix -Copyright 2005-2011 The Apache Software Foundation - -############################################### - Apache Geronimo JMS 1.1 Spec Copyright 2003-2008 The Apache Software Foundation + +############################################### |