QPID-1916, QPID-2977: port the recent changes to maven artifact generation on trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5.x-dev@1068486 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index 2dd297c..b91b903 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -62,6 +62,10 @@
     <iterate target="pom"/>
   </target>
 
+  <target name="release-mvn" description="Install the artifacts into the local repository">
+    <iterate target="release-mvn"/>
+  </target>
+
   <target name="compile" description="compile sources">
     <iterate target="compile"/>
   </target>
diff --git a/qpid/java/common.xml b/qpid/java/common.xml
index 264628f..3c0144a 100644
--- a/qpid/java/common.xml
+++ b/qpid/java/common.xml
@@ -68,6 +68,13 @@
     </fileset>
   </path>
 
+  <property name="maven.local.repo"      value="${build.scratch}/maven-local-repo"/>
+  <property name="maven.unique.version"  value="false"/>
+  <property name="maven.snapshot"        value="true"/>
+  <condition property="maven.version.suffix" value="" else="-SNAPSHOT">
+    <isfalse value="${maven.snapshot}"/>
+  </condition>
+
   <macrodef name="indirect">
     <attribute name="name"/>
     <attribute name="variable"/>
diff --git a/qpid/java/genpom b/qpid/java/genpom
index e3b89d0..39eccd4 100755
--- a/qpid/java/genpom
+++ b/qpid/java/genpom
@@ -32,9 +32,11 @@
 parser.add_option("-v", "--version")
 parser.add_option("-d", "--description", default="")
 parser.add_option("-u", "--url", default="")
-parser.add_option("-i", "--ignore", action="store_true", help="ignore missing poms")
+parser.add_option("-m", "--modules", help="modules dependencies")
+parser.add_option("-p", "--prefix", help="prefix of the project's artifacts names")
+parser.add_option("-i", "--ignore", action="store_true", help="ignore missing deps")
 parser.add_option("-s", "--search-path", action="append",
-                  help="the path to search for poms")
+                  help="the path to search for deps")
 parser.add_option("-S", "--scope", metavar="ARTIFACT=SCOPE", action="append",
                   default=[],
                   help="specify scope for an artifact")
@@ -47,7 +49,7 @@
 else:
   path = []
   for p in opts.search_path:
-    path.extend(p.split(":"))
+    path.extend(p.split(os.pathsep))
 
 expanded_path = []
 for p in path:
@@ -62,16 +64,18 @@
 if opts.name is None and opts.artifact is None:
   die("one of name or artifact must be supplied")
 
+if opts.prefix is not None:
+  opts.artifact = opts.prefix + "-" + opts.artifact
+
 if opts.name is None:
   opts.name = opts.artifact
 
 if opts.artifact is None:
   opts.artifact = opts.name
 
-def lookup(pom, attr):
-  nd = pom["project"][attr]
+def lookup(dep, attr):
+  nd = dep["dep"][attr]
   if nd is None:
-    nd = pom["project/parent"][attr]
     if nd is None:
       return None
   return nd.text()
@@ -90,17 +94,35 @@
   scopes[m.group(1)] = m.group(2)
 
 deps = []
+module_depends = []
+if opts.modules is not None:
+  module_depends = opts.modules.replace("/", "-").split();
+  
+for module in module_depends:
+  if opts.prefix is None:
+     artifactId = module
+  else:
+     artifactId = opts.prefix + "-" + module
+  
+  deps.append("""
+    <dependency>
+      <groupId>%s</groupId>
+      <artifactId>%s</artifactId>
+      <version>%s</version>
+    </dependency>
+""" % (opts.group, artifactId, opts.version))
+
 for jar in jars:
   base, ext = os.path.splitext(os.path.basename(jar))
-  pom = search(expanded_path, "%s.pom" % base)
-  if pom is None:
+  dep = search(expanded_path, "%s.xml" % base)
+  if dep is None:
     if opts.ignore:
       continue
     else:
