From 48e9e9f361feb8343b5bbac9fca1c0b0c6e4984e Mon Sep 17 00:00:00 2001
From: Steven Rowe <sarowe@apache.org>
Date: Sun, 12 Aug 2012 16:29:30 +0000
Subject: [PATCH] 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
---
 dev-tools/maven/solr/core/pom.xml.template           | 1 +
 dev-tools/maven/solr/test-framework/pom.xml.template | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/dev-tools/maven/solr/core/pom.xml.template b/dev-tools/maven/solr/core/pom.xml.template
index 22f4cd23d01..37f672ddffa 100644
--- a/dev-tools/maven/solr/core/pom.xml.template
+++ b/dev-tools/maven/solr/core/pom.xml.template
@@ -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>
diff --git a/dev-tools/maven/solr/test-framework/pom.xml.template b/dev-tools/maven/solr/test-framework/pom.xml.template
index 5735f54f5e8..c5842ec4552 100644
--- a/dev-tools/maven/solr/test-framework/pom.xml.template
+++ b/dev-tools/maven/solr/test-framework/pom.xml.template
@@ -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>