From b44486a078a94d5f9acc4e7f4d88825471af91bc Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Mon, 17 Mar 2014 17:04:23 +0000
Subject: QPID-5624: Remove commons-config etc as broker dependency

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1578465 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/broker-core/pom.xml                    | 33 +-----------------------
 qpid/java/broker-plugins/management-jmx/pom.xml  |  7 +++++
 qpid/java/build.deps                             | 15 +++++------
 qpid/java/ivy.retrieve.xml                       |  2 --
 qpid/java/lib/poms/commons-configuration-1.8.xml | 22 ----------------
 qpid/java/lib/poms/commons-digester-1.8.1.xml    | 28 --------------------
 6 files changed, 14 insertions(+), 93 deletions(-)
 delete mode 100644 qpid/java/lib/poms/commons-configuration-1.8.xml
 delete mode 100644 qpid/java/lib/poms/commons-digester-1.8.1.xml

(limited to 'qpid/java')

diff --git a/qpid/java/broker-core/pom.xml b/qpid/java/broker-core/pom.xml
index a26e781da4..fa51ad0b7d 100644
--- a/qpid/java/broker-core/pom.xml
+++ b/qpid/java/broker-core/pom.xml
@@ -60,28 +60,7 @@
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-beanutils</groupId>
-          <artifactId>commons-beanutils</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
+   <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>
@@ -91,16 +70,6 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-configuration</groupId>
-      <artifactId>commons-configuration</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-core-asl</artifactId>
diff --git a/qpid/java/broker-plugins/management-jmx/pom.xml b/qpid/java/broker-plugins/management-jmx/pom.xml
index 0f04f393c5..c253b4d75d 100644
--- a/qpid/java/broker-plugins/management-jmx/pom.xml
+++ b/qpid/java/broker-plugins/management-jmx/pom.xml
@@ -55,6 +55,13 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index 0aa35954bf..f4496ce8ab 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -21,8 +21,6 @@ commons-beanutils-core=lib/required/commons-beanutils-core-1.8.3.jar
 commons-cli=lib/required/commons-cli-1.2.jar
 commons-codec=lib/required/commons-codec-1.6.jar
 commons-collections=lib/required/commons-collections-3.2.1.jar
-commons-configuration=lib/required/commons-configuration-1.8.jar
-commons-digester=lib/required/commons-digester-1.8.1.jar
 commons-lang=lib/required/commons-lang-2.6.jar
 commons-logging=lib/required/commons-logging-1.1.1.jar
 
@@ -65,8 +63,7 @@ dojo=lib/required/dojo-${dojo-version}.zip
 jackson-core=lib/required/jackson-core-asl-1.9.0.jar
 jackson-mapper=lib/required/jackson-mapper-asl-1.9.0.jar
 
-commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
-  ${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}
+commons.libs = ${commons-codec} ${commons-lang} 
 
 common.libs=${slf4j-api}
 client.libs=${geronimo-jms}
@@ -75,20 +72,20 @@ amqp-1-0-client.libs=
 amqp-1-0-client-example.libs=${commons-cli}
 amqp-1-0-client-jms.libs=${geronimo-jms}
 amqp-1-0-client-websocket.libs = ${jetty} ${jetty-continuation} ${jetty-security} ${jetty-http} ${jetty-io} ${jetty-servlet} ${jetty-util} ${servlet-api} ${jetty-websocket}
-tools.libs=${commons-configuration.libs} ${log4j}
+tools.libs=${commons.libs} ${log4j}
 broker-core.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \
-    ${xalan} ${derby-db} ${commons-configuration.libs} \
+    ${xalan} ${derby-db} ${commons.libs} \
     ${jackson-core} ${jackson-mapper} ${jetty} ${jetty-continuation} ${jetty-security} ${jetty-http} ${jetty-io} ${jetty-servlet} ${jetty-util} ${servlet-api} ${jetty-websocket} ${bcel}
 
 #Borrow the broker-core libs, hack for release binary generation
 broker.libs=${broker-core.libs}
 
 broker-plugins-management-http.libs=${dojo}
-broker-plugins.libs=${log4j} ${commons-configuration.libs}
+broker-plugins.libs=${log4j} ${commons.libs}
 
 test.libs=${slf4j-log4j} ${log4j} ${junit} ${slf4j-api} ${mockito-all}
 
-perftests.libs=${geronimo-jms} ${slf4j-api} ${log4j} ${slf4j-log4j} ${commons-logging} ${commons-collections} ${commons-beanutils-core} ${commons-lang} ${gson-all} ${derby-db}
+perftests.libs=${geronimo-jms} ${slf4j-api} ${log4j} ${slf4j-log4j} ${commons-logging} ${commons-beanutils-core} ${commons-lang} ${commons-collections} ${gson-all} ${derby-db}
 
 management-common.libs=
 
@@ -105,7 +102,7 @@ qpid-test-utils.libs = ${test.libs} ${geronimo-jms}
 broker-plugins-access-control.test.libs=${test.libs}
 broker-plugins-management-amqp.test.libs=${test.libs}
 broker-plugins-management-http.test.libs=${test.libs}
-broker-plugins-management-jmx.test.libs=${test.libs}
+broker-plugins-management-jmx.test.libs=${commons-beanutils-core} ${test.libs}
 broker-plugins-jdbc-store.test.libs=${test.libs}
 broker-plugins-derby-store.test.libs=${test.libs}
 broker-plugins-memory-store.test.libs=${test.libs}
diff --git a/qpid/java/ivy.retrieve.xml b/qpid/java/ivy.retrieve.xml
index 59b3fa70af..dcb97fcf9f 100644
--- a/qpid/java/ivy.retrieve.xml
+++ b/qpid/java/ivy.retrieve.xml
@@ -38,8 +38,6 @@
     <dependency org="commons-cli" name="commons-cli" rev="1.2" transitive="false"/>
     <dependency org="commons-codec" name="commons-codec" rev="1.6" transitive="false"/>
     <dependency org="commons-collections" name="commons-collections" rev="3.2.1" transitive="false"/>
-    <dependency org="commons-configuration" name="commons-configuration" rev="1.8" transitive="false"/>
-    <dependency org="commons-digester" name="commons-digester" rev="1.8.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"/>
diff --git a/qpid/java/lib/poms/commons-configuration-1.8.xml b/qpid/java/lib/poms/commons-configuration-1.8.xml
deleted file mode 100644
index 337b9d0993..0000000000
--- a/qpid/java/lib/poms/commons-configuration-1.8.xml
+++ /dev/null
@@ -1,22 +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>commons-configuration</groupId>
-  <artifactId>commons-configuration</artifactId>
-  <version>1.8</version>
-</dep>
diff --git a/qpid/java/lib/poms/commons-digester-1.8.1.xml b/qpid/java/lib/poms/commons-digester-1.8.1.xml
deleted file mode 100644
index 56b38bf778..0000000000
--- a/qpid/java/lib/poms/commons-digester-1.8.1.xml
+++ /dev/null
@@ -1,28 +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>commons-digester</groupId>
-  <artifactId>commons-digester</artifactId>
-  <version>1.8.1</version>
-  <exclusions>
-    <exclusion>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-    </exclusion>
-  </exclusions>
-</dep>
-- 
cgit v1.2.1