You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/08/26 03:03:46 UTC
[lucene-solr] branch jira/SOLR-13452_gradle_5 updated: SOLR-13452:
We must force an older version of stax2-api because clustering has a
carrot2 dep that uses simple-xml (not released since 2013) that needs
stax2-api < 4.x while other deps ask for 4.x.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_5
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/SOLR-13452_gradle_5 by this push:
new 22d1814 SOLR-13452: We must force an older version of stax2-api because clustering has a carrot2 dep that uses simple-xml (not released since 2013) that needs stax2-api < 4.x while other deps ask for 4.x.
22d1814 is described below
commit 22d18142b1decd0aa3bda0f7b492d4d88342277e
Author: markrmiller <ma...@apache.org>
AuthorDate: Sun Aug 25 22:03:31 2019 -0500
SOLR-13452: We must force an older version of stax2-api because clustering has a carrot2 dep that uses simple-xml (not released since 2013) that needs stax2-api < 4.x while other deps ask for 4.x.
---
build.gradle | 6 +++++-
versions.lock | 10 +++++-----
versions.props | 4 ++--
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/build.gradle b/build.gradle
index e4b97e6..dfad4a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -222,6 +222,10 @@ configure(allprojects) {
// dependencies block that applies to all projects
dependencies {
configurations.all {
+ resolutionStrategy {
+ force 'org.codehaus.woodstox:stax2-api:3.1.4' // clustering has old simple-xml dep that requires < 4.X
+ }
+
// stax-api classes are in Java 11
exclude group: 'javax.xml.stream', module: 'stax-api'
exclude group: 'stax', module: 'stax-api'
@@ -231,7 +235,7 @@ configure(allprojects) {
exclude group: 'log4j', module: 'log4j'
exclude group: 'commons-logging', module: 'commons-logging'
- // exclude annotation jars that come with guave
+ // exclude annotation jars that come with guava
exclude group: 'com.google.code.findbugs', module: 'jsr305'
exclude group: 'org.checkerframework', module: 'checker-qual'
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
diff --git a/versions.lock b/versions.lock
index 456c0ca..91d8a95 100644
--- a/versions.lock
+++ b/versions.lock
@@ -154,10 +154,10 @@ org.bouncycastle:bcmail-jdk15on:1.60 (1 constraints: db04fb30)
org.bouncycastle:bcpkix-jdk15on:1.60 (1 constraints: db04fb30)
org.bouncycastle:bcprov-jdk15on:1.60 (1 constraints: db04fb30)
org.brotli:dec:0.1.2 (1 constraints: 0505f035)
-org.carrot2:carrot2-mini:3.16.0 (1 constraints: 3c05473b)
-org.carrot2:morfologik-fsa:2.1.5 (2 constraints: e0120c36)
-org.carrot2:morfologik-polish:2.1.5 (1 constraints: 0a05fd35)
-org.carrot2:morfologik-stemming:2.1.5 (2 constraints: 0b12640c)
+org.carrot2:carrot2-mini:3.16.1 (1 constraints: 3d05483b)
+org.carrot2:morfologik-fsa:2.1.6 (2 constraints: e2123636)
+org.carrot2:morfologik-polish:2.1.6 (1 constraints: 0b05fe35)
+org.carrot2:morfologik-stemming:2.1.6 (2 constraints: 0d128c0c)
org.carrot2.attributes:attributes-binder:1.3.3 (2 constraints: ab0f86a6)
org.carrot2.shaded:carrot2-guava:18.0 (3 constraints: 8f202231)
org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 0605f735)
@@ -168,7 +168,7 @@ org.codehaus.jackson:jackson-xc:1.9.2 (1 constraints: da0befeb)
org.codehaus.janino:commons-compiler:3.0.9 (2 constraints: d910f7d1)
org.codehaus.janino:janino:3.0.9 (1 constraints: 0e050336)
org.codehaus.jettison:jettison:1.1 (4 constraints: a84e24a9)
-org.codehaus.woodstox:stax2-api:4.1 (4 constraints: 7c331332)
+org.codehaus.woodstox:stax2-api:3.1.4 (4 constraints: 7c331332)
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)
diff --git a/versions.props b/versions.props
index daa8d00..fdd4c81 100644
--- a/versions.props
+++ b/versions.props
@@ -86,8 +86,8 @@ org.bouncycastle:*=1.60
org.brotli:dec=0.1.2
org.carrot2.attributes:attributes-binder=1.3.3
org.carrot2.shaded:carrot2-guava=18.0
-org.carrot2:carrot2-mini=3.16.0
-org.carrot2:morfologik-*=2.1.5
+org.carrot2:carrot2-mini=3.16.1
+org.carrot2:morfologik-*=2.1.6
org.ccil.cowan.tagsoup:tagsoup=1.2.1
org.codehaus.janino:*=3.0.9
org.codehaus.woodstox:stax2-api=3.1.4