diff options
Diffstat (limited to 'archiva-modules')
4 files changed, 12 insertions, 6 deletions
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 4f1f872bd..6c2331e29 100644 --- 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 19410db48..cd62e0323 100644 --- 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 323ffd79c..30d167aa5 100644 --- 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 19d73e7a3..e37ad2895 100644 --- 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> |