SOLR-2381: adjust maven POMs to use^Che new Jetty jars

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1074796 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2011-02-26 05:33:31 +00:00
parent ee1228ac82
commit 3985b909e7
5 changed files with 51 additions and 2 deletions

View File

@ -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>

View File

@ -66,6 +66,11 @@
<type>test-jar</type>
<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>

View File

@ -66,6 +66,11 @@
<type>test-jar</type>
<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>

View File

@ -73,6 +73,11 @@
<groupId>com.ibm.icu</groupId>
<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>

View File

@ -69,6 +69,11 @@
<groupId>commons-lang</groupId>
<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>