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/08/12 18:32:10 UTC
svn commit: r1372146 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
dev-tools/maven/solr/core/pom.xml.template
dev-tools/maven/solr/test-framework/pom.xml.template lucene/ solr/
Author: sarowe
Date: Sun Aug 12 16:32:10 2012
New Revision: 1372146
URL: http://svn.apache.org/viewvc?rev=1372146&view=rev
Log:
fix clustering and DIH problems with conflicting servlet-api dependencies by making scope be provided in solr's test-framework POM (merged r1372145 from trunk)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template?rev=1372146&r1=1372145&r2=1372146&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/core/pom.xml.template Sun Aug 12 16:32:10 2012
@@ -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>
Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template?rev=1372146&r1=1372145&r2=1372146&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/test-framework/pom.xml.template Sun Aug 12 16:32:10 2012
@@ -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>