svn commit: r1586272 - in /qpid/trunk/qpid/java: build.deps ivy.retrieve.xml lib/poms/bcel-5.2.xml lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml

[ro...@apache.org]

Author: robbie
Date: Thu Apr 10 11:50:41 2014
New Revision: 1586272

URL: http://svn.apache.org/r1586272
Log:
QPID-5676: revert r1586026, taking a different approach to equalise the builds

Added:
    qpid/trunk/qpid/java/lib/poms/bcel-5.2.xml
      - copied, changed from r1586157, qpid/trunk/qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml
Removed:
    qpid/trunk/qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml
Modified:
    qpid/trunk/qpid/java/build.deps
    qpid/trunk/qpid/java/ivy.retrieve.xml

Modified: qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1586272&r1=1586271&r2=1586272&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Thu Apr 10 11:50:41 2014
@@ -24,7 +24,7 @@ commons-collections=lib/required/commons
 commons-lang=lib/required/commons-lang-2.6.jar
 commons-logging=lib/required/commons-logging-1.1.1.jar
 
-bcel=lib/required/org.apache.servicemix.bundles.bcel-5.2_4.jar
+bcel=lib/required/bcel-5.2.jar
 
 derby-db=lib/required/derby-10.8.2.2.jar
 

Modified: qpid/trunk/qpid/java/ivy.retrieve.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivy.retrieve.xml?rev=1586272&r1=1586271&r2=1586272&view=diff
==============================================================================
--- qpid/trunk/qpid/java/ivy.retrieve.xml (original)
+++ qpid/trunk/qpid/java/ivy.retrieve.xml Thu Apr 10 11:50:41 2014
@@ -40,7 +40,7 @@
     <dependency org="commons-collections" name="commons-collections" rev="3.2.1" transitive="false"/>
     <dependency org="commons-lang" name="commons-lang" rev="2.6" transitive="false"/>
     <dependency org="commons-logging" name="commons-logging" rev="1.1.1" transitive="false"/>
-    <dependency org="org.apache.servicemix.bundles" name="org.apache.servicemix.bundles.bcel" rev="5.2_4" transitive="false"/>
+    <dependency org="org.apache.bcel" name="bcel" rev="5.2" transitive="false"/>
     <dependency org="org.apache.derby" name="derby" rev="10.8.2.2" transitive="false"/>
     <dependency org="org.apache.geronimo.framework" name="geronimo-kernel" rev="2.2.1" transitive="false"/>
     <dependency org="org.apache.geronimo.specs" name="geronimo-ejb_3.0_spec" rev="1.0.1" transitive="false"/>

Copied: qpid/trunk/qpid/java/lib/poms/bcel-5.2.xml (from r1586157, qpid/trunk/qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/bcel-5.2.xml?p2=qpid/trunk/qpid/java/lib/poms/bcel-5.2.xml&p1=qpid/trunk/qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml&r1=1586157&r2=1586272&rev=1586272&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/bcel-5.2.xml Thu Apr 10 11:50:41 2014
@@ -16,9 +16,9 @@
    limitations under the License.
 -->
 <dep>
-  <groupId>org.apache.servicemix.bundles</groupId>
-  <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
-  <version>5.2_4</version>
+  <groupId>org.apache.bcel</groupId>
+  <artifactId>bcel</artifactId>
+  <version>5.2</version>
   <exclusions>
     <exclusion>
       <!--  Qpid doesn't require BCEL InstructionFinder, so does not need jakarta-regexp. -->



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org