diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-10-27 18:11:45 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-10-27 18:11:45 +0000 |
| commit | 438c37f0d3b229ece69befbb370cee7993915cb3 (patch) | |
| tree | d8664dcb267c109ca7495fcbfea4cf2b24af63a9 /archiva-jetty/pom.xml | |
| parent | e08cfa494da7a820be5a02c18818c464abb77fd3 (diff) | |
| download | archiva-438c37f0d3b229ece69befbb370cee7993915cb3.tar.gz archiva-438c37f0d3b229ece69befbb370cee7993915cb3.zip | |
[MRM-1539] Upgrade to Jetty 7
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1189909 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-jetty/pom.xml')
| -rw-r--r-- | archiva-jetty/pom.xml | 44 |
1 files changed, 40 insertions, 4 deletions
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index c88f31b58..390dc3358 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -52,20 +52,56 @@ <version>${jettyVersion}</version> <scope>runtime</scope> </dependency> - <!-- + <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-</artifactId> + <artifactId>jetty-start</artifactId> <version>${jettyVersion}</version> <scope>runtime</scope> </dependency> - --> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-plus</artifactId> <scope>runtime</scope> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-deploy</artifactId> + <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> + <artifactId>jsp-2.1-glassfish</artifactId> + <version>9.1.1.B60.25.p0</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-api-2.1-glassfish</artifactId> + <version>9.1.1.B60.25.p0</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.jdt.core.compiler</groupId> + <artifactId>ecj</artifactId> + <version>3.7</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <scope>runtime</scope> @@ -97,7 +133,7 @@ <daemons> <daemon> <id>archiva</id> - <mainClass>org.mortbay.start.Main</mainClass> + <mainClass>org.eclipse.jetty.start.Main</mainClass> <commandLineArguments> <commandLineArgument>conf/jetty.xml</commandLineArgument> </commandLineArguments> |