QPID-3988 : [Java] Update dependencies to latest version

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

24 files changed, 14 insertions, 14 deletions

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 168e38ccf9..31a646608a 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -17,16 +17,16 @@
 # under the License.
 #
 
-commons-beanutils-core=lib/commons-beanutils-core-1.8.0.jar
-commons-cli=lib/commons-cli-1.0.jar
-commons-codec=lib/commons-codec-1.3.jar
-commons-collections=lib/commons-collections-3.2.jar
-commons-configuration=lib/commons-configuration-1.6.jar
+commons-beanutils-core=lib/commons-beanutils-core-1.8.3.jar
+commons-cli=lib/commons-cli-1.2.jar
+commons-codec=lib/commons-codec-1.6.jar
+commons-collections=lib/commons-collections-3.2.1.jar
+commons-configuration=lib/commons-configuration-1.8.jar
 commons-digester=lib/commons-digester-1.8.1.jar
-commons-lang=lib/commons-lang-2.2.jar
-commons-logging=lib/commons-logging-1.0.4.jar
+commons-lang=lib/commons-lang-2.6.jar
+commons-logging=lib/commons-logging-1.1.1.jar
 
-derby-db=lib/derby-10.6.1.0.jar
+derby-db=lib/derby-10.8.2.2.jar
 
 geronimo-jms=lib/geronimo-jms_1.1_spec-1.0.jar
 geronimo-j2ee=lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar
@@ -40,10 +40,10 @@ mockito-all=lib/mockito-all-1.9.0.jar
 
 gson-all=lib/gson-2.0.jar
 
-log4j=lib/log4j-1.2.12.jar
+log4j=lib/log4j-1.2.16.jar
 
-slf4j-api=lib/slf4j-api-1.6.1.jar
-slf4j-log4j=lib/slf4j-log4j12-1.6.1.jar
+slf4j-api=lib/slf4j-api-1.6.4.jar
+slf4j-log4j=lib/slf4j-log4j12-1.6.4.jar
 
 xalan=lib/xalan-2.7.0.jar
 
