QPID-3858: Updated branch - merged from trunk r.1333987

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

14 files changed, 60 insertions, 6 deletions

diff --git a/java/lib/gson-2.0.jar b/java/lib/gson-2.0.jar
new file mode 100644
index 0000000000..7b413f9570
--- /dev/null
+++ b/java/lib/gson-2.0.jar
diff --git a/java/lib/jackson-core-asl-1.9.0.jar b/java/lib/jackson-core-asl-1.9.0.jar
new file mode 100644
index 0000000000..e9456ad887
--- /dev/null
+++ b/java/lib/jackson-core-asl-1.9.0.jar
diff --git a/java/lib/jackson-mapper-asl-1.9.0.jar b/java/lib/jackson-mapper-asl-1.9.0.jar
new file mode 100644
index 0000000000..f8beebcfea
--- /dev/null
+++ b/java/lib/jackson-mapper-asl-1.9.0.jar
diff --git a/java/lib/jetty-6.1.14.jar b/java/lib/jetty-6.1.14.jar
deleted file mode 100644
index 3e67d1e19e..0000000000
--- a/java/lib/jetty-6.1.14.jar
+++ /dev/null
diff --git a/java/lib/jetty-servlet-tester-6.1.14.jar b/java/lib/jetty-servlet-tester-6.1.14.jar
deleted file mode 100644
index c6d7c66f4a..0000000000
--- a/java/lib/jetty-servlet-tester-6.1.14.jar
+++ /dev/null
diff --git a/java/lib/jetty-util-6.1.14.jar b/java/lib/jetty-util-6.1.14.jar
deleted file mode 100644
index 7acc988655..0000000000
--- a/java/lib/jetty-util-6.1.14.jar
+++ /dev/null
diff --git a/java/lib/mockito-all-1.9.0.jar b/java/lib/mockito-all-1.9.0.jar
new file mode 100644
index 0000000000..273fd50feb
--- /dev/null
+++ b/java/lib/mockito-all-1.9.0.jar
diff --git a/java/lib/org.apache.felix.framework-2.0.5.jar b/java/lib/org.apache.felix.main-2.0.5.jar
index 71e5a84231..71e5a84231 100644
--- a/java/lib/org.apache.felix.framework-2.0.5.jar
+++ b/java/lib/org.apache.felix.main-2.0.5.jar
diff --git a/java/lib/poms/commons-digester-1.8.1.xml b/java/lib/poms/commons-digester-1.8.1.xml
index 1edee7b5f0..56b38bf778 100644
--- a/java/lib/poms/commons-digester-1.8.1.xml
+++ b/java/lib/poms/commons-digester-1.8.1.xml
@@ -19,4 +19,10 @@
   <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>
diff --git a/java/lib/poms/org.osgi.core-1.0.0.xml b/java/lib/poms/jackson-core-asl-1.9.0.xml
index 833cc91729..cc5947b72b 100644
--- a/java/lib/poms/org.osgi.core-1.0.0.xml
+++ b/java/lib/poms/jackson-core-asl-1.9.0.xml
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 <dep>
-  <groupId>org.apache.felix</groupId>
-  <artifactId>org.osgi.core</artifactId>
-  <version>1.0.0</version>
+  <groupId>org.codehaus.jackson</groupId>
+  <artifactId>jackson-core-asl</artifactId>
+  <version>1.9.0</version>
 </dep>
diff --git a/java/lib/poms/org.apache.felix.framework-2.0.5.xml b/java/lib/poms/jackson-mapper-asl-1.9.0.xml
index cef17fe589..ff74f5a503 100644
--- a/java/lib/poms/org.apache.felix.framework-2.0.5.xml
+++ b/java/lib/poms/jackson-mapper-asl-1.9.0.xml
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 <dep>
-  <groupId>org.apache.felix</groupId>
-  <artifactId>org.apache.felix.framework</artifactId>
-  <version>2.0.5</version>
+  <groupId>org.codehaus.jackson</groupId>
+  <artifactId>jackson-mapper-asl</artifactId>
+  <version>1.9.0</version>
 </dep>
diff --git a/java/lib/poms/org.apache.felix.main-2.0.5.xml b/java/lib/poms/org.apache.felix.main-2.0.5.xml
new file mode 100644
index 0000000000..91718725dc
--- /dev/null
+++ b/java/lib/poms/org.apache.felix.main-2.0.5.xml
@@ -0,0 +1,40 @@
+<?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.felix</groupId>
+  <artifactId>org.apache.felix.main</artifactId>
+  <version>2.0.5</version>
+  <exclusions>
+    <exclusion>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.framework</artifactId>
+    </exclusion>
+    <exclusion>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.shell</artifactId>
+    </exclusion>
+    <exclusion>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.shell.tui</artifactId>
+    </exclusion>
+    <exclusion>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.bundlerepository</artifactId>
+    </exclusion>
+  </exclusions>
+</dep>
diff --git a/java/lib/poms/xalan-2.7.0.xml b/java/lib/poms/xalan-2.7.0.xml
index 73ea2df7e2..3fd89aacd8 100644
--- a/java/lib/poms/xalan-2.7.0.xml
+++ b/java/lib/poms/xalan-2.7.0.xml
@@ -19,4 +19,12 @@
   <groupId>xalan</groupId>
   <artifactId>xalan</artifactId>
   <version>2.7.0</version>
+  <exclusions>
+    <exclusion>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+    </exclusion>
+  </exclusions>
 </dep>
+
+
diff --git a/java/lib/servlet-api.jar b/java/lib/servlet-api.jar
deleted file mode 100644
index e3b61e0079..0000000000
--- a/java/lib/servlet-api.jar
+++ /dev/null