You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ge...@apache.org on 2022/10/24 11:41:00 UTC
[solr] 02/02: SOLR-16346: Fix intermittent 'check' error
This is an automated email from the ASF dual-hosted git repository.
gerlowskija pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit a257915675a41e3d89689bee4e4c2dad6203fa71
Author: Jason Gerlowski <ge...@apache.org>
AuthorDate: Sun Sep 25 14:13:41 2022 -0400
SOLR-16346: Fix intermittent 'check' error
A previous commit for SOLR-16346 introduced a usedUndeclared 'check'
error that only showed up in some limited environments.
This commit fixes that check error by declaring the correct dep:
switching 'swagger-core' out for 'swagger-annotations'.
---
solr/core/build.gradle | 3 +--
.../src/java/org/apache/solr/util/SolrVersion.java | 3 +--
.../jackson-dataformat-yaml-2.13.3.jar.sha1 | 1 -
solr/licenses/snakeyaml-1.26.jar.sha1 | 1 +
solr/licenses/snakeyaml-1.30.jar.sha1 | 1 -
solr/licenses/swagger-core-2.2.2.jar.sha1 | 1 -
solr/licenses/swagger-models-2.2.2.jar.sha1 | 1 -
versions.lock | 25 ++++++++++------------
8 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index e5ea0ea102d..037278c0ab5 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -53,8 +53,7 @@ dependencies {
exclude group: "com.github.spotbugs", module: "spotbugs-annotations"
}
- compileOnly 'io.swagger.core.v3:swagger-core'
- testCompileOnly 'io.swagger.core.v3:swagger-core'
+ implementation 'io.swagger.core.v3:swagger-annotations'
// Export these dependencies so that they're imported transitively by
// other modules.
diff --git a/solr/core/src/java/org/apache/solr/util/SolrVersion.java b/solr/core/src/java/org/apache/solr/util/SolrVersion.java
index 6d5454c750f..d3cc2dacdaf 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrVersion.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrVersion.java
@@ -16,11 +16,10 @@
*/
package org.apache.solr.util;
+import java.util.Locale;
import org.apache.solr.common.SolrException;
import org.semver4j.Semver;
-import java.util.Locale;
-
/**
* Simple Solr version representation backed by a <a href="https://devhints.io/semver">Semantic
* Versioning</a> library. Provides a constant for current Solr version as well as methods to parse
diff --git a/solr/licenses/jackson-dataformat-yaml-2.13.3.jar.sha1 b/solr/licenses/jackson-dataformat-yaml-2.13.3.jar.sha1
deleted file mode 100644
index bbd0b794ed3..00000000000
--- a/solr/licenses/jackson-dataformat-yaml-2.13.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9363ded5441b1fee62d5be0604035690ca759a2a
diff --git a/solr/licenses/snakeyaml-1.26.jar.sha1 b/solr/licenses/snakeyaml-1.26.jar.sha1
new file mode 100644
index 00000000000..cc77c134b6e
--- /dev/null
+++ b/solr/licenses/snakeyaml-1.26.jar.sha1
@@ -0,0 +1 @@
+a78a8747147d2c5807683e76ec2b633e95c14fe9
diff --git a/solr/licenses/snakeyaml-1.30.jar.sha1 b/solr/licenses/snakeyaml-1.30.jar.sha1
deleted file mode 100644
index 365daa0aef7..00000000000
--- a/solr/licenses/snakeyaml-1.30.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8fde7fe2586328ac3c68db92045e1c8759125000
diff --git a/solr/licenses/swagger-core-2.2.2.jar.sha1 b/solr/licenses/swagger-core-2.2.2.jar.sha1
deleted file mode 100644
index cfb58ff4ae7..00000000000
--- a/solr/licenses/swagger-core-2.2.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-13fae0a315e0f67989335616127bb9ef10cf5a3f
diff --git a/solr/licenses/swagger-models-2.2.2.jar.sha1 b/solr/licenses/swagger-models-2.2.2.jar.sha1
deleted file mode 100644
index d07695324e4..00000000000
--- a/solr/licenses/swagger-models-2.2.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bac17e95d01e0d8bf545dae379753f8a676c656c
diff --git a/versions.lock b/versions.lock
index 42eef904711..b22b9610620 100644
--- a/versions.lock
+++ b/versions.lock
@@ -6,13 +6,11 @@ com.carrotsearch:hppc:0.9.1 (2 constraints: ad0fc9a6)
com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1 (2 constraints: cf1501e2)
com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
-com.fasterxml.jackson:jackson-bom:2.13.4.20221013 (13 constraints: e5118a3a)
-com.fasterxml.jackson.core:jackson-annotations:2.13.4 (12 constraints: 58da37dc)
-com.fasterxml.jackson.core:jackson-core:2.13.4 (14 constraints: 0b1aa069)
-com.fasterxml.jackson.core:jackson-databind:2.13.4.2 (20 constraints: b988aba5)
+com.fasterxml.jackson:jackson-bom:2.13.4.20221013 (12 constraints: 07fa9222)
+com.fasterxml.jackson.core:jackson-annotations:2.13.4 (10 constraints: 95be0c15)
+com.fasterxml.jackson.core:jackson-core:2.13.4 (13 constraints: 3c026a27)
+com.fasterxml.jackson.core:jackson-databind:2.13.4.2 (18 constraints: 7663825e)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.13.4 (1 constraints: ba0ea766)
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.4 (2 constraints: 2e1cbbfa)
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4 (4 constraints: eb4a1c5e)
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.4 (2 constraints: a624c1e0)
com.fasterxml.woodstox:woodstox-core:6.3.1 (3 constraints: b5283aba)
com.github.ben-manes.caffeine:caffeine:3.1.1 (1 constraints: 0705fe35)
@@ -106,14 +104,12 @@ io.prometheus:simpleclient:0.2.0 (3 constraints: fe242db8)
io.prometheus:simpleclient_common:0.2.0 (1 constraints: e51014af)
io.prometheus:simpleclient_httpserver:0.2.0 (1 constraints: 0405f135)
io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9)
-io.swagger.core.v3:swagger-annotations:2.2.2 (1 constraints: 420ddd2a)
-io.swagger.core.v3:swagger-core:2.2.2 (1 constraints: 0805fd35)
-io.swagger.core.v3:swagger-models:2.2.2 (1 constraints: 420ddd2a)
+io.swagger.core.v3:swagger-annotations:2.2.2 (1 constraints: 0805fd35)
jakarta.activation:jakarta.activation-api:1.2.2 (2 constraints: ba28fcbd)
jakarta.annotation:jakarta.annotation-api:1.3.5 (4 constraints: d740f9a9)
-jakarta.validation:jakarta.validation-api:2.0.2 (2 constraints: 3c1e8a6a)
+jakarta.validation:jakarta.validation-api:2.0.2 (1 constraints: fd10b6c3)
jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (10 constraints: c1cce3ec)
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (6 constraints: 066b20a0)
+jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (5 constraints: c45d665e)
javax.measure:unit-api:1.0 (5 constraints: 8e3e2cc5)
javax.servlet:javax.servlet-api:3.1.0 (3 constraints: 75209943)
joda-time:joda-time:2.9.9 (4 constraints: eb1fe06a)
@@ -135,7 +131,7 @@ org.apache.commons:commons-compress:1.21 (3 constraints: 9d1b16ae)
org.apache.commons:commons-configuration2:2.8.0 (1 constraints: 0c050d36)
org.apache.commons:commons-csv:1.9.0 (1 constraints: 610cfc01)
org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
-org.apache.commons:commons-lang3:3.12.0 (6 constraints: 0c4cf016)
+org.apache.commons:commons-lang3:3.12.0 (5 constraints: 9b3e0e36)
org.apache.commons:commons-math3:3.6.1 (4 constraints: 93247039)
org.apache.commons:commons-text:1.10.0 (2 constraints: 861680f8)
org.apache.curator:curator-client:4.3.0 (2 constraints: e214cba2)
@@ -302,7 +298,7 @@ org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
org.semver4j:semver4j:2.1.1 (1 constraints: 0605f935)
org.slf4j:jcl-over-slf4j:1.7.36 (3 constraints: 05188eb8)
org.slf4j:jul-to-slf4j:1.7.36 (3 constraints: 5928c263)
-org.slf4j:slf4j-api:1.7.36 (41 constraints: 920658ef)
+org.slf4j:slf4j-api:1.7.36 (40 constraints: 08f98db1)
org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
@@ -310,7 +306,6 @@ org.tallison.xmp:xmpcore-shaded:6.1.10 (1 constraints: 300e8d49)
org.threeten:threetenbp:1.6.0 (4 constraints: 0433a25f)
org.tukaani:xz:1.9 (1 constraints: 030c5be9)
org.xerial.snappy:snappy-java:1.1.8.2 (4 constraints: 8c382ee2)
-org.yaml:snakeyaml:1.31 (2 constraints: 782a0e0a)
software.amazon.awssdk:annotations:2.17.63 (18 constraints: 690ceab3)
software.amazon.awssdk:apache-client:2.17.63 (4 constraints: 0d2a0ae3)
software.amazon.awssdk:arns:2.17.63 (2 constraints: 21185ac1)
@@ -345,6 +340,7 @@ com.amazonaws:jmespath-java:1.12.15 (2 constraints: 501a5183)
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.4 (2 constraints: 601c12f1)
com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.4 (2 constraints: a719c812)
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4 (2 constraints: 09243482)
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4 (3 constraints: 773d9f0f)
com.fasterxml.jackson.module:jackson-module-kotlin:2.13.4 (2 constraints: a61d2f60)
com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.4 (2 constraints: 09243482)
com.github.stephenc.jcip:jcip-annotations:1.0-1 (2 constraints: c5188bde)
@@ -419,5 +415,6 @@ org.springframework.boot:spring-boot-starter-jetty:2.3.12.RELEASE (1 constraints
org.springframework.boot:spring-boot-starter-json:2.3.12.RELEASE (1 constraints: 03178f4e)
org.springframework.boot:spring-boot-starter-logging:2.3.12.RELEASE (1 constraints: 98154deb)
org.springframework.boot:spring-boot-starter-web:2.3.12.RELEASE (1 constraints: 1d0d3137)
+org.yaml:snakeyaml:1.26 (1 constraints: 0c13dd1f)
software.amazon.awssdk:url-connection-client:2.17.63 (2 constraints: 471f19f7)
software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831)