diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle index c77d2dcc7fb..69ff4e750ac 100644 --- a/solr/solrj/build.gradle +++ b/solr/solrj/build.gradle @@ -36,8 +36,10 @@ dependencies { exclude group: "org.slf4j", module: "slf4j-log4j12" }) - api('org.codehaus.woodstox:woodstox-core-asl', { - exclude group: "javax.xml.stream", module: "stax-api" + api('com.fasterxml:aalto-xml', { + }) + + api('com.fasterxml.staxmate:staxmate', { }) testImplementation project(':solr:test-framework') diff --git a/versions.lock b/versions.lock index d02ff02a2db..6b3d074ecce 100644 --- a/versions.lock +++ b/versions.lock @@ -7,10 +7,12 @@ com.carrotsearch.thirdparty:simple-xml-safe:2.7.1 (1 constraints: a60a82ca) com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) com.drewnoakes:metadata-extractor:2.11.0 (1 constraints: 3605323b) com.epam:parso:2.0.9 (1 constraints: 0d05fe35) +com.fasterxml:aalto-xml:1.2.2 (1 constraints: 0705f835) com.fasterxml.jackson.core:jackson-annotations:2.9.9 (2 constraints: 0a1d1637) com.fasterxml.jackson.core:jackson-core:2.9.9 (3 constraints: 23350c6a) com.fasterxml.jackson.core:jackson-databind:2.9.9.3 (3 constraints: 741a6389) com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.9 (1 constraints: 16051936) +com.fasterxml.staxmate:staxmate:2.3.1 (1 constraints: 0805ff35) com.github.ben-manes.caffeine:caffeine:2.8.0 (1 constraints: 0c050d36) com.github.jnr:jffi:1.2.18 (1 constraints: b20902ab) com.github.jnr:jnr-constants:0.9.12 (4 constraints: ed2c9d5d) @@ -159,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:3.1.4 (2 constraints: 241635f1) -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 bbca163336f..ea3786c3c7f 100644 --- a/versions.props +++ b/versions.props @@ -87,8 +87,9 @@ org.carrot2:carrot2-mini=3.16.2 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=3.1.4 -org.codehaus.woodstox:woodstox-core-asl=4.4.1 +org.codehaus.woodstox:stax2-api=4.2 +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