move versions in parent pom

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

diff --git a/archiva-jetty-js/pom.xml b/archiva-jetty-js/pom.xml
index af16f8653b93c336ca4a4112411de2d3b03cc1ba..34f9e5df1b3d4805f3ccd9dd559947bc06b71bda 100644 (file)
--- a/archiva-jetty-js/pom.xml
+++ b/archiva-jetty-js/pom.xml
@@ -82,21 +82,18 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.6.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
-      <version>1.4</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.6</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index e18cda0e11d4e5e64e70e21a3863db0d2ba50170..941f035ba2db6799d1fcd4e92fa09e94bd7776ff 100644 (file)
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -70,15 +70,6 @@
       <version>${jettyVersion}</version>
       <scope>runtime</scope>
     </dependency>
-    <!--
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jsp-2.1</artifactId>
-      <version>${jettyVersion}</version>
-      <scope>runtime</scope>
-    </dependency>
-    -->
-
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
@@ -112,21 +103,18 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.6.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
-      <version>1.4</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.6</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
index ffdc448c7831335eb1ea4152cc23c6aa40d64b33..dc9f6a0ca5df6598f915fce12c9b48c5f58e2bf8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -629,6 +629,18 @@
         <artifactId>commons-lang</artifactId>
         <version>${commons-lang.version}</version>
       </dependency>
+      <dependency>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <version>1.6</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>commons-dbcp</groupId>
+        <artifactId>commons-dbcp</artifactId>
+        <version>1.4</version>
+        <scope>runtime</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>