[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

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 050c9249d73382e2ca30181db8a4dcad085d314a..c88f31b588eff8e2bc204e2d35cd15f36cac79ab 100644 (file)
--- 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>

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 4f1f872bd8ddf2e80911e69303f1a7cf4a3364c9..6c2331e2919ebfc4f8bf4f614b6f39ad980d06d9 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -29,8 +29,7 @@
   <name>Archiva Web :: REST support :: Services</name>
 
   <properties>
-    <jettyVersion>7.4.5.v20110725</jettyVersion>
-    <archiva.baseRestUrl />
+<archiva.baseRestUrl />
     <tomcatVersion>7.0.21</tomcatVersion>
     <rest.admin.pwd />
     <test.useTomcat>false</test.useTomcat>

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 19410db48c1d4edc80fbf9edb1aafcd14c0bde7e..cd62e03234c1a089be353ca63ef0d9c52452831a 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -144,10 +144,12 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-rest-api</artifactId>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-struts2-jqboot-theme</artifactId>
     </dependency>
+    -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
@@ -656,7 +658,7 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>${jetty.version}</version>
+        <version>${jettyVersion}</version>
         <configuration>
           <webAppConfig>
             <contextPath>/</contextPath>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
index 323ffd79cbfae4a9debd0a6de974227084121ee6..30d167aa5363eeb9abcfd8a896f6b6d7ed36d84a 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-struts.ui.theme=jqboot
+#struts.ui.theme=jqboot
 
 # define our own action mapper here
 struts.mapper.class = org.apache.archiva.web.mapper.RepositoryActionMapper

diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 19d73e7a3889957fda56d429d9432ef816a401fe..e37ad28957976cf071388d86443355d36f2b8277 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -126,8 +126,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-plus</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
index ee5bedf40861d8e0c82e4c4c85fa5096f8b83479..4d98ddfb736b544ee7490c9df147c707b7845392 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,6 @@
     <maven.version>2.0.8</maven.version>
     <wagon.version>2.0</wagon.version>
     <redback.version>1.3</redback.version>
-    <jetty.version>6.1.19</jetty.version>
     <slf4j.version>1.6.1</slf4j.version>
     <binder.version>0.11</binder.version>
     <spring.version>3.0.5.RELEASE</spring.version>
@@ -70,6 +69,7 @@
     <cxfVersion>2.4.3</cxfVersion>
     <derbyVersion>10.8.2.2</derbyVersion>
     <javaxMailVersion>1.4</javaxMailVersion>
+    <jettyVersion>7.4.5.v20110725</jettyVersion>
   </properties>
 
   <dependencyManagement>
@@ -1119,9 +1119,14 @@
         <version>1.5.2</version>
       </dependency>
       <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
-        <version>${jetty.version}</version>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-server</artifactId>
+        <version>${jettyVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-plus</artifactId>
+        <version>${jettyVersion}</version>
       </dependency>
 
       <!-- xmlrpc -->