Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-3263: Stop including more than one servlet-api jar version in the test classpath in the Maven build 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1303516 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2012-03-21 19:25:26 +00:00
parent 115c1c1ecc
commit 3e64aa58de
6 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
View File

@ -82,6 +82,12 @@
<artifactId>lucene-analyzers-stempel</artifactId> <artifactId>lucene-analyzers-stempel</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<!-- SOLR-3263: Test scope dep is required to avoid jar signing conflicts -->
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<directory>${build-directory}</directory> <directory>${build-directory}</directory>

6
dev-tools/maven/solr/contrib/extraction/pom.xml.template
View File

@ -83,6 +83,12 @@
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.8.1</version> <version>2.8.1</version>
</dependency> </dependency>
<dependency>
<!-- SOLR-3263: Test scope dep is required to avoid jar signing conflicts -->
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<directory>${build-directory}</directory> <directory>${build-directory}</directory>

6
dev-tools/maven/solr/contrib/langid/pom.xml.template
View File

@ -83,6 +83,12 @@
<groupId>org.apache.tika</groupId> <groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId> <artifactId>tika-parsers</artifactId>
</dependency> </dependency>
<dependency>
<!-- SOLR-3263: Test scope dep is required to avoid jar signing conflicts -->
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<directory>${build-directory}</directory> <directory>${build-directory}</directory>

6
dev-tools/maven/solr/contrib/uima/pom.xml.template
View File

@ -100,6 +100,12 @@
<groupId>org.apache.uima</groupId> <groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId> <artifactId>uimaj-core</artifactId>
</dependency> </dependency>
<dependency>
<!-- SOLR-3263: Test scope dep is required to avoid jar signing conflicts -->
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<directory>${build-directory}</directory> <directory>${build-directory}</directory>

6
dev-tools/maven/solr/contrib/velocity/pom.xml.template
View File

@ -123,6 +123,12 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<!-- SOLR-3263: Test scope dep is required to avoid jar signing conflicts -->
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<directory>${build-directory}</directory> <directory>${build-directory}</directory>

3
dev-tools/maven/solr/core/pom.xml.template
View File

@ -200,7 +200,8 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
<!-- compile scope; solr-core is a jar not a war --> <!-- SOLR-3263: Provided scope is required to avoid jar signing conflicts -->
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.easymock</groupId> <groupId>org.easymock</groupId>