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

fix clustering and DIH problems with conflicting servlet-api dependencies by making scope be provided in solr's test-framework POM 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1372145 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2012-08-12 16:29:30 +00:00
parent e2518705e8
commit 48e9e9f361
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,6 +245,7 @@
<configuration>
<systemPropertyVariables>
<java.util.logging.config.file>${surefire-top-level}/solr/testlogging.properties</java.util.logging.config.file>
<java.util.logging.ConsoleHandler.level>INFO</java.util.logging.ConsoleHandler.level>
</systemPropertyVariables>
</configuration>
</plugin>

2
dev-tools/maven/solr/test-framework/pom.xml.template
View File

@ -57,6 +57,8 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<!-- SOLR-3263: Provided scope is required to avoid jar signing conflicts -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>