You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2021/03/09 05:27:26 UTC

[lucene-solr] branch master updated: SOLR-2852: SolrJ: remove Woodstox dependency (#2461)

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new cf1025e  SOLR-2852: SolrJ: remove Woodstox dependency (#2461)
cf1025e is described below

commit cf1025e576a6cec6f724108994a778795cad6b64
Author: David Smiley <ds...@apache.org>
AuthorDate: Tue Mar 9 00:27:03 2021 -0500

    SOLR-2852: SolrJ: remove Woodstox dependency (#2461)
    
    It was never truly required there.
    Pervasive use of "javabin" reduces the need to care about client-side XML speed.  Better to reduce dependencies and let clients use the libs they want.
---
 solr/CHANGES.txt        | 4 ++++
 solr/core/build.gradle  | 5 +++++
 solr/solrj/build.gradle | 4 ----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b864471..9f2ee9f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -91,6 +91,10 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)
 * SOLR-15185: Various optimizations to the {!hash} QParser, typically used by the parallel()
   streaming expression.  The hash algorithm changed.  (David Smiley)
 
+* SOLR-2852: SolrJ: remove Woodstox dependency.  It was never truly required there.
+  Software doing lots of XML processing can choose to add it or alternatives if they wish.
+  (David Smiley)
+
 Other Changes
 ----------------------
 * SOLR-14656: Autoscaling framework removed (Ishan Chattopadhyaya, noble, Ilan Ginzburg)
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 8af854d..34214e6 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -118,6 +118,11 @@ dependencies {
 
   implementation 'org.rrd4j:rrd4j'
 
+  // For faster XML processing than the JDK
+  implementation ('org.codehaus.woodstox:woodstox-core-asl', {
+    exclude group: "javax.xml.stream", module: "stax-api"
+  })
+
   implementation ('org.apache.calcite.avatica:avatica-core') { transitive = false }
   implementation ('org.apache.calcite:calcite-core') { transitive = false }
   implementation ('org.apache.calcite:calcite-linq4j') { transitive = false }
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index 7dfd3cb..a7f3315 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -55,10 +55,6 @@ dependencies {
     exclude group: "org.slf4j", module: "slf4j-log4j12"
   })
 
-  api('org.codehaus.woodstox:woodstox-core-asl', {
-    exclude group: "javax.xml.stream", module: "stax-api"
-  })
-
   testImplementation project(':solr:test-framework')
   testImplementation 'org.eclipse.jetty:jetty-webapp'
   testImplementation ('org.eclipse.jetty:jetty-alpn-java-server', {