-      die("unable to locate pom for %s" % jar)
-  group = lookup(pom, "groupId")
-  artifactId = lookup(pom, "artifactId")
-  version = lookup(pom, "version")
+      die("unable to locate xml for %s" % jar)
+  group = lookup(dep, "groupId")
+  artifactId = lookup(dep, "artifactId")
+  version = lookup(dep, "version")
   deps.append("""
     <dependency>
       <groupId>%s</groupId>
@@ -119,22 +141,27 @@
   <groupId>%(group)s</groupId>
   <artifactId>%(artifact)s</artifactId>
   <version>%(version)s</version>
+
   <name>%(name)s</name>
   <url>%(url)s</url>
   <description>%(description)s</description>
+
   <organization>
     <name>The Apache Software Foundation</name>
     <url>http://www.apache.org</url>
   </organization>
+
   <licenses>
     <license>
       <name>The Apache Software License, Version 2.0</name>
-      <url>/LICENSE.txt</url>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
     </license>
   </licenses>
+
   <dependencies>
     %(dependencies)s
   </dependencies>
+
 </project>
 """
 
diff --git a/qpid/java/lib/maven-ant-tasks-2.1.1.jar b/qpid/java/lib/maven-ant-tasks-2.1.1.jar
new file mode 100644
index 0000000..7810a54
--- /dev/null
+++ b/qpid/java/lib/maven-ant-tasks-2.1.1.jar
Binary files differ
diff --git a/qpid/java/lib/poms/backport-util-concurrent-2.2.pom b/qpid/java/lib/poms/backport-util-concurrent-2.2.pom
deleted file mode 100644
index ea281da..0000000
--- a/qpid/java/lib/poms/backport-util-concurrent-2.2.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>backport-util-concurrent</groupId>
-    <artifactId>backport-util-concurrent</artifactId>
-    <version>2.2</version>
-    <packaging>jar</packaging>
-    <name>Backport of JSR 166</name>
-    <url>http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/</url>
-    <description>Dawid Kurzyniec's backport of JSR 166</description>
-    <licenses>
-        <license>
-            <name>Public Domain</name>
-            <url>http://creativecommons.org/licenses/publicdomain</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>http://dcl.mathcs.emory.edu/cgi-bin/viewcvs.cgi/software/util/backport-util-concurrent/</url>
-    </scm>
-    <organization>
-        <name>Dawid Kurzyniec</name>
-        <url>http://www.mathcs.emory.edu/~dawidk/</url>
-    </organization>
-    <dependencies/>
-</project>
diff --git a/qpid/java/lib/poms/backport-util-concurrent-2.2.xml b/qpid/java/lib/poms/backport-util-concurrent-2.2.xml
new file mode 100644
index 0000000..6df4cfc
--- /dev/null
+++ b/qpid/java/lib/poms/backport-util-concurrent-2.2.xml
@@ -0,0 +1,22 @@
+<?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>backport-util-concurrent</groupId>
+  <artifactId>backport-util-concurrent</artifactId>
+  <version>2.2</version>
+</dep>
diff --git a/qpid/java/lib/poms/commons-beanutils-core-1.8.0.pom b/qpid/java/lib/poms/commons-beanutils-core-1.8.0.pom
deleted file mode 100644
index 30d29c9..0000000
--- a/qpid/java/lib/poms/commons-beanutils-core-1.8.0.pom
+++ /dev/null
@@ -1,42 +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.
--->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>4</version>
-  </parent>
-  <groupId>commons-beanutils</groupId>
-  <artifactId>commons-beanutils-core</artifactId>
-  <version>1.8.0</version>
-  <name>Commons BeanUtils Core</name>
-  <url>http://commons.apache.org/beanutils/</url>
-
-  <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml b/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml
new file mode 100644
index 0000000..612b45e
--- /dev/null
+++ b/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml
@@ -0,0 +1,22 @@
+<?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-beanutils</groupId>
+  <artifactId>commons-beanutils-core</artifactId>
+  <version>1.8.0</version>
+</dep>
diff --git a/qpid/java/lib/poms/commons-cli-1.0.pom b/qpid/java/lib/poms/commons-cli-1.0.pom
deleted file mode 100644
index cfc5a04..0000000
--- a/qpid/java/lib/poms/commons-cli-1.0.pom
+++ /dev/null
@@ -1,76 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-cli</groupId>
-  <artifactId>commons-cli</artifactId>
-  <name>CLI</name>
-  <version>1.0</version>
-  <description>Commons CLI provides a simple API for working with the command line arguments and options.</description>
-  <inceptionYear>2002</inceptionYear>
-  <developers>
-    <developer>
-      <id>jstrachan</id>
-      <name>James Strachan</name>
-      <email>jstrachan@apache.org</email>
-      <organization>SpiritSoft, Inc.</organization>
-    </developer>
-    <developer>
-      <id>bob</id>
-      <name>bob mcwhirter</name>
-      <email>bob@werken.com</email>
-      <organization>Werken</organization>
-    </developer>
-    <developer>
-      <id>jkeyes</id>
-      <name>John Keyes</name>
-      <email>jbjk@mac.com</email>
-      <organization>integral Source</organization>
-    </developer>
-  </developers>
-  <contributors>
-    <contributor>
-      <name>Berin Loritsch</name>
-      <email>bloritsch@apache.org</email>
-      <roles>
-        <role>helped in the Avalon CLI merge</role>
-      </roles>
-    </contributor>
-    <contributor>
-      <name>Peter Maddocks</name>
-      <email>peter_maddocks@hp.com</email>
-      <organization>Hewlett-Packard</organization>
-      <roles>
-        <role>supplied patch</role>
-      </roles>
-    </contributor>
-  </contributors>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/*Test*.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.7</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/commons-cli-1.0.xml b/qpid/java/lib/poms/commons-cli-1.0.xml
new file mode 100644
index 0000000..77b47f6
--- /dev/null
+++ b/qpid/java/lib/poms/commons-cli-1.0.xml
@@ -0,0 +1,22 @@
+<?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-cli</groupId>
+  <artifactId>commons-cli</artifactId>
+  <version>1.0</version>
+</dep>
diff --git a/qpid/java/lib/poms/commons-codec-1.3.pom b/qpid/java/lib/poms/commons-codec-1.3.pom
deleted file mode 100644
index dab16e2..0000000
--- a/qpid/java/lib/poms/commons-codec-1.3.pom
+++ /dev/null
@@ -1,178 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-codec</groupId>
-  <artifactId>commons-codec</artifactId>
-  <name>Codec</name>
-  <version>1.3</version>
-  <description>The codec package contains simple encoder and decoders for
-   various formats such as Base64 and Hexadecimal.  In addition to these
-   widely used encoders and decoders, the codec package also maintains a
-   collection of phonetic encoding utilities.</description>
-  <url>http://jakarta.apache.org/commons/codec/</url>
-  <issueManagement>
-    <url>http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Commons&component=Codec&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&newqueryname=&order=Reuse+same+sort+as+last+time</url>
-  </issueManagement>
-  <ciManagement>
-    <notifiers>
-      <notifier>
-        <address>commons-dev@jakarta.apache.org</address>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2002</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Commons Dev List</name>
-      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
-    </mailingList>
-    <mailingList>
-      <name>Commons User List</name>
-      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>bayard</id>
-      <name>Henri Yandell</name>
-      <email>bayard@generationjava.com</email>
-    </developer>
-    <developer>
-      <id>tobrien</id>
-      <name>Tim OBrien</name>
-      <email>tobrien@apache.org</email>
-      <timezone>-6</timezone>
-    </developer>
-    <developer>
-      <id>sanders</id>
-      <name>Scott Sanders</name>
-      <email>sanders@totalsync.com</email>
-    </developer>
-    <developer>
-      <id>rwaldhoff</id>
-      <name>Rodney Waldhoff</name>
-      <email>rwaldhoff@apache.org</email>
-    </developer>
-    <developer>
-      <id>dlr</id>
-      <name>Daniel Rall</name>
-      <email>dlr@finemaltcoding.com</email>
-    </developer>
-    <developer>
-      <id>jon</id>
-      <name>Jon S. Stevens</name>
-      <email>jon@collab.net</email>
-    </developer>
-    <developer>
-      <id>ggregory</id>
-      <name>Gary D. Gregory</name>
-      <email>ggregory@seagullsw.com</email>
-      <organization>Seagull Software</organization>
-      <timezone>-8</timezone>
-    </developer>
-    <developer>
-      <id>dgraham</id>
-      <name>David Graham</name>
-      <email>dgraham@apache.org</email>
-    </developer>
-  </developers>
-  <contributors>
-    <contributor>
-      <name>Christopher O'Brien</name>
-      <email>siege@preoccupied.net</email>
-    </contributor>
-    <contributor>
-      <name>Martin Redington</name>
-    </contributor>
-    <contributor>
-      <name>Jeffery Dever</name>
-    </contributor>
-    <contributor>
-      <name>Steve Zimmermann</name>
-      <email>steve.zimmermann@heii.com</email>
-    </contributor>
-    <contributor>
-      <name>Benjamin Walstrum</name>
-      <email>ben@walstrum.com</email>
-    </contributor>
-    <contributor>
-      <name>Oleg Kalnichevski</name>
-      <email>oleg@ural.ru</email>
-    </contributor>
-    <contributor>
-      <name>Dave Dribin</name>
-      <email>apache@dave.dribin.org</email>
-    </contributor>
-    <contributor>
-      <name>Alex Karasulu</name>
-      <email>aok123 at bellsouth.net</email>
-    </contributor>
-    <contributor>
-      <name>Matthew Inger</name>
-      <email>mattinger at yahoo.com</email>
-    </contributor>
-  </contributors>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>/LICENSE.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-commons/codec</connection>
-    <url>http://cvs.apache.org/viewcvs/jakarta-commons/codec/</url>
-  </scm>
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://jakarta.apache.org</url>
-  </organization>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>src/test</directory>
-        <includes>
-          <include>**/*.xml</include>
-        </includes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/Test*.java</include>
-            <include>**/*Test.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/*AbstractTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <repository>
-      <id>default</id>
-      <name>Default Repository</name>
-      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/codec/</url>
-    </repository>
-    <site>
-      <id>default</id>
-      <name>Default Site</name>
-      <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/codec/</url>
-    </site>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/commons-codec-1.3.xml b/qpid/java/lib/poms/commons-codec-1.3.xml
new file mode 100644
index 0000000..772ff6a
--- /dev/null
+++ b/qpid/java/lib/poms/commons-codec-1.3.xml
@@ -0,0 +1,22 @@
+<?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-codec</groupId>
+  <artifactId>commons-codec</artifactId>
+  <version>1.3</version>
+</dep>
diff --git a/qpid/java/lib/poms/commons-collections-3.2.pom b/qpid/java/lib/poms/commons-collections-3.2.pom
deleted file mode 100644
index 88e5860..0000000
--- a/qpid/java/lib/poms/commons-collections-3.2.pom
+++ /dev/null
@@ -1,420 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-collections</groupId>
-  <artifactId>commons-collections</artifactId>
-  <name>Collections</name>
-  <version>3.2</version>
-  <description>Types that extend and augment the Java Collections Framework.</description>
-  <url>http://jakarta.apache.org/commons/collections/</url>
-  <issueManagement>
-    <url>http://issues.apache.org/bugzilla/</url>
-  </issueManagement>
-  <ciManagement>
-    <notifiers>
-      <notifier>
-        <configuration>
-          <address>commons-dev@jakarta.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2001</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Commons Dev List</name>
-      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
-    </mailingList>
-    <mailingList>
-      <name>Commons User List</name>
-      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>scolebourne</id>
-      <name>Stephen Colebourne</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>morgand</id>
-      <name>Morgan Delagrange</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>matth</id>
-      <name>Matthew Hawthorne</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>geirm</id>
-      <name>Geir Magnusson</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>craigmcc</id>
-      <name>Craig McClanahan</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>psteitz</id>
-      <name>Phil Steitz</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>amamment</id>
-      <name>Arun M. Thomas</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>rwaldhoff</id>
-      <name>Rodney Waldhoff</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>bayard</id>
-      <name>Henri Yandell</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>jcarman</id>
-      <name>James Carman</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>rdonkin</id>
-      <name>Robert Burrell Donkin</name>
-    </developer>
-  </developers>
-  <contributors>
-    <contributor>
-      <name>Rafael U. C. Afonso</name>
-    </contributor>
-    <contributor>
-      <name>Max Rydahl Andersen</name>
-    </contributor>
-    <contributor>
-      <name>Federico Barbieri</name>
-    </contributor>
-    <contributor>
-      <name>Arron Bates</name>
-    </contributor>
-    <contributor>
-      <name>Nicola Ken Barozzi</name>
-    </contributor>
-    <contributor>
-      <name>Sebastian Bazley</name>
-    </contributor>
-    <contributor>
-      <name>Matt Benson</name>
-    </contributor>
-    <contributor>
-      <name>Ola Berg</name>
-    </contributor>
-    <contributor>
-      <name>Christopher Berry</name>
-    </contributor>
-    <contributor>
-      <name>Nathan Beyer</name>
-    </contributor>
-    <contributor>
-      <name>Janek Bogucki</name>
-    </contributor>
-    <contributor>
-      <name>Chuck Burdick</name>
-    </contributor>
-    <contributor>
-      <name>Dave Bryson</name>
-    </contributor>
-    <contributor>
-      <name>Julien Buret</name>
-    </contributor>
-    <contributor>
-      <name>Jonathan Carlson</name>
-    </contributor>
-    <contributor>
-      <name>Ram Chidambaram</name>
-    </contributor>
-    <contributor>
-      <name>Steve Clark</name>
-    </contributor>
-    <contributor>
-      <name>Eric Crampton</name>
-    </contributor>
-    <contributor>
-      <name>Dimiter Dimitrov</name>
-    </contributor>
-    <contributor>
-      <name>Peter Donald</name>
-    </contributor>
-    <contributor>
-      <name>Steve Downey</name>
-    </contributor>
-    <contributor>
-      <name>Rich Dougherty</name>
-    </contributor>
-    <contributor>
-      <name>Tom Dunham</name>
-    </contributor>
-    <contributor>
-      <name>Stefano Fornari</name>
-    </contributor>
-    <contributor>
-      <name>Andrew Freeman</name>
-    </contributor>
-    <contributor>
-      <name>Gerhard Froehlich</name>
-    </contributor>
-    <contributor>
-      <name>Paul Jack</name>
-    </contributor>
-    <contributor>
-      <name>Eric Johnson</name>
-    </contributor>
-    <contributor>
-      <name>Kent Johnson</name>
-    </contributor>
-    <contributor>
-      <name>Marc Johnson</name>
-    </contributor>
-    <contributor>
-      <name>Nissim Karpenstein</name>
-    </contributor>
-    <contributor>
-      <name>Shinobu Kawai</name>
-    </contributor>
-    <contributor>
-      <name>Mohan Kishore</name>
-    </contributor>
-    <contributor>
-      <name>Simon Kitching</name>
-    </contributor>
-    <contributor>
-      <name>Thomas Knych</name>
-    </contributor>
-    <contributor>
-      <name>Serge Knystautas</name>
-    </contributor>
-    <contributor>
-      <name>Peter KoBek</name>
-    </contributor>
-    <contributor>
-      <name>Jordan Krey</name>
-    </contributor>
-    <contributor>
-      <name>Olaf Krische</name>
-    </contributor>
-    <contributor>
-      <name>Guilhem Lavaux</name>
-    </contributor>
-    <contributor>
-      <name>Paul Legato</name>
-    </contributor>
-    <contributor>
-      <name>David Leppik</name>
-    </contributor>
-    <contributor>
-      <name>Berin Loritsch</name>
-    </contributor>
-    <contributor>
-      <name>Stefano Mazzocchi</name>
-    </contributor>
-    <contributor>
-      <name>Brian McCallister</name>
-    </contributor>
-    <contributor>
-      <name>Steven Melzer</name>
-    </contributor>
-    <contributor>
-      <name>Leon Messerschmidt</name>
-    </contributor>
-    <contributor>
-      <name>Mauricio S. Moura</name>
-    </contributor>
-    <contributor>
-      <name>Kasper Nielsen</name>
-    </contributor>
-    <contributor>
-      <name>Stanislaw Osinski</name>
-    </contributor>
-    <contributor>
-      <name>Alban Peignier</name>
-    </contributor>
-    <contributor>
-      <name>Mike Pettypiece</name>
-    </contributor>
-    <contributor>
-      <name>Steve Phelps</name>
-    </contributor>
-    <contributor>
-      <name>Ilkka Priha</name>
-    </contributor>
-    <contributor>
-      <name>Jonas Van Poucke</name>
-    </contributor>
-    <contributor>
-      <name>Will Pugh</name>
-    </contributor>
-    <contributor>
-      <name>Herve Quiroz</name>
-    </contributor>
-    <contributor>
-      <name>Daniel Rall</name>
-    </contributor>
-    <contributor>
-      <name>Robert Ribnitz</name>
-    </contributor>
-    <contributor>
-      <name>Huw Roberts</name>
-    </contributor>
-    <contributor>
-      <name>Henning P. Schmiedehausen</name>
-    </contributor>
-    <contributor>
-      <name>Howard Lewis Ship</name>
-    </contributor>
-    <contributor>
-      <name>Joe Raysa</name>
-    </contributor>
-    <contributor>
-      <name>Thomas Schapitz</name>
-    </contributor>
-    <contributor>
-      <name>Jon Schewe</name>
-    </contributor>
-    <contributor>
-      <name>Andreas Schlosser</name>
-    </contributor>
-    <contributor>
-      <name>Christian Siefkes</name>
-    </contributor>
-    <contributor>
-      <name>Michael Smith</name>
-    </contributor>
-    <contributor>
-      <name>Stephen Smith</name>
-    </contributor>
-    <contributor>
-      <name>Jan Sorensen</name>
-    </contributor>
-    <contributor>
-      <name>Jon S. Stevens</name>
-    </contributor>
-    <contributor>
-      <name>James Strachan</name>
-    </contributor>
-    <contributor>
-      <name>Leo Sutic</name>
-    </contributor>
-    <contributor>
-      <name>Chris Tilden</name>
-    </contributor>
-    <contributor>
-      <name>Neil O'Toole</name>
-    </contributor>
-    <contributor>
-      <name>Jeff Turner</name>
-    </contributor>
-    <contributor>
-      <name>Kazuya Ujihara</name>
-    </contributor>
-    <contributor>
-      <name>Jeff Varszegi</name>
-    </contributor>
-    <contributor>
-      <name>Ralph Wagner</name>
-    </contributor>
-    <contributor>
-      <name>David Weinrich</name>
-    </contributor>
-    <contributor>
-      <name>Dieter Wimberger</name>
-    </contributor>
-    <contributor>
-      <name>Serhiy Yevtushenko</name>
-    </contributor>
-    <contributor>
-      <name>Jason van Zyl</name>
-    </contributor>
-  </contributors>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>/LICENSE.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk</connection>
-    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk</url>
-  </scm>
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://jakarta.apache.org</url>
-  </organization>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <directory>.</directory>
-        <includes>
-          <include>NOTICE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>org/apache/commons/collections/TestAllPackages.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>maven-plugins</groupId>
-        <artifactId>maven-cobertura-plugin</artifactId>
-        <version>1.1.1</version>
-        <configuration>
-          <scope>test</scope>
-          <comment>Required only for generating test coverage reports.</comment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <repository>
-      <id>default</id>
-      <name>Default Repository</name>
-      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/collections/</url>
-    </repository>
-    <site>
-      <id>default</id>
-      <name>Default Site</name>
-      <url>scp://people.apache.org//www/jakarta.apache.org/commons/collections/</url>
-    </site>
-    <status>converted</status>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/commons-collections-3.2.xml b/qpid/java/lib/poms/commons-collections-3.2.xml
new file mode 100644
index 0000000..3a07dc4
--- /dev/null
+++ b/qpid/java/lib/poms/commons-collections-3.2.xml
@@ -0,0 +1,22 @@
+<?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-collections</groupId>
+  <artifactId>commons-collections</artifactId>
+  <version>3.2</version>
+</dep>
diff --git a/qpid/java/lib/poms/commons-configuration-1.6.pom b/qpid/java/lib/poms/commons-configuration-1.6.pom
deleted file mode 100644
index 1597869..0000000
--- a/qpid/java/lib/poms/commons-configuration-1.6.pom
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-configuration</groupId>
-  <artifactId>commons-configuration</artifactId>
-  <name>Commons Configuration</name>
-  <version>1.6</version>
-  <description>Tools to assist in the reading of configuration/preferences files in
-    various formats</description>
-  <url>http://commons.apache.org/${pom.artifactId.substring(8)}/</url>
-  <issueManagement>
-    <url>http://issues.apache.org/jira/browse/CONFIGURATION</url>
-  </issueManagement>
-  <ciManagement>
-    <notifiers>
-      <notifier>
-        <configuration>
-          <address>dev@commons.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2001</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Commons Dev List</name>
-      <subscribe>dev-subscribe@commons.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@commons.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-dev/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Commons User List</name>
-      <subscribe>user-subscribe@commons.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@commons.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>dlr</id>
-      <name>Daniel Rall</name>
-      <email>dlr@finemaltcoding.com</email>
-      <organization>CollabNet, Inc.</organization>
-    </developer>
-    <developer>
-      <id>jvanzyl</id>
-      <name>Jason van Zyl</name>
-      <email>jason@zenplex.com</email>
-      <organization>Zenplex</organization>
-    </developer>
-    <developer>
-      <id>mpoeschl</id>
-      <name>Martin Poeschl</name>
-      <email>mpoeschl@marmot.at</email>
-      <organization>tucana.at</organization>
-    </developer>
-    <developer>
-      <id>dion</id>
-      <name>dIon Gillard</name>
-      <email>dion@multitask.com.au</email>
-      <organization>Multitask Consulting</organization>
-    </developer>
-    <developer>
-      <id>henning</id>
-      <name>Henning P. Schmiedehausen</name>
-      <email>hps@intermeta.de</email>
-      <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste mbH</organization>
-      <timezone>2</timezone>
-    </developer>
-    <developer>
-      <id>epugh</id>
-      <name>Eric Pugh</name>
-      <email>epugh@upstate.com</email>
-      <organization>upstate.com</organization>
-    </developer>
-    <developer>
-      <id>bdunbar</id>
-      <name>Brian E. Dunbar</name>
-      <email>bdunbar@dunbarconsulting.org</email>
-      <organization>dunbarconsulting.org</organization>
-    </developer>
-    <developer>
-      <id>ebourg</id>
-      <name>Emmanuel Bourg</name>
-      <email>ebourg@apache.org</email>
-      <organization>Ariane Software</organization>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>oheger</id>
-      <name>Oliver Heger</name>
-      <email>oheger@apache.org</email>
-      <organization>Agfa HealthCare</organization>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>joehni</id>
-      <name>Jörg Schaible</name>
-      <email>joerg.schaible@gmx.de</email>
-      <timezone>+1</timezone>
-    </developer>
-  </developers>
-  <contributors>
-    <contributor>
-      <name>Konstantin Shaposhnikov</name>
-      <email>ksh@scand.com</email>
-      <organization>scand.com</organization>
-    </contributor>
-    <contributor>
-      <name>Jamie M. Guillemette</name>
-      <email>JMGuillemette@gmail.com</email>
-      <organization>TD Bank</organization>
-    </contributor>
-    <contributor>
-      <name>Jorge Ferrer</name>
-      <email>jorge.ferrer@gmail.com</email>
-      <organization></organization>
-    </contributor>
-    <contributor>
-      <name>Gabriele Garuglieri</name>
-      <email>gabriele.garuglieri@infoblu.it</email>
-      <organization>Infoblu S.p.A</organization>
-    </contributor>
-    <contributor>
-      <name>Nicolas De Loof</name>
-      <email>nicolas.deloof@gmail.com</email>
-      <organization>Cap Gemini</organization>
-    </contributor>
-  </contributors>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>/LICENSE.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
-    <url>http://svn.apache.org/repos/asf/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
-  </scm>
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://commons.apache.org/</url>
-  </organization>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-    <resources>
-      <resource>
-        <directory>conf</directory>
-        <includes>
-          <include>digesterRules.xml</include>
-          <include>properties.dtd</include>
-          <include>PropertyList-1.0.dtd</include>
-        </includes>
-      </resource>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>NOTICE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>conf</directory>
-        <includes>
-          <include>*.xml</include>
-        </includes>
-      </testResource>
-      <testResource>
-        <directory>conf</directory>
-        <includes>
-          <include>testClasspath.properties</include>
-          <include>testdb.script</include>
-          <include>*.properties</include>
-          <include>*.dtd</include>
-        </includes>
-      </testResource>
-      <testResource>
-        <targetPath>org/apache/commons/configuration</targetPath>
-        <directory>conf</directory>
-        <includes>
-          <include>test.properties</include>
-          <include>include.properties</include>
-        </includes>
-      </testResource>
-      <testResource>
-        <targetPath>config</targetPath>
-        <directory>conf/config</directory>
-        <includes>
-          <include>**/*.properties</include>
-        </includes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/*Test*.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/TestBasePropertiesConfiguration.java</exclude>
-            <exclude>**/NonStringTestHolder.java</exclude>
-            <exclude>**/TestAbstractConfiguration.java</exclude>
-            <exclude>**/AbstractXPathTest.java</exclude>
-            <exclude>**/AbstractCombinerTest.java</exclude>
-            <exclude>**/AbstractTestConfigurationEvents.java</exclude>
-            <exclude>**/AbstractTestFileConfigurationEvents.java</exclude>
-            <exclude>**/AbstractTestPListEvents.java</exclude>
-            <exclude>**/InterpolationTestHelper.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>maven-plugins</groupId>
-        <artifactId>maven-tasks-plugin</artifactId>
-        <version>1.1.0</version>
-        <configuration />
-      </plugin>
-      <plugin>
-        <groupId>maven-plugins</groupId>
-        <artifactId>maven-findbugs-plugin</artifactId>
-        <version>1.4</version>
-        <configuration />
-      </plugin>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.0.1</version>
-        <configuration />
-      </plugin>
-      <plugin>
-        <groupId>maven-plugins</groupId>
-        <artifactId>maven-cobertura-plugin</artifactId>
-        <version>1.2</version>
-        <configuration />
-      </plugin>
-      <plugin>
-        <artifactId>maven-changes-plugin</artifactId>
-        <version>1.6</version>
-        <configuration>
-          <comment><strong>Site Only</strong> - v1.6 (minimum)
-              required for building the site documentation.</comment>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-xdoc-plugin</artifactId>
-        <version>1.8</version>
-        <configuration>
-          <comment><strong>Site Only</strong> - v1.8 (minimum)
-              required for building the site documentation.</comment>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-scm-plugin</artifactId>
-        <version>1.5</version>
-        <configuration>
-          <comment><strong>Site Only</strong> - v1.5 (minimum)</comment>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jdiff-plugin</artifactId>
-        <version>1.5</version>
-        <configuration>
-          <comment><strong>Site Only</strong> - v1.5 (minimum)</comment>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>1.8</version>
-        <configuration>
-          <comment><strong>Site Only</strong> - v1.8 (minimum)</comment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>1.8</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils-core</artifactId>
-      <version>1.8.0</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.3</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>commons-jxpath</groupId>
-      <artifactId>commons-jxpath</artifactId>
-      <version>1.3</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.7.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.4</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.6.5</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.2.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-pool</groupId>
-      <artifactId>commons-pool</artifactId>
-      <version>1.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>1.7.2.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>dbunit</groupId>
-      <artifactId>dbunit</artifactId>
-      <version>2.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit-addons</groupId>
-      <artifactId>junit-addons</artifactId>
-      <version>1.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>mockobjects</groupId>
-      <artifactId>mockobjects-core</artifactId>
-      <version>0.09</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>mockobjects</groupId>
-      <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
-      <version>0.09</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.8</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <repository>
-      <id>default</id>
-      <name>Default Repository</name>
-      <url>www.apache.org//www/www.apache.org/dist/java-repository/</url>
-    </repository>
-    <site>
-      <id>default</id>
-      <name>Default Site</name>
-      <url>scp://people.apache.org//www/commons.apache.org/${pom.artifactId.substring(8)}/</url>
-    </site>
-    <status>converted</status>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/commons-configuration-1.6.xml b/qpid/java/lib/poms/commons-configuration-1.6.xml
new file mode 100644
index 0000000..523310f
--- /dev/null
+++ b/qpid/java/lib/poms/commons-configuration-1.6.xml
@@ -0,0 +1,22 @@
+<?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.6</version>
+</dep>
diff --git a/qpid/java/lib/poms/commons-digester-1.8.1.pom b/qpid/java/lib/poms/commons-digester-1.8.1.pom
deleted file mode 100644
index 5470526..0000000
--- a/qpid/java/lib/poms/commons-digester-1.8.1.pom
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-<!-- TODO:
-* include dtds as resources
-* build src jars
--->
-
-  <parent>
-    <groupId>org.apache.commons</groupId>
-    <artifactId>commons-parent</artifactId>
-    <version>11</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <name>Commons Digester</name>
-  <groupId>commons-digester</groupId>
-  <artifactId>commons-digester</artifactId>
-  <version>1.8.1</version>
-
-  <inceptionYear>2001</inceptionYear>
-  <description>
-    The Digester package lets you configure an XML to Java object mapping module
-    which triggers certain actions called rules whenever a particular 
-    pattern of nested XML elements is recognized.
-  </description>
-
-  <url>http://commons.apache.org/digester/</url>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/DIGESTER</url>
-  </issueManagement>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/digester/tags/DIGESTER_1_8_1</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/digester/tags/DIGESTER_1_8_1</developerConnection>
-    <url>http://svn.apache.org/viewvc/commons/proper/digester/tags/DIGESTER_1_8_1</url>
-  </scm>
-
-  <developers>
-    <developer>
-      <name>Craig McClanahan</name>
-      <id>craigmcc</id>
-      <email>craigmcc@apache.org</email>
-    </developer>
-    <developer>
-      <name>Robert Burrell Donkin</name>
-      <id>rdonkin</id>
-      <email>rdonkin@apache.org</email>
-    </developer>
-    <developer>
-      <name>Scott Sanders</name>
-      <id>sanders</id>
-      <email>sanders@totalsync.com</email>
-    </developer>
-    <developer>
-      <name>James Strachan</name>
-      <id>jstrachan</id>
-      <email>jstrachan@apache.org</email>
-    </developer>
-    <developer>
-      <name>Jason van Zyl</name>
-      <id>jvanzyl</id>
-      <email>jvanzyl@apache.org</email>
-    </developer>
-    <developer>
-      <name>Tim OBrien</name>
-      <id>tobrien</id>
-      <email>tobrien@apache.org</email>
-    </developer>
-    <developer>
-      <name>Jean-Francois Arcand</name>
-      <id>jfarcand</id>
-      <email>jfarcand@apache.org</email>
-    </developer>
-    <developer>
-      <name>Simon Kitching</name>
-      <id>skitching</id>
-      <email>skitching@apache.org</email>
-    </developer>
-    <developer>
-      <name>Rahul Akolkar</name>
-      <id>rahul</id>
-      <email>rahul AT apache DOT org</email>
-    </developer>
-  </developers>
-
-  <contributors>
-    <contributor>
-      <name>Bradley M. Handy</name>
-      <email>bhandy@users.sf.net</email>
-    </contributor>
-    <contributor>
-      <name>Christopher Lenz</name>
-    </contributor>
-    <contributor>
-      <name>Ted Husted</name>
-    </contributor>
-    <contributor>
-      <name>David H. Martin</name>
-    </contributor>
-    <contributor>
-      <name>Henri Chen</name>
-    </contributor>
-    <contributor>
-      <name>Janek Bogucki</name>
-    </contributor>
-    <contributor>
-      <name>Mark Huisman</name>
-    </contributor>
-    <contributor>
-      <name>Paul Jack</name>
-    </contributor>
-    <contributor>
-      <name>Anton Maslovsky</name>
-    </contributor>
-    <contributor>
-      <name>Matt Cleveland</name>
-    </contributor>
-    <contributor>
-      <name>Gabriele Carcassi</name>
-    </contributor>
-    <contributor>
-      <name>Wendy Smoak</name>
-      <email>java@wendysmoak.com</email>
-    </contributor>
-    <contributor>
-      <name>Kevin Ross</name>
-      <email>kevin.ross@iverticalleap.com</email>
-    </contributor>
-  </contributors>
-
-  <distributionManagement>
-    <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
-    <site>
-      <id>apache.website</id>
-      <name>Apache Commons Site</name>
-      <url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/digester</url>
-    </site>
-  </distributionManagement>
-
-  <properties>
-    <maven.compile.source>1.2</maven.compile.source>
-    <maven.compile.target>1.2</maven.compile.target>
-    <commons.componentid>digester</commons.componentid>
-    <commons.release.version>1.8.1</commons.release.version>
-    <commons.rc.version>RC1</commons.rc.version>
-    <commons.jira.id>DIGESTER</commons.jira.id>
-    <commons.jira.pid>12310471</commons.jira.pid>
-  </properties> 
-
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/java</directory>
-        <filtering>false</filtering>
-        <includes>
-          <include>**/*.dtd</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <testResources>
-      <testResource>
-        <directory>src/test</directory>
-        <filtering>false</filtering>
-        <includes>
-          <include>**/*.xml</include>
-        </includes>
-      </testResource>
-    </testResources>
-
-    <plugins>
-      <plugin>
-        <!--
-          - A number of the pre-maven test case "suport" classes have names starting with Test.
-          - This confuses the maven surefire "auto-detect test case" functionality, so we
-          - need to manually exclude them.
-          -->
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/TestBean.java</exclude>
-            <exclude>**/TestRule.java</exclude>
-            <exclude>**/TestRuleSet.java</exclude>
-            <exclude>**/Test*$*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/assembly/bin.xml</descriptor>
-            <descriptor>src/assembly/src.xml</descriptor>
-          </descriptors>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency> 
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-      <version>1.8.0</version>
-    </dependency>
-    <dependency> 
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changes-plugin</artifactId>
-        <version>2.0</version>
-        <configuration>
-          <issueLinkTemplate>%URL%/../%ISSUE%</issueLinkTemplate>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>changes-report</report>
-              <report>jira-report</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <configLocation>${basedir}/checkstyle.xml</configLocation>
-          <enableRulesSummary>false</enableRulesSummary>
-          <headerFile>${basedir}/file-header.txt</headerFile>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.3</version>
-        <!--Use default rules-->
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>clirr-maven-plugin</artifactId>
-        <version>2.2.1</version>
-        <configuration>
-          <comparisonVersion>1.8</comparisonVersion>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <profiles>
-    <profile>
-      <id>rc</id>
-      <distributionManagement>
-        <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
-        <site>
-          <id>apache.website</id>
-          <name>Apache Commons Release Candidate Staging Site</name>
-          <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/site</url>
-        </site>
-      </distributionManagement>
-    </profile>
-  </profiles>
-
-</project>
diff --git a/qpid/java/lib/poms/commons-digester-1.8.1.xml b/qpid/java/lib/poms/commons-digester-1.8.1.xml
new file mode 100644
index 0000000..1edee7b
--- /dev/null
+++ b/qpid/java/lib/poms/commons-digester-1.8.1.xml
@@ -0,0 +1,22 @@
+<?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>
+</dep>
diff --git a/qpid/java/lib/poms/commons-lang-2.2.pom b/qpid/java/lib/poms/commons-lang-2.2.pom
deleted file mode 100644
index 9337a43..0000000
--- a/qpid/java/lib/poms/commons-lang-2.2.pom
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-lang</groupId>
-  <artifactId>commons-lang</artifactId>
-  <name>Lang</name>
-  <version>2.2</version>
-  <description>Commons.Lang, a package of Java utility classes for the
-        classes that are in java.lang's hierarchy, or are considered to be so
-        standard as to justify existence in java.lang.</description>
-  <url>http://jakarta.apache.org/commons/lang/</url>
-  <issueManagement>
-    <url>http://issues.apache.org/jira/</url>
-  </issueManagement>
-  <ciManagement>
-    <notifiers>
-      <notifier>
-        <configuration>
-          <address>commons-dev@jakarta.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2001</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Commons Dev List</name>
-      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
-    </mailingList>
-    <mailingList>
-      <name>Commons User List</name>
-      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>dlr</id>
-      <name>Daniel Rall</name>
-      <email>dlr@finemaltcoding.com</email>
-      <organization>CollabNet, Inc.</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>scolebourne</id>
-      <name>Stephen Colebourne</name>
-      <email>scolebourne@joda.org</email>
-      <organization>SITA ATS Ltd</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-      <timezone>0</timezone>
-    </developer>
-    <developer>
-      <id>bayard</id>
-      <name>Henri Yandell</name>
-      <email>bayard@generationjava.com</email>
-      <organization></organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>scaswell</id>
-      <name>Steven Caswell</name>
-      <email>stevencaswell@apache.org</email>
-      <organization></organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>rdonkin</id>
-      <name>Robert Burrell Donkin</name>
-      <email>rdonkin@apache.org</email>
-      <organization></organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>ggregory</id>
-      <name>Gary D. Gregory</name>
-      <email>ggregory@seagullsw.com</email>
-      <organization>Seagull Software</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-      <timezone>-8</timezone>
-    </developer>
-    <developer>
-      <id>psteitz</id>
-      <name>Phil Steitz</name>
-      <email>phil@steitz.com</email>
-      <organization></organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>fredrik</id>
-      <name>Fredrik Westermarck</name>
-      <email></email>
-      <organization></organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>jcarman</id>
-      <name>James Carman</name>
-      <email>jcarman@apache.org</email>
-      <organization>Carman Consulting, Inc.</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-  </developers>
-  <contributors>
-    <contributor>
-      <name>C. Scott Ananian</name>
-    </contributor>
-    <contributor>
-      <name>Chris Audley</name>
-    </contributor>
-    <contributor>
-      <name>Stephane Bailliez</name>
-    </contributor>
-    <contributor>
-      <name>Michael Becke</name>
-    </contributor>
-    <contributor>
-      <name>Ola Berg</name>
-    </contributor>
-    <contributor>
-      <name>Nathan Beyer</name>
-    </contributor>
-    <contributor>
-      <name>Stefan Bodewig</name>
-    </contributor>
-    <contributor>
-      <name>Janek Bogucki</name>
-    </contributor>
-    <contributor>
-      <name>Mike Bowler</name>
-    </contributor>
-    <contributor>
-      <name>Sean Brown</name>
-    </contributor>
-    <contributor>
-      <name>Alexander Day Chaffee</name>
-    </contributor>
-    <contributor>
-      <name>Al Chou</name>
-    </contributor>
-    <contributor>
-      <name>Greg Coladonato</name>
-    </contributor>
-    <contributor>
-      <name>Maarten Coene</name>
-    </contributor>
-    <contributor>
-      <name>Justin Couch</name>
-    </contributor>
-    <contributor>
-      <name>Michael Davey</name>
-    </contributor>
-    <contributor>
-      <name>Norm Deane</name>
-    </contributor>
-    <contributor>
-      <name>Ringo De Smet</name>
-    </contributor>
-    <contributor>
-      <name>Russel Dittmar</name>
-    </contributor>
-    <contributor>
-      <name>Steve Downey</name>
-    </contributor>
-    <contributor>
-      <name>Matthias Eichel</name>
-    </contributor>
-    <contributor>
-      <name>Christopher Elkins</name>
-    </contributor>
-    <contributor>
-      <name>Chris Feldhacker</name>
-    </contributor>
-    <contributor>
-      <name>Pete Gieser</name>
-    </contributor>
-    <contributor>
-      <name>Jason Gritman</name>
-    </contributor>
-    <contributor>
-      <name>Matthew Hawthorne</name>
-    </contributor>
-    <contributor>
-      <name>Michael Heuer</name>
-    </contributor>
-    <contributor>
-      <name>Oliver Heger</name>
-    </contributor>
-    <contributor>
-      <name>Chris Hyzer</name>
-    </contributor>
-    <contributor>
-      <name>Marc Johnson</name>
-    </contributor>
-    <contributor>
-      <name>Shaun Kalley</name>
-    </contributor>
-    <contributor>
-      <name>Tetsuya Kaneuchi</name>
-    </contributor>
-    <contributor>
-      <name>Nissim Karpenstein</name>
-    </contributor>
-    <contributor>
-      <name>Ed Korthof</name>
-    </contributor>
-    <contributor>
-      <name>Holger Krauth</name>
-    </contributor>
-    <contributor>
-      <name>Rafal Krupinski</name>
-    </contributor>
-    <contributor>
-      <name>Rafal Krzewski</name>
-    </contributor>
-    <contributor>
-      <name>Craig R. McClanahan</name>
-    </contributor>
-    <contributor>
-      <name>Rand McNeely</name>
-    </contributor>
-    <contributor>
-      <name>Nikolay Metchev</name>
-    </contributor>
-    <contributor>
-      <name>Kasper Nielsen</name>
-    </contributor>
-    <contributor>
-      <name>Tim O'Brien</name>
-    </contributor>
-    <contributor>
-      <name>Brian S O'Neill</name>
-    </contributor>
-    <contributor>
-      <name>Andrew C. Oliver</name>
-    </contributor>
-    <contributor>
-      <name>Alban Peignier</name>
-    </contributor>
-    <contributor>
-      <name>Moritz Petersen</name>
-    </contributor>
-    <contributor>
-      <name>Dmitri Plotnikov</name>
-    </contributor>
-    <contributor>
-      <name>Neeme Praks</name>
-    </contributor>
-    <contributor>
-      <name>Eric Pugh</name>
-    </contributor>
-    <contributor>
-      <name>Stephen Putman</name>
-    </contributor>
-    <contributor>
-      <name>Travis Reeder</name>
-    </contributor>
-    <contributor>
-      <name>Antony Riley</name>
-    </contributor>
-    <contributor>
-      <name>Scott Sanders</name>
-    </contributor>
-    <contributor>
-      <name>Ralph Schaer</name>
-    </contributor>
-    <contributor>
-      <name>Henning P. Schmiedehausen</name>
-    </contributor>
-    <contributor>
-      <name>Sean Schofield</name>
-    </contributor>
-    <contributor>
-      <name>Reuben Sivan</name>
-    </contributor>
-    <contributor>
-      <name>Ville Skytta</name>
-    </contributor>
-    <contributor>
-      <name>Jan Sorensen</name>
-    </contributor>
-    <contributor>
-      <name>Glen Stampoultzis</name>
-    </contributor>
-    <contributor>
-      <name>Scott Stanchfield</name>
-    </contributor>
-    <contributor>
-      <name>Jon S. Stevens</name>
-    </contributor>
-    <contributor>
-      <name>Sean C. Sullivan</name>
-    </contributor>
-    <contributor>
-      <name>Ashwin Suresh</name>
-    </contributor>
-    <contributor>
-      <name>Helge Tesgaard</name>
-    </contributor>
-    <contributor>
-      <name>Arun Mammen Thomas</name>
-    </contributor>
-    <contributor>
-      <name>Masato Tezuka</name>
-    </contributor>
-    <contributor>
-      <name>Jeff Varszegi</name>
-    </contributor>
-    <contributor>
-      <name>Chris Webb</name>
-    </contributor>
-    <contributor>
-      <name>Mario Winterer</name>
-    </contributor>
-  </contributors>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>/LICENSE.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk</connection>
-    <url>http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk</url>
-  </scm>
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://jakarta.apache.org</url>
-  </organization>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <directory>.</directory>
-        <includes>
-          <include>NOTICE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${pom.build.unitTestSourceDirectory}</directory>
-        <includes>
-          <include>**/*.xml</include>
-        </includes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/*TestSuite.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/AllLangTestSuite.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>maven-plugins</groupId>
-        <artifactId>maven-cobertura-plugin</artifactId>
-        <version>1.1.1</version>
-        <configuration>
-          <scope>test</scope>
-          <comment>Required only for generating test coverage reports.</comment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <repository>
-      <id>default</id>
-      <name>Default Repository</name>
-      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/lang/</url>
-    </repository>
-    <site>
-      <id>default</id>
-      <name>Default Site</name>
-      <url>scp://people.apache.org//www/jakarta.apache.org/commons/lang/</url>
-    </site>
-    <status>converted</status>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/commons-lang-2.2.xml b/qpid/java/lib/poms/commons-lang-2.2.xml
new file mode 100644
index 0000000..b0bef7c
--- /dev/null
+++ b/qpid/java/lib/poms/commons-lang-2.2.xml
@@ -0,0 +1,22 @@
+<?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-lang</groupId>
+  <artifactId>commons-lang</artifactId>
+  <version>2.2</version>
+</dep>
diff --git a/qpid/java/lib/poms/commons-logging-1.0.4.pom b/qpid/java/lib/poms/commons-logging-1.0.4.pom
deleted file mode 100644
index 7c1017d..0000000
--- a/qpid/java/lib/poms/commons-logging-1.0.4.pom
+++ /dev/null
@@ -1,165 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-logging</groupId>
-  <artifactId>commons-logging</artifactId>
-  <name>Logging</name>
-  <version>1.0.4</version>
-  <description>Commons Logging is a thin adapter allowing configurable bridging to other,
-    well known logging systems.</description>
-  <url>http://jakarta.apache.org/commons/logging/</url>
-  <issueManagement>
-    <url>http://issues.apache.org/bugzilla/</url>
-  </issueManagement>
-  <ciManagement>
-    <notifiers>
-      <notifier>
-        <configuration>
-          <address>commons-dev@jakarta.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2001</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Commons Dev List</name>
-      <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
-    </mailingList>
-    <mailingList>
-      <name>Commons User List</name>
-      <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
-      <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>morgand</id>
-      <name>Morgan Delagrange</name>
-      <email>morgand at apache dot org</email>
-      <organization>Apache</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>rwaldhoff</id>
-      <name>Rodney Waldhoff</name>
-      <email>rwaldhoff at apache org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>craigmcc</id>
-      <name>Craig McClanahan</name>
-      <email>craigmcc at apache org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>sanders</id>
-      <name>Scott Sanders</name>
-      <email>sanders at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>rdonkin</id>
-      <name>Robert Burrell Donkin</name>
-      <email>rdonkin at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>donaldp</id>
-      <name>Peter Donald</name>
-      <email>donaldp at apache dot org</email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>costin</id>
-      <name>Costin Manolache</name>
-      <email>costin at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>rsitze</id>
-      <name>Richard Sitze</name>
-      <email>rsitze at apache dot org</email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>baliuka</id>
-      <name>Juozas Baliuka</name>
-      <email>baliuka@apache.org</email>
-      <organization></organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-  </developers>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>/LICENSE.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-commons/logging</connection>
-    <url>http://cvs.apache.org/viewcvs/jakarta-commons/logging/</url>
-  </scm>
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://jakarta.apache.org</url>
-  </organization>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/AvalonLoggerTest.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.6</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>logkit</groupId>
-      <artifactId>logkit</artifactId>
-      <version>1.0.1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.7</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework</artifactId>
-      <version>4.1.3</version>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <repository>
-      <id>default</id>
-      <name>Default Repository</name>
-      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/logging/</url>
-    </repository>
-    <site>
-      <id>default</id>
-      <name>Default Site</name>
-      <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/logging/</url>
-    </site>
-  </distributionManagement>
-</project>
diff --git a/qpid/java/lib/poms/commons-logging-1.0.4.xml b/qpid/java/lib/poms/commons-logging-1.0.4.xml
new file mode 100644
index 0000000..c85d0f7
--- /dev/null
+++ b/qpid/java/lib/poms/commons-logging-1.0.4.xml
@@ -0,0 +1,22 @@
+<?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-logging</groupId>
+  <artifactId>commons-logging</artifactId>
+  <version>1.0.4</version>
+</dep>
diff --git a/qpid/java/lib/poms/commons-pool-1.4.pom b/qpid/java/lib/poms/commons-pool-1.4.pom
deleted file mode 100644
index 3dd87ae..0000000
--- a/qpid/java/lib/poms/commons-pool-1.4.pom
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-pool</groupId>
-  <artifactId>commons-pool</artifactId>
-  <name>Commons Pool</name>
-  <version>1.4</version>
-  <description>Commons Object Pooling Library</description>
-  <url>http://commons.apache.org/pool/</url>
-  <issueManagement>
-    <url>http://issues.apache.org/jira/</url>
-  </issueManagement>
-  <ciManagement>
-    <notifiers>
-      <notifier>
-        <configuration>
-          <address>dev@commons.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2001</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Commons Dev List</name>
-      <subscribe>dev-subscribe@commons.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@commons.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-dev/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Commons User List</name>
-      <subscribe>user-subscribe@commons.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@commons.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>morgand</id>
-      <name>Morgan Delagrange</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>geirm</id>
-      <name>Geir Magnusson</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>craigmcc</id>
-      <name>Craig McClanahan</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>rwaldhoff</id>
-      <name>Rodney Waldhoff</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>dweinr1</id>
-      <name>David Weinrich</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>dirkv</id>
-      <name>Dirk Verbeeck</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>rdonkin</id>
-      <name>Robert Burrell Donkin</name>
-      <email></email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>sandymac</id>
-      <name>Sandy McArthur</name>
-      <email></email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-    <developer>
-      <id>psteitz</id>
-      <name>Phil Steitz</name>
-      <email></email>
-      <organization>Apache Software Foundation</organization>
-    </developer>
-  </developers>
-  <contributors>
-    <contributor>
-      <name>Todd Carmichael</name>
-      <email>toddc@concur.com</email>
-    </contributor>
-  </contributors>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>/LICENSE.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/pool/trunk</connection>
-    <url>http://svn.apache.org/repos/asf/commons/proper/pool/trunk</url>
-  </scm>
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://commons.apache.org/</url>
-  </organization>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>NOTICE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>org/apache/commons/pool/TestBaseObjectPool.java</include>
-            <include>org/apache/commons/pool/TestBaseKeyedObjectPool.java</include>
-            <include>org/apache/commons/pool/TestBasePoolableObjectFactory.java</include>
-            <include>org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java</include>
-            <include>org/apache/commons/pool/TestPoolUtils.java</include>
-            <include>org/apache/commons/pool/impl/TestStackObjectPool.java</include>
-            <include>org/apache/commons/pool/impl/TestStackKeyedObjectPool.java</include>
-            <include>org/apache/commons/pool/impl/TestGenericObjectPool.java</include>
-            <include>org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java</include>
-            <include>org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java</include>
-            <include>org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java</include>
-            <include>org/apache/commons/pool/impl/TestStackObjectPoolFactory.java</include>
-            <include>org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java</include>
-            <include>org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java</include>
-            <include>org/apache/commons/pool/composite/TestFifoLender.java</include>
-            <include>org/apache/commons/pool/composite/TestIdleEvictorLender.java</include>
-            <include>org/apache/commons/pool/composite/TestInvalidEvictorLender.java</include>
-            <include>org/apache/commons/pool/composite/TestLifoLender.java</include>
-            <include>org/apache/commons/pool/composite/TestNullLender.java</include>
-            <include>org/apache/commons/pool/composite/TestSoftLender.java</include>
-            <include>org/apache/commons/pool/composite/TestFailManager.java</include>
-            <include>org/apache/commons/pool/composite/TestGrowManager.java</include>
-            <include>org/apache/commons/pool/composite/TestIdleLimitManager.java</include>
-            <include>org/apache/commons/pool/composite/TestFailLimitManager.java</include>
-            <include>org/apache/commons/pool/composite/TestWaitLimitManager.java</include>
-            <include>org/apache/commons/pool/composite/TestNullTracker.java</include>
-            <include>org/apache/commons/pool/composite/TestReferenceTracker.java</include>
-            <include>org/apache/commons/pool/composite/TestDebugTracker.java</include>
-            <include>org/apache/commons/pool/composite/TestSimpleTracker.java</include>
-            <include>org/apache/commons/pool/composite/TestCompositeObjectPool.java</include>
-            <include>org/apache/commons/pool/composite/TestCompositeKeyedObjectPool.java</include>
-            <include>org/apache/commons/pool/composite/TestCompositeKeyedObjectPool2.java</include>
-            <include>org/apache/commons/pool/composite/TestCompositeKeyedObjectPoolFactory.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jdiff-plugin</artifactId>
-        <version>1.5</version>
-        <configuration>
-          <comment><strong>Site Only</strong> - v1.5 (minimum)</comment>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-changes-plugin</artifactId>
-        <version>1.6</version>
-        <configuration>
-          <comment><strong>Site Only</strong> - v1.6 (minimum)</comment>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>1.8</version>
-        <configuration>
-          <comment><b>Site</b> only</comment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <repository>
-      <id>default</id>
-      <name>Default Repository</name>
-      <url>file:///www/people.apache.org/builds/commons/pool/</url>
-    </repository>
-    <site>
-      <id>default</id>
-      <name>Default Site</name>
-      <url>scp://people.apache.org//www/commons.apache.org/pool/</url>
-    </site>
-    <status>converted</status>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/commons-pool-1.4.xml b/qpid/java/lib/poms/commons-pool-1.4.xml
new file mode 100644
index 0000000..21a1859
--- /dev/null
+++ b/qpid/java/lib/poms/commons-pool-1.4.xml
@@ -0,0 +1,22 @@
+<?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-pool</groupId>
+  <artifactId>commons-pool</artifactId>
+  <version>1.4</version>
+</dep>
diff --git a/qpid/java/lib/poms/derby-10.3.2.1.pom b/qpid/java/lib/poms/derby-10.3.2.1.pom
deleted file mode 100644
index 1750462..0000000
--- a/qpid/java/lib/poms/derby-10.3.2.1.pom
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <artifactId>derby</artifactId>
-  <name>Derby Engine</name>
-  <version>10.3.2.1</version>
-  <description></description>
-  <url>http://db.apache.org/derby/</url>
-  <issueManagement>
-    <url>http://issues.apache.org/jira/browse/DERBY</url>
-  </issueManagement>
-  <inceptionYear>2004</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Derby User List</name>
-      <subscribe>derby-user-subscribe@db.apache.org</subscribe>
-      <unsubscribe>derby-user-unsubscribe@db.apache.org</unsubscribe>
-      <archive>http://issues.apache.org/eyebrowse/SummarizeList?listName=derby-user@db.apache.org</archive>
-    </mailingList>
-    <mailingList>
-      <name>Derby Developer List</name>
-      <subscribe>derby-dev-subscribe@db.apache.org</subscribe>
-      <unsubscribe>derby-dev-unsubscribe@db.apache.org</unsubscribe>
-      <archive>http://issues.apache.org/eyebrowse/SummarizeList?listName=derby-dev@db.apache.org</archive>
-    </mailingList>
-    <mailingList>
-      <name>Derby Commit List</name>
-      <subscribe>derby-commits-subscribe@db.apache.org</subscribe>
-      <unsubscribe>derby-commits-unsubscribe@db.apache.org</unsubscribe>
-      <archive>http://issues.apache.org/eyebrowse/SummarizeList?listName=derby-commits@db.apache.org</archive>
-    </mailingList>
-  </mailingLists>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/db/derby/code/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/derby/code/trunk</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/db/derby/code/trunk/?root=Apache-SVN</url>
-  </scm>
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://db.apache.org/</url>
-  </organization>
-  <build />
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/derby-10.3.2.1.xml b/qpid/java/lib/poms/derby-10.3.2.1.xml
new file mode 100644
index 0000000..f516f37
--- /dev/null
+++ b/qpid/java/lib/poms/derby-10.3.2.1.xml
@@ -0,0 +1,22 @@
+<?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.derby</groupId>
+  <artifactId>derby</artifactId>
+  <version>10.3.2.1</version>
+</dep>
diff --git a/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.pom b/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.pom
deleted file mode 100644
index bde5032..0000000
--- a/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.pom
+++ /dev/null
@@ -1,6 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.geronimo.specs</groupId>
-  <artifactId>geronimo-jms_1.1_spec</artifactId>
-  <version>1.0</version>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml b/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
new file mode 100644
index 0000000..0fe38d5
--- /dev/null
+++ b/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
@@ -0,0 +1,22 @@
+<?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.geronimo.specs</groupId>
+  <artifactId>geronimo-jms_1.1_spec</artifactId>
+  <version>1.0</version>
+</dep>
diff --git a/qpid/java/lib/poms/junit-3.8.1.pom b/qpid/java/lib/poms/junit-3.8.1.pom
deleted file mode 100644
index 2169a65..0000000
--- a/qpid/java/lib/poms/junit-3.8.1.pom
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>junit</groupId>
-  <artifactId>junit</artifactId>
-  <version>3.8.1</version>
-  <name>JUnit</name>
-  <url>http://junit.org</url>
-  <description>
-    JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.
-  </description>
-  <organization>
-    <name>JUnit</name>
-    <url>http://www.junit.org</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Common Public License Version 1.0</name>
-      <url>http://www.opensource.org/licenses/cpl1.0.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <url>http://junit.cvs.sourceforge.net/junit/</url>
-  </scm>
-  <dependencies>
-  </dependencies>
-</project>
diff --git a/qpid/java/lib/poms/junit-3.8.1.xml b/qpid/java/lib/poms/junit-3.8.1.xml
new file mode 100644
index 0000000..0462e9c
--- /dev/null
+++ b/qpid/java/lib/poms/junit-3.8.1.xml
@@ -0,0 +1,22 @@
+<?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>junit</groupId>
+  <artifactId>junit</artifactId>
+  <version>3.8.1</version>
+</dep>
diff --git a/qpid/java/lib/poms/log4j-1.2.12.pom b/qpid/java/lib/poms/log4j-1.2.12.pom
deleted file mode 100644
index 8c10608..0000000
--- a/qpid/java/lib/poms/log4j-1.2.12.pom
+++ /dev/null
@@ -1,6 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>log4j</groupId>
-  <artifactId>log4j</artifactId>
-  <version>1.2.12</version>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/log4j-1.2.12.xml b/qpid/java/lib/poms/log4j-1.2.12.xml
new file mode 100644
index 0000000..87331f4
--- /dev/null
+++ b/qpid/java/lib/poms/log4j-1.2.12.xml
@@ -0,0 +1,22 @@
+<?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>log4j</groupId>
+  <artifactId>log4j</artifactId>
+  <version>1.2.12</version>
+</dep>
diff --git a/qpid/java/lib/poms/mina-core-1.0.1.pom b/qpid/java/lib/poms/mina-core-1.0.1.pom
deleted file mode 100644
index def7041..0000000
--- a/qpid/java/lib/poms/mina-core-1.0.1.pom
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><project>
-  <parent>
-    <artifactId>build</artifactId>
-    <groupId>org.apache.mina</groupId>
-    <version>1.0.1</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>mina-core</artifactId>
-  <name>Apache MINA Core API</name>
-  <version>1.0.1</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>backport-util-concurrent</groupId>
-      <artifactId>backport-util-concurrent</artifactId>
-      <version>2.2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>1.2_Java1.3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <status>deployed</status>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/mina-core-1.0.1.xml b/qpid/java/lib/poms/mina-core-1.0.1.xml
new file mode 100644
index 0000000..87fb969
--- /dev/null
+++ b/qpid/java/lib/poms/mina-core-1.0.1.xml
@@ -0,0 +1,22 @@
+<?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.mina</groupId>
+  <artifactId>mina-core</artifactId>
+  <version>1.0.1</version>
+</dep>
diff --git a/qpid/java/lib/poms/mina-filter-ssl-1.0.1.pom b/qpid/java/lib/poms/mina-filter-ssl-1.0.1.pom
deleted file mode 100644
index 1d5a1ec..0000000
--- a/qpid/java/lib/poms/mina-filter-ssl-1.0.1.pom
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><project>
-  <parent>
-    <artifactId>build</artifactId>
-    <groupId>org.apache.mina</groupId>
-    <version>1.0.1</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>mina-filter-ssl</artifactId>
-  <name>Apache MINA SSL Filter</name>
-  <version>1.0.1</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.mina</groupId>
-      <artifactId>mina-core</artifactId>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <status>deployed</status>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml b/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
new file mode 100644
index 0000000..ae41d7e
--- /dev/null
+++ b/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
@@ -0,0 +1,22 @@
+<?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.mina</groupId>
+  <artifactId>mina-filter-ssl</artifactId>
+  <version>1.0.1</version>
+</dep>
diff --git a/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.pom b/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.pom
deleted file mode 100644
index c7e6cd4..0000000
--- a/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.pom
+++ /dev/null
@@ -1,66 +0,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.
--->
-<project>
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom/pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <name>Apache Felix Framework</name>
-  <artifactId>org.apache.felix.framework</artifactId>
-  <version>1.0.0</version>
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <!--dependency>
-      We include ServiceTracker source code directly to avoid some
-      packaging issues. Will need to edit main pom to exclude this
-      dependency once it is added back in.
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-    </dependency-->
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.0.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>Apache Felix Framework</Bundle-Name>
-            <Bundle-Description>OSGi R4 framework implementation.</Bundle-Description>
-            <Export-Package>org.osgi.framework,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker</Export-Package>
-            <Private-Package>org.apache.felix.moduleloader.*,org.apache.felix.framework.*</Private-Package>
-            <Import-Package>!*</Import-Package>
-            <Include-Resource>{src/main/resources/},org/osgi/framework/=target/classes/org/osgi/framework/</Include-Resource> 
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>  
-</project>
diff --git a/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.xml b/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.xml
new file mode 100644
index 0000000..5c48c0a
--- /dev/null
+++ b/qpid/java/lib/poms/org.apache.felix.framework-1.0.0.xml
@@ -0,0 +1,22 @@
+<?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.framework</artifactId>
+  <version>1.0.0</version>
+</dep>
diff --git a/qpid/java/lib/poms/org.osgi.core-1.0.0.pom b/qpid/java/lib/poms/org.osgi.core-1.0.0.pom
deleted file mode 100644
index 4e512c0..0000000
--- a/qpid/java/lib/poms/org.osgi.core-1.0.0.pom
+++ /dev/null
@@ -1,56 +0,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.
--->
-<project>
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom/pom.xml</relativePath>
-  </parent>
-  <organization>
-    <name>OSGi Alliance</name>
-    <url>http://www.osgi.org/</url>
-  </organization>
-  <modelVersion>4.0.0</modelVersion>
-  <name>OSGi R4 Core Bundle</name>
-  <description>OSGi Service Platform Release 4 Core Interfaces and Classes.</description>
-  <artifactId>org.osgi.core</artifactId>
-  <version>1.0.0</version>
-  <packaging>bundle</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.0.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.osgi.core</Bundle-SymbolicName>
-            <Export-Package>org.osgi.framework, org.osgi.service.condpermadmin, org.osgi.service.packageadmin, org.osgi.service.permissionadmin, org.osgi.service.startlevel, org.osgi.service.url</Export-Package>
-            <Import-Package>org.osgi.framework,org.osgi.service.packageadmin,org.osgi.service.startlevel,org.osgi.service.url,!org.osgi.*,*</Import-Package>
-            <Bundle-Version>4</Bundle-Version>
-            <Bundle-Copyright>Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.</Bundle-Copyright>
-            <Bundle-Category>osgi</Bundle-Category>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/qpid/java/lib/poms/org.osgi.core-1.0.0.xml b/qpid/java/lib/poms/org.osgi.core-1.0.0.xml
new file mode 100644
index 0000000..833cc91
--- /dev/null
+++ b/qpid/java/lib/poms/org.osgi.core-1.0.0.xml
@@ -0,0 +1,22 @@
+<?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.osgi.core</artifactId>
+  <version>1.0.0</version>
+</dep>
diff --git a/qpid/java/lib/poms/slf4j-api-1.4.0.pom b/qpid/java/lib/poms/slf4j-api-1.4.0.pom
deleted file mode 100644
index 13e1418..0000000
--- a/qpid/java/lib/poms/slf4j-api-1.4.0.pom
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0"?><project>
-  <parent>
-    <artifactId>slf4j-parent</artifactId>
-    <groupId>org.slf4j</groupId>
-    <version>1.4.0</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-api</artifactId>
-  <name>SLF4J API Module</name>
-  <version>1.4.0</version>
-  <description>The slf4j API</description>
-  <url>http://www.slf4j.org</url>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>once</forkMode>
-          <reportFormat>plain</reportFormat>
-          <trimStackTrace>false</trimStackTrace>
-          <excludes>
-            <exclude>**/AllTest.java</exclude>
-            <exclude>**/PackageTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>bundle-test-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Bundle-Version>${pv4osgi}</Bundle-Version>
-              <Bundle-Description>${project.description}</Bundle-Description>
-              <Implementation-Version>1.4.0</Implementation-Version>
-            </manifestEntries>
-            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <tasks>
-            <echo>Removing slf4j-api's dummy StaticLoggerBinder and StaticMarkerBinder</echo>
-            <delete dir="target/classes/org/slf4j/impl"></delete>
-          </tasks>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <distributionManagement>
-    <status>deployed</status>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/slf4j-api-1.4.0.xml b/qpid/java/lib/poms/slf4j-api-1.4.0.xml
new file mode 100644
index 0000000..a28a8f2
--- /dev/null
+++ b/qpid/java/lib/poms/slf4j-api-1.4.0.xml
@@ -0,0 +1,22 @@
+<?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.slf4j</groupId>
+  <artifactId>slf4j-api</artifactId>
+  <version>1.4.0</version>
+</dep>
diff --git a/qpid/java/lib/poms/slf4j-log4j12-1.4.0.pom b/qpid/java/lib/poms/slf4j-log4j12-1.4.0.pom
deleted file mode 100644
index 2930255..0000000
--- a/qpid/java/lib/poms/slf4j-log4j12-1.4.0.pom
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?><project>
-  <parent>
-    <artifactId>slf4j-parent</artifactId>
-    <groupId>org.slf4j</groupId>
-    <version>1.4.0</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <name>SLF4J LOG4J-12 Binding</name>
-  <version>1.4.0</version>
-  <description>The slf4j log4j-12 binding</description>
-  <url>http://www.slf4j.org</url>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Bundle-Version>${pv4osgi}</Bundle-Version>
-              <Bundle-Description>${project.description}</Bundle-Description>
-              <Implementation-Version>1.4.0</Implementation-Version>
-            </manifestEntries>
-            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <status>deployed</status>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/slf4j-log4j12-1.4.0.xml b/qpid/java/lib/poms/slf4j-log4j12-1.4.0.xml
new file mode 100644
index 0000000..5aded45
--- /dev/null
+++ b/qpid/java/lib/poms/slf4j-log4j12-1.4.0.xml
@@ -0,0 +1,22 @@
+<?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.slf4j</groupId>
+  <artifactId>slf4j-log4j12</artifactId>
+  <version>1.4.0</version>
+</dep>
diff --git a/qpid/java/lib/poms/xalan-2.7.0.pom b/qpid/java/lib/poms/xalan-2.7.0.pom
deleted file mode 100644
index f543d7e..0000000
--- a/qpid/java/lib/poms/xalan-2.7.0.pom
+++ /dev/null
@@ -1,19 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>xalan</groupId>
-  <artifactId>xalan</artifactId>
-  <version>2.7.0</version>
-  <dependencies>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>2.0.2</version>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.6.0</version>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/xalan-2.7.0.xml b/qpid/java/lib/poms/xalan-2.7.0.xml
new file mode 100644
index 0000000..73ea2df
--- /dev/null
+++ b/qpid/java/lib/poms/xalan-2.7.0.xml
@@ -0,0 +1,22 @@
+<?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>xalan</groupId>
+  <artifactId>xalan</artifactId>
+  <version>2.7.0</version>
+</dep>
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index d6bc818..0535da5 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -18,10 +18,15 @@
  - under the License.
  -
  -->
-<project name="module">
+<project name="module" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
   <import file="common.xml"/>
 
+  <path id="maven-ant-tasks.classpath" path="${project.root}/lib/maven-ant-tasks-2.1.1.jar" />
+  <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+           uri="antlib:org.apache.maven.artifact.ant"
+           classpathref="maven-ant-tasks.classpath" />
+
   <map property="module" value="${basedir}" split="${path.separator}">
     <globmapper from="${project.root}${file.separator}*" to="*"/>
   </map>
@@ -105,6 +110,9 @@
   <property name="module.test.jar"
             location="${build.lib}/${project.name}-${module.name}-tests-${project.version}.jar"/>
 
+  <property name="module.source.jar"
+            location="${build.lib}/${project.name}-${module.name}-${project.version}-sources.jar"/>
+
   <!-- module.depends and module.test.depends are supplied by the importing file -->
   <property name="module.depends"       value=""/>
   <property name="module.test.depends"  value=""/>
@@ -167,18 +175,37 @@
   <target name="pom" depends="prepare" if="module.genpom">
     <jython path="${mllib.dir}">
       <args>
-        <arg line="${project.root}/genpom"/>
-        <arg line="-s ${project.root}/lib/poms"/>
-        <arg line="-o ${build}/${module.name}.pom"/>
+        <arg line='"${project.root}/genpom"'/>
+        <arg line='-s "${project.root}/lib/poms"'/>
+        <arg line='-o "${build.scratch}/qpid-${module.name}.pom"'/>
+        <arg line="-u http://qpid.apache.org"/>
         <arg line="-g org.apache.qpid"/>
+        <arg line="-v ${project.version}${maven.version.suffix}"/>
+        <arg line="-p qpid"/>
+        <arg line='-m "${module.depends}"'/>
         <arg line="-a ${module.name}"/>
-        <arg line="-v ${project.version}"/>
         <arg line="${module.genpom.args}"/>
         <arg line="${module.libs}"/>
       </args>
     </jython>
   </target>
 
+  <target name="release-mvn" depends="pom" if="module.genpom" description="Install the artifacts into the local repository and prepare the release">
+    <antcall target="build"/>
+
+    <artifact:pom id="module.pom" file="${build.scratch}/qpid-${module.name}.pom"/>
+
+    <artifact:install file="${module.jar}" pomRefId="module.pom">
+        <localRepository path="${maven.local.repo}"/>
+    </artifact:install>
+
+    <artifact:deploy file="${module.jar}" pomRefId="module.pom" uniqueVersion="${maven.unique.version}">
+      <attach file="${module.source.jar}" classifier="sources"/>
+      <localRepository path="${maven.local.repo}"/>
+      <remoteRepository url="file://${module.release.base}/maven"/>
+    </artifact:deploy>
+  </target>
+
   <target name="precompile"/>
 
   <target name="compile" depends="prepare,precompile" description="compile sources">
@@ -350,7 +377,7 @@
 
   <target name="postbuild" description="run after a build"/>
 
-  <target name="build" depends="jar,jar-tests,libs,copy-bin,copy-etc,postbuild" description="compile and copy resources into build tree"/>
+  <target name="build" depends="jar,jar-tests,jar-sources,libs,copy-bin,copy-etc,postbuild" description="compile and copy resources into build tree"/>
   <target name="jar.manifest" depends="compile" if="module.manifest">
     <jar destfile="${module.jar}" basedir="${module.classes}" manifest="${module.manifest}"/>
   </target>
@@ -371,6 +398,17 @@
     <copylist todir="${build.lib}" dir="${project.root}" files="${module.libs}"/>
   </target>
 
+  <target name="jar-sources" depends="prepare" description="create sources jar">
+    <jar destfile="${module.source.jar}">
+      <fileset dir="${project.root}/resources">
+        <include name="LICENSE"/>
+        <include name="NOTICE"/>
+      </fileset>
+      <fileset dir="${module.src}" includes="**/*.java"/>
+      <fileset dir="${module.precompiled}" includes="**/*.java"/>
+    </jar>
+  </target>
+
   <map property="module.depends.jars" value="${module.depends}" join=",">
     <globmapper from="*" to="${project.name}-*-${project.version}.jar"/>
     <filtermapper>