summaryrefslogtreecommitdiffstats
path: root/archiva-jetty
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-10-27 18:09:49 +0000
committerOlivier Lamy <olamy@apache.org>2011-10-27 18:09:49 +0000
commite624d21c43d266c097123f89d8d82c181640f6c3 (patch)
treec876e75847b50b31874c1345acbe47c533086642 /archiva-jetty
parent61fb9ae0738e934d2f71aa8a993d1dc913b9fdb3 (diff)
downloadarchiva-e624d21c43d266c097123f89d8d82c181640f6c3.tar.gz
archiva-e624d21c43d266c097123f89d8d82c181640f6c3.zip
[MRM-1539] Upgrade to Jetty 7.
change pom declaration. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1189902 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-jetty')
-rw-r--r--archiva-jetty/pom.xml26
1 files changed, 11 insertions, 15 deletions
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 050c9249d..c88f31b58 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -31,13 +31,8 @@
<name>Apache Archiva</name>
<dependencies>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>start</artifactId>
- <version>${jetty.version}</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -52,21 +47,22 @@
</dependency>
<!-- Runtime dependencies that need to be included in the generated binaries -->
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-naming</artifactId>
- <version>${jetty.version}</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jndi</artifactId>
+ <version>${jettyVersion}</version>
<scope>runtime</scope>
</dependency>
+ <!--
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-jetty</artifactId>
- <version>${jetty.version}</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-</artifactId>
+ <version>${jettyVersion}</version>
<scope>runtime</scope>
</dependency>
+ -->
<dependency>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
- <version>${jetty.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>