SOLR-871: Removed dependancy on stax-utils.jar. If you using solr.jar and running

java 6, you can also remove woodstox and geronimo.  (ryan)

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@719022 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -136,6 +136,9 @@ Other Changes
 
  4. SOLR-852: Refactored common code in CSVRequestHandler and XMLUpdateRequestHandler (gsingers, ehatcher)
 
+ 5. SOLR-871: Removed dependancy on stax-utils.jar.  If you using solr.jar and running 
+    java 6, you can also remove woodstox and geronimo.  (ryan)
+
 
 Build
 ----------------------

client/java/solrj/solr-solrj-pom.xml.template

@@ -61,11 +61,6 @@
       <artifactId>commons-io</artifactId>
       <version>1.3.2</version>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-    </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
@@ -82,12 +77,7 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-stax-api_1.0_spec</artifactId>
       <version>1.0.1</version>
-    </dependency>
+    </dependency>   
-    <dependency>
-      <groupId>stax-utils</groupId>
-      <artifactId>stax-utils</artifactId>
-      <version>snapshot-20040917</version>
-    </dependency>
 
   </dependencies>
 

lib/stax-utils.jar

@@ -1,2 +0,0 @@
-AnyObjectId[cd0573d31467410867251dad9df12ebeb97443ab] was removed in git history.
-Apache SVN contains full history.

src/java/org/apache/solr/handler/AnalysisRequestHandler.java

@@ -16,7 +16,6 @@ package org.apache.solr.handler;
  * limitations under the License.
  */
 
-import javanet.staxutils.BaseXMLInputFactory;
 import org.apache.commons.io.IOUtils;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.Token;
@@ -60,7 +59,7 @@ public class AnalysisRequestHandler extends RequestHandlerBase {
   public void init(NamedList args) {
     super.init(args);
 
-    inputFactory = BaseXMLInputFactory.newInstance();
+    inputFactory = XMLInputFactory.newInstance();
     try {
       // The java 1.6 bundled stax parser (sjsxp) does not currently have a thread-safe
       // XMLInputFactory, as that implementation tries to cache and reuse the

src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java

@@ -17,7 +17,6 @@
 
 package org.apache.solr.handler;
 
-import javanet.staxutils.BaseXMLInputFactory;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.MapSolrParams;
 import org.apache.solr.common.params.SolrParams;
@@ -68,7 +67,7 @@ public class XmlUpdateRequestHandler extends ContentStreamHandlerBase {
   public void init(NamedList args) {
     super.init(args);
 
-    inputFactory = BaseXMLInputFactory.newInstance();
+    inputFactory = XMLInputFactory.newInstance();
     try {
       // The java 1.6 bundled stax parser (sjsxp) does not currently have a thread-safe
       // XMLInputFactory, as that implementation tries to cache and reuse the

src/maven/solr-common-pom.xml.template

@@ -39,10 +39,10 @@
   <dependencies>
 
     <dependency>
-	  <groupId>org.slf4j</groupId>
+	    <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
+	    <artifactId>slf4j-api</artifactId>
-	  <version>1.5.3</version>
+	    <version>1.5.5</version>
-	</dependency> 
+	  </dependency> 
 	
 	<!--
 	Your app will need an slf4j implementation, it does not matter which one...
@@ -50,6 +50,7 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <version>1.5.3</version>
+      <scope>runtime</scope>
     </dependency>
     -->
 

src/maven/solr-core-pom.xml.template

@@ -93,11 +93,6 @@
       <artifactId>commons-io</artifactId>
       <version>1.3.2</version>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-    </dependency>
 
     <!-- Solr specific commons csv -->
     <dependency>
@@ -106,7 +101,7 @@
       <version>@maven_version@</version>
     </dependency>
 
-    <!-- Stax -->
+    <!-- Stax : we could exclude this because already dependancy of solrj -->
     <dependency>
       <groupId>woodstox</groupId>
       <artifactId>wstx-asl</artifactId>
@@ -116,12 +111,7 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-stax-api_1.0_spec</artifactId>
       <version>1.0.1</version>
-    </dependency>
+    </dependency>   
-    <dependency>
-      <groupId>stax-utils</groupId>
-      <artifactId>stax-utils</artifactId>
-      <version>snapshot-20040917</version>
-    </dependency>
 
   </dependencies>
 

src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java

@@ -16,18 +16,15 @@ package org.apache.solr.handler;
  * limitations under the License.
  */
 
-import javanet.staxutils.BaseXMLInputFactory;
-import org.apache.lucene.analysis.Token;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.util.AbstractSolrTestCase;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 import java.io.StringReader;
-import java.util.List;
 
 public class AnalysisRequestHandlerTest extends AbstractSolrTestCase {
-  private XMLInputFactory inputFactory = BaseXMLInputFactory.newInstance();
+  private XMLInputFactory inputFactory = XMLInputFactory.newInstance();
 
   @Override
   public String getSchemaFile() {

src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java

@@ -4,18 +4,14 @@ import org.apache.solr.util.AbstractSolrTestCase;
 import java.io.StringReader;
 import java.util.Collection;
 
-import javanet.staxutils.BaseXMLInputFactory;
-
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
-import junit.framework.TestCase;
-
 import org.apache.solr.common.SolrInputDocument;
 
 public class XmlUpdateRequestHandlerTest extends AbstractSolrTestCase 
 {
-  private XMLInputFactory inputFactory = BaseXMLInputFactory.newInstance();
+  private XMLInputFactory inputFactory = XMLInputFactory.newInstance();
   protected XmlUpdateRequestHandler handler;
 
 @Override public String getSchemaFile() { return "schema.xml"; }