You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2008/11/19 19:49:06 UTC
svn commit: r719022 - in /lucene/solr/trunk: ./ client/java/solrj/ lib/
src/java/org/apache/solr/handler/ src/maven/
src/test/org/apache/solr/handler/
Author: ryan
Date: Wed Nov 19 10:49:06 2008
New Revision: 719022
URL: http://svn.apache.org/viewvc?rev=719022&view=rev
Log:
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)
Removed:
lucene/solr/trunk/lib/stax-utils.jar
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/client/java/solrj/solr-solrj-pom.xml.template
lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
lucene/solr/trunk/src/maven/solr-common-pom.xml.template
lucene/solr/trunk/src/maven/solr-core-pom.xml.template
lucene/solr/trunk/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java
lucene/solr/trunk/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=719022&r1=719021&r2=719022&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Wed Nov 19 10:49:06 2008
@@ -136,6 +136,9 @@
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
----------------------
Modified: lucene/solr/trunk/client/java/solrj/solr-solrj-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/solr-solrj-pom.xml.template?rev=719022&r1=719021&r2=719022&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/solr-solrj-pom.xml.template (original)
+++ lucene/solr/trunk/client/java/solrj/solr-solrj-pom.xml.template Wed Nov 19 10:49:06 2008
@@ -62,11 +62,6 @@
<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>
<version>1.2</version>
@@ -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>
- <groupId>stax-utils</groupId>
- <artifactId>stax-utils</artifactId>
- <version>snapshot-20040917</version>
- </dependency>
+ </dependency>
</dependencies>
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandler.java?rev=719022&r1=719021&r2=719022&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandler.java Wed Nov 19 10:49:06 2008
@@ -16,7 +16,6 @@
* 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 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
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java?rev=719022&r1=719021&r2=719022&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java Wed Nov 19 10:49:06 2008
@@ -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 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
Modified: lucene/solr/trunk/src/maven/solr-common-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/maven/solr-common-pom.xml.template?rev=719022&r1=719021&r2=719022&view=diff
==============================================================================
--- lucene/solr/trunk/src/maven/solr-common-pom.xml.template (original)
+++ lucene/solr/trunk/src/maven/solr-common-pom.xml.template Wed Nov 19 10:49:06 2008
@@ -39,10 +39,10 @@
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.3</version>
- </dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.5</version>
+ </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>
-->
Modified: lucene/solr/trunk/src/maven/solr-core-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/maven/solr-core-pom.xml.template?rev=719022&r1=719021&r2=719022&view=diff
==============================================================================
--- lucene/solr/trunk/src/maven/solr-core-pom.xml.template (original)
+++ lucene/solr/trunk/src/maven/solr-core-pom.xml.template Wed Nov 19 10:49:06 2008
@@ -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>
- <groupId>stax-utils</groupId>
- <artifactId>stax-utils</artifactId>
- <version>snapshot-20040917</version>
- </dependency>
+ </dependency>
</dependencies>
Modified: lucene/solr/trunk/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java?rev=719022&r1=719021&r2=719022&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java Wed Nov 19 10:49:06 2008
@@ -16,18 +16,15 @@
* 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() {
Modified: lucene/solr/trunk/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java?rev=719022&r1=719021&r2=719022&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java Wed Nov 19 10:49:06 2008
@@ -4,18 +4,14 @@
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"; }