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 2011/02/26 06:33:32 UTC
svn commit: r1074796 - in /lucene/dev/trunk/dev-tools/maven:
pom.xml.template solr/contrib/clustering/pom.xml.template
solr/contrib/dataimporthandler/src/pom.xml.template
solr/contrib/extraction/pom.xml.template solr/contrib/uima/pom.xml.template
Author: sarowe
Date: Sat Feb 26 05:33:31 2011
New Revision: 1074796
URL: http://svn.apache.org/viewvc?rev=1074796&view=rev
Log:
SOLR-2381: adjust maven POMs to use^Che new Jetty jars
Modified:
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/src/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template
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=1074796&r1=1074795&r2=1074796&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Sat Feb 26 05:33:31 2011
@@ -42,6 +42,7 @@
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.5</java.compat.version>
<jetty.version>6.1.26</jetty.version>
+ <patched.jetty.version>6.1.26-patched-JETTY-1340</patched.jetty.version>
<slf4j.version>1.6.1</slf4j.version>
<tika.version>0.8</tika.version>
<uima.version>${project.version}</uima.version>
@@ -315,12 +316,12 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
+ <version>${patched.jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
+ <version>${patched.jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -785,6 +786,34 @@
<file>solr/contrib/uima/lib/uima-core.jar</file>
</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>
</executions>
</plugin>
</plugins>
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=1074796&r1=1074795&r2=1074796&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 Sat Feb 26 05:33:31 2011
@@ -67,6 +67,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-core</artifactId>
</dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template?rev=1074796&r1=1074795&r2=1074796&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template Sat Feb 26 05:33:31 2011
@@ -67,6 +67,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1074796&r1=1074795&r2=1074796&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template Sat Feb 26 05:33:31 2011
@@ -74,6 +74,11 @@
<artifactId>icu4j</artifactId>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
</dependency>
Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1074796&r1=1074795&r2=1074796&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template Sat Feb 26 05:33:31 2011
@@ -70,6 +70,11 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>uima-alchemy-annotator</artifactId>
</dependency>