NO-JIRA: update dependencies to match trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/dep_removal@1335832 13f79535-47bb-0310-9956-ffa450edef68

16 files changed, 37 insertions, 36 deletions

diff --git a/.gitignore b/.gitignore
index 86140ce21f..6d9f0ffdd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,7 @@ generated/
 target
 classes
 qpid/java/lib/*.jar
+qpid/java/lib/required
 qpid/java/lib/bdbstore
 qpid/java/lib/cobertura
 qpid/java/lib/findbugs
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index 46027d02c6..8ed87ec9be 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
@@ -280,7 +280,7 @@ public class ServerConfiguration extends ConfigurationPlugin
     @SuppressWarnings("unchecked")
     protected void setupVirtualHosts(Configuration conf) throws ConfigurationException
     {
-        List<String> vhostFiles = conf.getList("virtualhosts");
+        List<String> vhostFiles = (List) conf.getList("virtualhosts");
         Configuration vhostConfig = conf.subset("virtualhosts");
 
         // Only one configuration mechanism allowed
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
index b5d70d9200..8b6551262d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
@@ -165,8 +165,8 @@ public class PrincipalDatabaseAuthenticationManager implements AuthenticationMan
   
         public Map<String,String> getPdClassAttributeMap() throws ConfigurationException
         {
-            final List<String> argumentNames = getConfig().getList("principal-database.attributes.attribute.name");
-            final List<String> argumentValues = getConfig().getList("principal-database.attributes.attribute.value");
+            final List<String> argumentNames = (List) getConfig().getList("principal-database.attributes.attribute.name");
+            final List<String> argumentValues = (List) getConfig().getList("principal-database.attributes.attribute.value");
             final Map<String,String> attributes = new HashMap<String,String>(argumentNames.size());
 
             for (int i = 0; i < argumentNames.size(); i++)
diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index cb32c2a801..518d3e2ce9 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -17,16 +17,16 @@
 # under the License.
 #
 
-commons-beanutils-core=lib/required/commons-beanutils-core-1.8.0.jar
-commons-cli=lib/required/commons-cli-1.0.jar
-commons-codec=lib/required/commons-codec-1.3.jar
-commons-collections=lib/required/commons-collections-3.2.jar
-commons-configuration=lib/required/commons-configuration-1.6.jar
+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.2.jar
-commons-logging=lib/required/commons-logging-1.0.4.jar
+commons-lang=lib/required/commons-lang-2.6.jar
+commons-logging=lib/required/commons-logging-1.1.1.jar
 
-derby-db=lib/required/derby-10.6.1.0.jar
+derby-db=lib/required/derby-10.8.2.2.jar
 
 geronimo-jms=lib/required/geronimo-jms_1.1_spec-1.0.jar
 geronimo-j2ee=lib/required/geronimo-j2ee-connector_1.5_spec-2.0.0.jar
@@ -40,10 +40,10 @@ mockito-all=lib/required/mockito-all-1.9.0.jar
 
 gson-all=lib/required/gson-2.0.jar
 
-log4j=lib/required/log4j-1.2.12.jar
+log4j=lib/required/log4j-1.2.16.jar
 
-slf4j-api=lib/required/slf4j-api-1.6.1.jar
-slf4j-log4j=lib/required/slf4j-log4j12-1.6.1.jar
+slf4j-api=lib/required/slf4j-api-1.6.4.jar
+slf4j-log4j=lib/required/slf4j-log4j12-1.6.4.jar
 
 xalan=lib/required/xalan-2.7.0.jar
 
diff --git a/qpid/java/ivy.retrieve.xml b/qpid/java/ivy.retrieve.xml
index 3ce1e3b837..de72c9614b 100644
--- a/qpid/java/ivy.retrieve.xml
+++ b/qpid/java/ivy.retrieve.xml
@@ -28,15 +28,15 @@
 
   <dependencies>
     <dependency org="biz.aQute" name="bnd" rev="0.0.384" transitive="false"/>
-    <dependency org="commons-beanutils" name="commons-beanutils-core" rev="1.8.0" transitive="false"/>
-    <dependency org="commons-cli" name="commons-cli" rev="1.0" transitive="false"/>
-    <dependency org="commons-codec" name="commons-codec" rev="1.3" transitive="false"/>
-    <dependency org="commons-collections" name="commons-collections" rev="3.2" transitive="false"/>
-    <dependency org="commons-configuration" name="commons-configuration" rev="1.6" transitive="false"/>
+    <dependency org="commons-beanutils" name="commons-beanutils-core" rev="1.8.3" transitive="false"/>
+    <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.2" transitive="false"/>
-    <dependency org="commons-logging" name="commons-logging" rev="1.0.4" transitive="false"/>
-    <dependency org="org.apache.derby" name="derby" rev="10.6.1.0" 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.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"/>
     <dependency org="org.apache.geronimo.specs" name="geronimo-j2ee-connector_1.5_spec" rev="2.0.0" transitive="false"/>
@@ -49,12 +49,12 @@
     <dependency org="net.java.dev.javacc" name="javacc" rev="5.0" transitive="false"/>
     <dependency org="junit" name="junit" rev="3.8.1" transitive="false"/>
     <dependency org="org.python" name="jython-standalone" rev="2.5.2" transitive="false"/>
-    <dependency org="log4j" name="log4j" rev="1.2.12" transitive="false"/>
+    <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false"/>
     <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.1.1" transitive="false"/>
     <dependency org="org.mockito" name="mockito-all" rev="1.9.0" transitive="false"/>
     <dependency org="org.apache.felix" name="org.apache.felix.main" rev="2.0.5" transitive="false"/>
-    <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" transitive="false"/>
-    <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
+    <dependency org="org.slf4j" name="slf4j-api" rev="1.6.4" transitive="false"/>
+    <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.4" transitive="false"/>
     <dependency org="xalan" name="xalan" rev="2.7.0" transitive="false"/>
   </dependencies>
 </ivy-module>
diff --git a/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml b/qpid/java/lib/poms/commons-beanutils-core-1.8.3.xml
index 612b45e1a6..10d664fca8 100644
--- a/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml
+++ b/qpid/java/lib/poms/commons-beanutils-core-1.8.3.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>commons-beanutils</groupId>
   <artifactId>commons-beanutils-core</artifactId>
-  <version>1.8.0</version>
+  <version>1.8.3</version>
 </dep>
diff --git a/qpid/java/lib/poms/commons-cli-1.0.xml b/qpid/java/lib/poms/commons-cli-1.2.xml
index 77b47f63f1..5b4f0e35d7 100644
--- a/qpid/java/lib/poms/commons-cli-1.0.xml
+++ b/qpid/java/lib/poms/commons-cli-1.2.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>commons-cli</groupId>
   <artifactId>commons-cli</artifactId>
-  <version>1.0</version>
+  <version>1.2</version>
 </dep>
diff --git a/qpid/java/lib/poms/commons-codec-1.3.xml b/qpid/java/lib/poms/commons-codec-1.6.xml
index 772ff6ab71..95f6f24aa2 100644
--- a/qpid/java/lib/poms/commons-codec-1.3.xml
+++ b/qpid/java/lib/poms/commons-codec-1.6.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>commons-codec</groupId>
   <artifactId>commons-codec</artifactId>
-  <version>1.3</version>
+  <version>1.6</version>
 </dep>
diff --git a/qpid/java/lib/poms/commons-collections-3.2.xml b/qpid/java/lib/poms/commons-collections-3.2.1.xml
index 3a07dc4a9d..85be0c2e6a 100644
--- a/qpid/java/lib/poms/commons-collections-3.2.xml
+++ b/qpid/java/lib/poms/commons-collections-3.2.1.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>commons-collections</groupId>
   <artifactId>commons-collections</artifactId>
-  <version>3.2</version>
+  <version>3.2.1</version>
 </dep>
diff --git a/qpid/java/lib/poms/commons-configuration-1.6.xml b/qpid/java/lib/poms/commons-configuration-1.8.xml
index 523310f10a..337b9d0993 100644
--- a/qpid/java/lib/poms/commons-configuration-1.6.xml
+++ b/qpid/java/lib/poms/commons-configuration-1.8.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>commons-configuration</groupId>
   <artifactId>commons-configuration</artifactId>
-  <version>1.6</version>
+  <version>1.8</version>
 </dep>
diff --git a/qpid/java/lib/poms/commons-lang-2.2.xml b/qpid/java/lib/poms/commons-lang-2.6.xml
index b0bef7ca04..be092371ce 100644
--- a/qpid/java/lib/poms/commons-lang-2.2.xml
+++ b/qpid/java/lib/poms/commons-lang-2.6.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>commons-lang</groupId>
   <artifactId>commons-lang</artifactId>
-  <version>2.2</version>
+  <version>2.6</version>
 </dep>
diff --git a/qpid/java/lib/poms/commons-logging-1.0.4.xml b/qpid/java/lib/poms/commons-logging-1.1.1.xml
index c85d0f7b29..bf14523b24 100644
--- a/qpid/java/lib/poms/commons-logging-1.0.4.xml
+++ b/qpid/java/lib/poms/commons-logging-1.1.1.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>commons-logging</groupId>
   <artifactId>commons-logging</artifactId>
-  <version>1.0.4</version>
+  <version>1.1.1</version>
 </dep>
diff --git a/qpid/java/lib/poms/derby-10.6.1.0.xml b/qpid/java/lib/poms/derby-10.8.2.2.xml
index de6a4d79f3..897dddd607 100644
--- a/qpid/java/lib/poms/derby-10.6.1.0.xml
+++ b/qpid/java/lib/poms/derby-10.8.2.2.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>org.apache.derby</groupId>
   <artifactId>derby</artifactId>
-  <version>10.6.1.0</version>
+  <version>10.8.2.2</version>
 </dep>
diff --git a/qpid/java/lib/poms/log4j-1.2.12.xml b/qpid/java/lib/poms/log4j-1.2.16.xml
index 87331f4acc..b60a30d993 100644
--- a/qpid/java/lib/poms/log4j-1.2.12.xml
+++ b/qpid/java/lib/poms/log4j-1.2.16.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>log4j</groupId>
   <artifactId>log4j</artifactId>
-  <version>1.2.12</version>
+  <version>1.2.16</version>
 </dep>
diff --git a/qpid/java/lib/poms/slf4j-api-1.6.1.xml b/qpid/java/lib/poms/slf4j-api-1.6.4.xml
index e3f989bd4e..4eb7c2fe96 100644
--- a/qpid/java/lib/poms/slf4j-api-1.6.1.xml
+++ b/qpid/java/lib/poms/slf4j-api-1.6.4.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>org.slf4j</groupId>
   <artifactId>slf4j-api</artifactId>
-  <version>1.6.1</version>
+  <version>1.6.4</version>
 </dep>
diff --git a/qpid/java/lib/poms/slf4j-log4j12-1.6.1.xml b/qpid/java/lib/poms/slf4j-log4j12-1.6.4.xml
index 482bbec894..516dda9eeb 100644
--- a/qpid/java/lib/poms/slf4j-log4j12-1.6.1.xml
+++ b/qpid/java/lib/poms/slf4j-log4j12-1.6.4.xml
@@ -18,5 +18,5 @@
 <dep>
   <groupId>org.slf4j</groupId>
   <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
+  <version>1.6.4</version>
 </dep>