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

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

@@ -82,6 +82,12 @@
       <artifactId>lucene-analyzers-stempel</artifactId>
       <version>${project.version}</version>
     </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>
   <build>
     <directory>${build-directory}</directory>

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

@@ -83,6 +83,12 @@
       <artifactId>xercesImpl</artifactId>
       <version>2.8.1</version>
     </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>
   <build>
     <directory>${build-directory}</directory>

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

@@ -83,6 +83,12 @@
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-parsers</artifactId>
     </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>
   <build>
     <directory>${build-directory}</directory>

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

@@ -100,6 +100,12 @@
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
     </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>
   <build>
     <directory>${build-directory}</directory>

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

@@ -123,6 +123,12 @@
         </exclusion>
       </exclusions>
     </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>
   <build>
     <directory>${build-directory}</directory>

dev-tools/maven/solr/core/pom.xml.template

@@ -200,7 +200,8 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <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>
       <groupId>org.easymock</groupId>