You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2012/03/08 02:09:16 UTC
svn commit: r1298247 - in /lucene/dev/trunk/dev-tools/maven: ./
lucene/contrib/demo/ solr/contrib/clustering/
solr/contrib/dataimporthandler/ solr/core/ solr/webapp/
Author: sarowe
Date: Thu Mar 8 01:09:16 2012
New Revision: 1298247
URL: http://svn.apache.org/viewvc?rev=1298247&view=rev
Log:
SOLR-3159: Maven configuration: Upgrade to Jetty 8
Modified:
lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template?rev=1298247&r1=1298246&r2=1298247&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template Thu Mar 8 01:09:16 2012
@@ -70,8 +70,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1298247&r1=1298246&r2=1298247&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Thu Mar 8 01:09:16 2012
@@ -42,8 +42,7 @@
<base.specification.version>4.0.0</base.specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.6</java.compat.version>
- <jetty.version>6.1.26</jetty.version>
- <patched.jetty.version>6.1.26-patched-JETTY-1340</patched.jetty.version>
+ <jetty.version>8.1.1.v20120215</jetty.version>
<slf4j.version>1.6.1</slf4j.version>
<tika.version>1.0</tika.version>
</properties>
@@ -296,14 +295,24 @@
<version>2.2</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${patched.jetty.version}</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${patched.jetty.version}</version>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -331,9 +340,9 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>3.0.0.v201112011016</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -490,7 +499,7 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
</plugin>
<plugin>
@@ -649,34 +658,6 @@
</configuration>
</execution>
<execution>
- <id>install-jetty</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${patched.jetty.version}</version>
- <packaging>jar</packaging>
- <file>solr/example/lib/jetty-${patched.jetty.version}.jar</file>
- </configuration>
- </execution>
- <execution>
- <id>install-jetty-util</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${patched.jetty.version}</version>
- <packaging>jar</packaging>
- <file>solr/example/lib/jetty-util-${patched.jetty.version}.jar</file>
- </configuration>
- </execution>
- <execution>
<id>install-jsonic</id>
<phase>install</phase>
<goals>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1298247&r1=1298246&r2=1298247&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template Thu Mar 8 01:09:16 2012
@@ -94,12 +94,17 @@
</exclusions>
</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.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?rev=1298247&r1=1298246&r2=1298247&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Thu Mar 8 01:09:16 2012
@@ -73,12 +73,17 @@
<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.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template?rev=1298247&r1=1298246&r2=1298247&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template Thu Mar 8 01:09:16 2012
@@ -172,16 +172,21 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
<optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
+ </dependency>
+ <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<scope>runtime</scope>
@@ -193,8 +198,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
<!-- compile scope; solr-core is a jar not a war -->
</dependency>
<dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template?rev=1298247&r1=1298246&r2=1298247&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template Thu Mar 8 01:09:16 2012
@@ -58,8 +58,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -100,7 +100,7 @@
<plugin>
<!-- http://docs.codehaus.org/display/JETTY/Maven+Jetty+Plugin -->
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webAppConfig>