Author: olamy
Date: Thu Oct 27 18:09:49 2011
New Revision: 1189902
URL: http://svn.apache.org/viewvc?rev=1189902&view=rev
Log:
[MRM-1539] Upgrade to Jetty 7.
change pom declaration.
Modified:
archiva/trunk/archiva-jetty/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/pom.xml?rev=1189902&r1=1189901&r2=1189902&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/pom.xml (original)
+++ archiva/trunk/archiva-jetty/pom.xml Thu Oct 27 18:09:49 2011
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1189902&r1=1189901&r2=1189902&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Thu Oct 27 18:09:49 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1189902&r1=1189901&r2=1189902&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Oct 27
18:09:49 2011
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties?rev=1189902&r1=1189901&r2=1189902&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
Thu Oct 27 18:09:49 2011
@@ -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
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1189902&r1=1189901&r2=1189902&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Thu Oct 27
18:09:49 2011
@@ -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>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1189902&r1=1189901&r2=1189902&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Thu Oct 27 18:09:49 2011
@@ -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 -->
