You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/04/10 13:52:48 UTC
svn commit: r1586273 - in /qpid/trunk/qpid/java: broker-core/pom.xml
broker/src/main/assembly/NOTICE
broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
resources/java-binary-release/NOTICE
Author: robbie
Date: Thu Apr 10 11:52:47 2014
New Revision: 1586273
URL: http://svn.apache.org/r1586273
Log:
QPID-5676, QPID-5677, QPID-5048: go back to using the original BCEL dependency, update dependency related info accordingly
Modified:
qpid/trunk/qpid/java/broker-core/pom.xml
qpid/trunk/qpid/java/broker/src/main/assembly/NOTICE
qpid/trunk/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
qpid/trunk/qpid/java/resources/java-binary-release/NOTICE
Modified: qpid/trunk/qpid/java/broker-core/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/pom.xml?rev=1586273&r1=1586272&r2=1586273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-core/pom.xml Thu Apr 10 11:52:47 2014
@@ -81,8 +81,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/trunk/qpid/java/broker/src/main/assembly/NOTICE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/assembly/NOTICE?rev=1586273&r1=1586272&r2=1586273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/assembly/NOTICE (original)
+++ qpid/trunk/qpid/java/broker/src/main/assembly/NOTICE Thu Apr 10 11:52:47 2014
@@ -91,7 +91,3 @@ Copyright 2007 The Apache Software Found
###############################################
-Apache ServiceMix
-Copyright 2005-2011 The Apache Software Foundation
-
-###############################################
Modified: qpid/trunk/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1586273&r1=1586272&r2=1586273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (original)
+++ qpid/trunk/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Thu Apr 10 11:52:47 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/trunk/qpid/java/resources/java-binary-release/NOTICE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/resources/java-binary-release/NOTICE?rev=1586273&r1=1586272&r2=1586273&view=diff
==============================================================================
--- qpid/trunk/qpid/java/resources/java-binary-release/NOTICE (original)
+++ qpid/trunk/qpid/java/resources/java-binary-release/NOTICE Thu Apr 10 11:52:47 2014
@@ -111,10 +111,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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org