[lucene-solr] 01/03: Revert "Adding woodstox temporarily so that tests pass."

[dw...@apache.org]

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

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

commit 78575f0a2c138e4a58cc2fa4022dc5c04c2e84f1
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Sat Dec 7 10:51:00 2019 +0100

    Revert "Adding woodstox temporarily so that tests pass."
    
    This reverts commit de8a37ee72c83ae35db195238dcd64af0d2df32b.
---
 solr/core/build.gradle | 6 ------
 versions.lock          | 3 +--
 versions.props         | 7 +++----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 15369e9..0f0a4d0 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -90,12 +90,6 @@ dependencies {
   implementation ('org.apache.hadoop:hadoop-common') { transitive = false }
   implementation ('org.apache.hadoop:hadoop-hdfs-client') { transitive = false }
 
-  // Adding this temporarily until it's fixed on master.
-  api('org.codehaus.woodstox:woodstox-core-asl', {
-    exclude group: "javax.xml.stream", module: "stax-api"
-  })
-
-
   implementation ('net.hydromatic:eigenbase-properties') { transitive = false }
 
   runtimeOnly ('org.apache.curator:curator-recipes') { transitive = false }
diff --git a/versions.lock b/versions.lock
index 056dc41..6b3d074 100644
--- a/versions.lock
+++ b/versions.lock
@@ -161,8 +161,7 @@ org.checkerframework:checker-qual:2.0.0 (1 constraints: 140ae5b4)
 org.codehaus.janino:commons-compiler:3.0.9 (2 constraints: d910f7d1)
 org.codehaus.janino:janino:3.0.9 (1 constraints: 0e050336)
 org.codehaus.mojo:animal-sniffer-annotations:1.14 (1 constraints: ea09d5aa)
-org.codehaus.woodstox:stax2-api:4.2 (4 constraints: 272e5d38)
-org.codehaus.woodstox:woodstox-core-asl:4.4.1 (1 constraints: 0b050c36)
+org.codehaus.woodstox:stax2-api:4.2 (3 constraints: 0d1d3ffc)
 org.eclipse.jetty:jetty-alpn-client:9.4.19.v20190610 (3 constraints: d12c8400)
 org.eclipse.jetty:jetty-alpn-java-client:9.4.19.v20190610 (1 constraints: 8007517d)
 org.eclipse.jetty:jetty-alpn-java-server:9.4.19.v20190610 (1 constraints: 8007517d)
diff --git a/versions.props b/versions.props
index 22b685f..ea3786c 100644
--- a/versions.props
+++ b/versions.props
@@ -5,9 +5,7 @@ com.cybozu.labs:langdetect=1.1-20120112
 com.drewnoakes:metadata-extractor=2.11.0
 com.epam:parso=2.0.9
 com.fasterxml.jackson*:*=2.9.9
-com.fasterxml.staxmate:staxmate=2.3.1
 com.fasterxml.woodstox:*=4.4.1
-com.fasterxml:aalto-xml=1.2.2
 com.github.ben-manes.caffeine:caffeine=2.8.0
 com.github.virtuald:curvesapi=1.04
 com.github.zafarkhaja:java-semver=0.9.0
@@ -38,7 +36,6 @@ commons-logging:commons-logging=1.1.3
 de.l3s.boilerpipe:boilerpipe=1.1.0
 info.ganglia.gmetric4j:gmetric4j=1.0.7
 io.dropwizard.metrics:*=4.0.5
-io.jaegertracing:*=0.35.5
 io.netty:*=4.1.29.Final
 io.opentracing:*=0.33.0
 io.prometheus:*=0.2.0
@@ -91,7 +88,8 @@ org.carrot2:morfologik-*=2.1.5
 org.ccil.cowan.tagsoup:tagsoup=1.2.1
 org.codehaus.janino:*=3.0.9
 org.codehaus.woodstox:stax2-api=4.2
-org.codehaus.woodstox:woodstox-core-asl=4.4.1
+com.fasterxml:aalto-xml=1.2.2
+com.fasterxml.staxmate:staxmate=2.3.1
 org.eclipse.jetty.http2:*=9.4.19.v20190610
 org.eclipse.jetty:*=9.4.19.v20190610
 org.gagravarr:*=0.8
@@ -111,3 +109,4 @@ org.tallison:jmatio=1.5
 org.tukaani:xz=1.8
 ua.net.nlp:morfologik-ukrainian-search=3.9.0
 xerces:xercesImpl=2.9.1
+io.jaegertracing:*=0.35.5
\ No newline at end of file