diff --git a/qpid/java/lib/commons-beanutils-core-1.8.0.jar b/qpid/java/lib/commons-beanutils-core-1.8.0.jar
deleted file mode 100644
index 87c15f4565..0000000000
--- a/qpid/java/lib/commons-beanutils-core-1.8.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/commons-beanutils-core-1.8.3.jar b/qpid/java/lib/commons-beanutils-core-1.8.3.jar
new file mode 100644
index 0000000000..7647dc52be
--- /dev/null
+++ b/qpid/java/lib/commons-beanutils-core-1.8.3.jar
diff --git a/qpid/java/lib/commons-cli-1.0.jar b/qpid/java/lib/commons-cli-1.0.jar
deleted file mode 100644
index 22a004e14e..0000000000
--- a/qpid/java/lib/commons-cli-1.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/commons-cli-1.2.jar b/qpid/java/lib/commons-cli-1.2.jar
new file mode 100644
index 0000000000..ce4b9fffe4
--- /dev/null
+++ b/qpid/java/lib/commons-cli-1.2.jar
diff --git a/qpid/java/lib/commons-codec-1.3.jar b/qpid/java/lib/commons-codec-1.3.jar
deleted file mode 100644
index 957b6752af..0000000000
--- a/qpid/java/lib/commons-codec-1.3.jar
+++ /dev/null
diff --git a/qpid/java/lib/commons-codec-1.6.jar b/qpid/java/lib/commons-codec-1.6.jar
new file mode 100644
index 0000000000..ee1bc49aca
--- /dev/null
+++ b/qpid/java/lib/commons-codec-1.6.jar
diff --git a/qpid/java/lib/commons-collections-3.2.1.jar b/qpid/java/lib/commons-collections-3.2.1.jar
new file mode 100644
index 0000000000..c35fa1fee1
--- /dev/null
+++ b/qpid/java/lib/commons-collections-3.2.1.jar
diff --git a/qpid/java/lib/commons-collections-3.2.jar b/qpid/java/lib/commons-collections-3.2.jar
deleted file mode 100644
index 75580be255..0000000000
--- a/qpid/java/lib/commons-collections-3.2.jar
+++ /dev/null
diff --git a/qpid/java/lib/commons-configuration-1.6.jar b/qpid/java/lib/commons-configuration-1.6.jar
deleted file mode 100644
index 2d4689a1b8..0000000000
--- a/qpid/java/lib/commons-configuration-1.6.jar
+++ /dev/null
diff --git a/qpid/java/lib/commons-configuration-1.8.jar b/qpid/java/lib/commons-configuration-1.8.jar
new file mode 100644
index 0000000000..ae9ae9969b
--- /dev/null
+++ b/qpid/java/lib/commons-configuration-1.8.jar
diff --git a/qpid/java/lib/commons-lang-2.2.jar b/qpid/java/lib/commons-lang-2.2.jar
deleted file mode 100644
index b9105611f3..0000000000
--- a/qpid/java/lib/commons-lang-2.2.jar
+++ /dev/null
diff --git a/qpid/java/lib/commons-lang-2.6.jar b/qpid/java/lib/commons-lang-2.6.jar
new file mode 100644
index 0000000000..98467d3a65
--- /dev/null
+++ b/qpid/java/lib/commons-lang-2.6.jar
diff --git a/qpid/java/lib/commons-logging-1.0.4.jar b/qpid/java/lib/commons-logging-1.0.4.jar
deleted file mode 100644
index b73a80fab6..0000000000
--- a/qpid/java/lib/commons-logging-1.0.4.jar
+++ /dev/null
diff --git a/qpid/java/lib/commons-logging-1.1.1.jar b/qpid/java/lib/commons-logging-1.1.1.jar
new file mode 100644
index 0000000000..8758a96b70
--- /dev/null
+++ b/qpid/java/lib/commons-logging-1.1.1.jar
diff --git a/qpid/java/lib/derby-10.6.1.0.jar b/qpid/java/lib/derby-10.8.2.2.jar
index 33a84e9dc5..b59555907a 100644
--- a/qpid/java/lib/derby-10.6.1.0.jar
+++ b/qpid/java/lib/derby-10.8.2.2.jar
diff --git a/qpid/java/lib/log4j-1.2.12.jar b/qpid/java/lib/log4j-1.2.12.jar
deleted file mode 100644
index 9b5a720088..0000000000
--- a/qpid/java/lib/log4j-1.2.12.jar
+++ /dev/null
diff --git a/qpid/java/lib/log4j-1.2.16.jar b/qpid/java/lib/log4j-1.2.16.jar
new file mode 100644
index 0000000000..3f9d847618
--- /dev/null
+++ b/qpid/java/lib/log4j-1.2.16.jar
diff --git a/qpid/java/lib/slf4j-api-1.6.1.jar b/qpid/java/lib/slf4j-api-1.6.1.jar
deleted file mode 100644
index 42e0ad0de7..0000000000
--- a/qpid/java/lib/slf4j-api-1.6.1.jar
+++ /dev/null
diff --git a/qpid/java/lib/slf4j-api-1.6.4.jar b/qpid/java/lib/slf4j-api-1.6.4.jar
new file mode 100644
index 0000000000..4d23f41d37
--- /dev/null
+++ b/qpid/java/lib/slf4j-api-1.6.4.jar
diff --git a/qpid/java/lib/slf4j-log4j12-1.6.1.jar b/qpid/java/lib/slf4j-log4j12-1.6.1.jar
deleted file mode 100644
index 873d11983e..0000000000
--- a/qpid/java/lib/slf4j-log4j12-1.6.1.jar
+++ /dev/null
diff --git a/qpid/java/lib/slf4j-log4j12-1.6.4.jar b/qpid/java/lib/slf4j-log4j12-1.6.4.jar
new file mode 100644
index 0000000000..daa3aa1631
--- /dev/null
+++ b/qpid/java/lib/slf4j-log4j12-1.6.4.jar