From 0edba07432f8cce9eb41fb936dde8ea4604143c1 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Wed, 9 Apr 2014 16:40:02 +0000
Subject: QPID-5676: update BCEL dependency in the Ant build to match previous
 change for the maven build

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586026 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/build.deps                               |  2 +-
 qpid/java/ivy.retrieve.xml                         |  2 +-
 qpid/java/lib/poms/bcel-5.2.xml                    | 29 ----------------------
 .../org.apache.servicemix.bundles.bcel-5.2_4.xml   | 29 ++++++++++++++++++++++
 4 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 qpid/java/lib/poms/bcel-5.2.xml
 create mode 100644 qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml

(limited to 'qpid/java')

diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index c93c055cd1..75b9c8f050 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/bcel-5.2.jar
+bcel=lib/required/org.apache.servicemix.bundles.bcel-5.2_4.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 671e31ae33..11ec22c5dd 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.bcel" name="bcel" rev="5.2" transitive="false"/>
+    <dependency org="org.apache.servicemix.bundles" name="org.apache.servicemix.bundles.bcel" rev="5.2_4" 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/bcel-5.2.xml b/qpid/java/lib/poms/bcel-5.2.xml
deleted file mode 100644
index 09d404adf2..0000000000
--- a/qpid/java/lib/poms/bcel-5.2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <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. -->
-      <groupId>jakarta-regexp</groupId>
-      <artifactId>jakarta-regexp</artifactId>
-    </exclusion>
-  </exclusions>
-</dep>
diff --git a/qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml b/qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml
new file mode 100644
index 0000000000..247b9b2004
--- /dev/null
+++ b/qpid/java/lib/poms/org.apache.servicemix.bundles.bcel-5.2_4.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>org.apache.servicemix.bundles</groupId>
+  <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
+  <version>5.2_4</version>
+  <exclusions>
+    <exclusion>
+      <!--  Qpid doesn't require BCEL InstructionFinder, so does not need jakarta-regexp. -->
+      <groupId>jakarta-regexp</groupId>
+      <artifactId>jakarta-regexp</artifactId>
+    </exclusion>
+  </exclusions>
+</dep>
-- 
cgit v1.2.1