diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-04-10 11:50:41 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-04-10 11:50:41 +0000 |
| commit | 83b53840f665b76d6d58a29d0580b7837107daf9 (patch) | |
| tree | f06937f068f57047207c6352a90bbff71327024a /qpid/java | |
| parent | b33dec1a97a28ceeda0e5877dbfef494cd5b21bf (diff) | |
| download | qpid-python-83b53840f665b76d6d58a29d0580b7837107daf9.tar.gz | |
QPID-5676: revert r1586026, taking a different approach to equalise the builds
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586272 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/build.deps | 2 | ||||
| -rw-r--r-- | qpid/java/ivy.retrieve.xml | 2 | ||||
| -rw-r--r-- | qpid/java/lib/poms/bcel-5.2.xml (renamed from qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml) | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qpid/java/build.deps b/qpid/java/build.deps index c28a220638..0e0250e09c 100644 --- a/qpid/java/build.deps +++ b/qpid/java/build.deps @@ -24,7 +24,7 @@ commons-collections=lib/required/commons-collections-3.2.1.jar 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 diff --git a/qpid/java/ivy.retrieve.xml b/qpid/java/ivy.retrieve.xml index bb67ea46e7..388f184997 100644 --- a/qpid/java/ivy.retrieve.xml +++ b/qpid/java/ivy.retrieve.xml @@ -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"/> diff --git a/qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml b/qpid/java/lib/poms/bcel-5.2.xml index 247b9b2004..09d404adf2 100644 --- a/qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml +++ b/qpid/java/lib/poms/bcel-5.2.xml @@ -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. --> |