[lucene-solr] branch gradle-master updated: 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


The following commit(s) were added to refs/heads/gradle-master by this push:
     new de8a37e  Adding woodstox temporarily so that tests pass.
de8a37e is described below

commit de8a37ee72c83ae35db195238dcd64af0d2df32b
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 6 13:37:48 2019 +0100

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

diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 0f0a4d0..15369e9 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -90,6 +90,12 @@ 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 6b3d074..056dc41 100644
--- a/versions.lock
+++ b/versions.lock
@@ -161,7 +161,8 @@ 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 (3 constraints: 0d1d3ffc)
+org.codehaus.woodstox:stax2-api:4.2 (4 constraints: 272e5d38)
+org.codehaus.woodstox:woodstox-core-asl:4.4.1 (1 constraints: 0b050c36)
 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 ea3786c..22b685f 100644
--- a/versions.props
+++ b/versions.props
@@ -5,7 +5,9 @@ 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
@@ -36,6 +38,7 @@ 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
@@ -88,8 +91,7 @@ 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
-com.fasterxml:aalto-xml=1.2.2
-com.fasterxml.staxmate:staxmate=2.3.1
+org.codehaus.woodstox:woodstox-core-asl=4.4.1
 org.eclipse.jetty.http2:*=9.4.19.v20190610
 org.eclipse.jetty:*=9.4.19.v20190610
 org.gagravarr:*=0.8
@@ -109,4 +111,3 @@ 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