Author: robbie
Date: Sun Apr 13 14:12:54 2014
New Revision: 1586998
URL: http://svn.apache.org/r1586998
Log:
QPID-5676, QPID-5677, QPID-5048: go back to using the original BCEL dependency,
update dependency related info accordingly
merge from trunk r1586273
Modified:
qpid/branches/0.28/qpid/java/broker-core/pom.xml
qpid/branches/0.28/qpid/java/broker/src/main/assembly/NOTICE
qpid/branches/0.28/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
qpid/branches/0.28/qpid/java/resources/java-binary-release/NOTICE
Modified: qpid/branches/0.28/qpid/java/broker-core/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/java/broker-core/pom.xml?rev=1586998&r1=1586997&r2=1586998&view=diff
==============================================================================
--- qpid/branches/0.28/qpid/java/broker-core/pom.xml (original)
+++ qpid/branches/0.28/qpid/java/broker-core/pom.xml Sun Apr 13 14:12:54 2014
@@ -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. -->
Modified: qpid/branches/0.28/qpid/java/broker/src/main/assembly/NOTICE
URL:
http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/java/broker/src/main/assembly/NOTICE?rev=1586998&r1=1586997&r2=1586998&view=diff
==============================================================================
--- qpid/branches/0.28/qpid/java/broker/src/main/assembly/NOTICE (original)
+++ qpid/branches/0.28/qpid/java/broker/src/main/assembly/NOTICE Sun Apr 13
14:12:54 2014
@@ -91,7 +91,3 @@ Copyright 2007 The Apache Software Found
###############################################
-Apache ServiceMix
-Copyright 2005-2011 The Apache Software Foundation
-
-###############################################
Modified:
qpid/branches/0.28/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL:
http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1586998&r1=1586997&r2=1586998&view=diff
==============================================================================
---
qpid/branches/0.28/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
(original)
+++
qpid/branches/0.28/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
Sun Apr 13 14:12:54 2014
@@ -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' (
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
Modified: qpid/branches/0.28/qpid/java/resources/java-binary-release/NOTICE
URL:
http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/java/resources/java-binary-release/NOTICE?rev=1586998&r1=1586997&r2=1586998&view=diff
==============================================================================
--- qpid/branches/0.28/qpid/java/resources/java-binary-release/NOTICE (original)
+++ qpid/branches/0.28/qpid/java/resources/java-binary-release/NOTICE Sun Apr
13 14:12:54 2014
@@ -116,10 +116,7 @@ Copyright 2007 The Apache Software Found
###############################################
-Apache ServiceMix
-Copyright 2005-2011 The Apache Software Foundation
-
-###############################################
-
Apache Geronimo JMS 1.1 Spec
Copyright 2003-2008 The Apache Software Foundation
+
+###############################################
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
