summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--archiva-jetty-js/pom.xml5
-rw-r--r--archiva-jetty/pom.xml14
-rw-r--r--pom.xml12
3 files changed, 14 insertions, 17 deletions
diff --git a/archiva-jetty-js/pom.xml b/archiva-jetty-js/pom.xml
index af16f8653..34f9e5df1 100644
--- 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 e18cda0e1..941f035ba 100644
--- 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 ffdc448c7..dc9f6a0ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -630,6 +630,18 @@
<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>
<version>1.2</version>