This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 5f7b5ea0f83 SOLR-16562 / SOLR-16578: Upgrade caffeine to 3.1.4 and
errorprone to 2.18.0 (#1380)
5f7b5ea0f83 is described below
commit 5f7b5ea0f838b567d949d1bc7af845b0bf53ea09
Author: Solr Bot <[email protected]>
AuthorDate: Mon Feb 27 18:41:41 2023 +0100
SOLR-16562 / SOLR-16578: Upgrade caffeine to 3.1.4 and errorprone to 2.18.0
(#1380)
Co-authored-by: Kevin Risden <[email protected]>
Co-authored-by: Jan Høydahl <[email protected]>
---
gradle/validation/error-prone.gradle | 12 +++++-
solr/CHANGES.txt | 4 +-
.../apache/solr/search/facet/TestJsonFacets.java | 1 +
solr/licenses/asm-9.3.jar.sha1 | 1 +
solr/licenses/asm-9.4.jar.sha1 | 1 -
solr/licenses/asm-analysis-7.2.jar.sha1 | 1 +
solr/licenses/asm-commons-7.2.jar.sha1 | 1 +
solr/licenses/asm-commons-9.4.jar.sha1 | 1 -
solr/licenses/asm-tree-7.2.jar.sha1 | 1 +
solr/licenses/asm-tree-9.4.jar.sha1 | 1 -
solr/licenses/caffeine-3.1.2.jar.sha1 | 1 -
solr/licenses/caffeine-3.1.4.jar.sha1 | 1 +
solr/licenses/checker-qual-3.28.0.jar.sha1 | 1 -
solr/licenses/checker-qual-3.31.0.jar.sha1 | 1 +
.../licenses/error_prone_annotations-2.16.jar.sha1 | 1 -
.../error_prone_annotations-2.18.0.jar.sha1 | 1 +
solr/licenses/kotlin-reflect-1.6.10.jar.sha1 | 1 +
solr/licenses/kotlin-reflect-1.7.21.jar.sha1 | 1 -
solr/licenses/kotlin-stdlib-1.6.20.jar.sha1 | 1 +
solr/licenses/kotlin-stdlib-1.7.21.jar.sha1 | 1 -
solr/licenses/kotlin-stdlib-common-1.6.20.jar.sha1 | 1 +
solr/licenses/kotlin-stdlib-common-1.7.21.jar.sha1 | 1 -
solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1 | 1 +
solr/licenses/kotlin-stdlib-jdk7-1.7.21.jar.sha1 | 1 -
solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1 | 1 +
solr/licenses/kotlin-stdlib-jdk8-1.7.21.jar.sha1 | 1 -
solr/licenses/snakeyaml-1.28.jar.sha1 | 1 +
solr/licenses/snakeyaml-1.33.jar.sha1 | 1 -
solr/modules/jwt-auth/build.gradle | 2 +-
.../client/solrj/io/graph/ShortestPathStream.java | 1 +
versions.lock | 43 +++++++++++-----------
versions.props | 4 +-
32 files changed, 52 insertions(+), 40 deletions(-)
diff --git a/gradle/validation/error-prone.gradle
b/gradle/validation/error-prone.gradle
index 72d0e3cfc87..344cad672b5 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -140,6 +140,7 @@ allprojects { prj ->
'-Xep:IdentityHashMapBoxing:ERROR',
// '-Xep:IgnoredPureGetter:OFF', // we don't use these annotations
// '-Xep:Immutable:OFF', // we don't use this annotation
+ // '-Xep:ImpossibleNullComparison:OFF', // we don't use protobuf
'-Xep:Incomparable:ERROR',
// '-Xep:IncompatibleArgumentType:OFF', // we don't use this
annotation
// '-Xep:IncompatibleModifiers:OFF', // we don't use this
annotation
@@ -167,6 +168,7 @@ allprojects { prj ->
'-Xep:JUnitParameterMethodNotFound:ERROR',
'-Xep:JavaxInjectOnAbstractMethod:ERROR',
'-Xep:JodaToSelf:ERROR',
+ // '-Xep:LenientFormatStringValidation:OFF' // we don't use these
google libraries
'-Xep:LiteByteStringUtf8:ERROR',
'-Xep:LocalDateTemporalAmount:ERROR',
'-Xep:LockOnBoxedPrimitive:ERROR',
@@ -249,6 +251,7 @@ allprojects { prj ->
// On by Default : WARNING
+ // '-Xep:ASTHelpersSuggestions:OFF', // we don't use ASTHelpers
'-Xep:AlmostJavadoc:WARN',
// '-Xep:AlreadyChecked:OFF', // todo check if useful or comment
why not
// '-Xep:AmbiguousMethodReference:OFF', // todo check if useful or
comment why not
@@ -310,6 +313,7 @@ allprojects { prj ->
// '-Xep:ExtendingJUnitAssert:OFF', // we inherit from
LuceneTestCase which extends Assert
'-Xep:ExtendsObject:WARN',
'-Xep:FallThrough:WARN',
+ '-Xep:Finalize:WARN', // catches actual finalizers that don't call
super
// '-Xep:Finally:OFF', // todo check if useful or comment why not
'-Xep:FloatCast:WARN',
'-Xep:FloatingPointAssertionWithinEpsilon:WARN',
@@ -326,9 +330,11 @@ allprojects { prj ->
'-Xep:ImmutableEnumChecker:WARN',
'-Xep:InconsistentCapitalization:WARN',
'-Xep:InconsistentHashCode:WARN',
+ // '-Xep:IgnoredPureGetter:OFF', // we don't use these google
libraries
'-Xep:IncorrectMainMethod:WARN',
'-Xep:IncrementInForLoopAndHeader:WARN',
'-Xep:InheritDoc:WARN',
+ // '-Xep:InjectOnBugCheckers:OFF', // we don't use this annotation
// '-Xep:InjectInvalidTargetingOnScopingAnnotation:OFF', // we
don't use this annotation
'-Xep:InjectOnConstructorOfAbstractClass:WARN',
'-Xep:InjectScopeAnnotationOnInterfaceOrAbstractClass:WARN',
@@ -369,6 +375,7 @@ allprojects { prj ->
'-Xep:JodaPlusMinusLong:WARN',
'-Xep:JodaTimeConverterManager:WARN',
'-Xep:JodaWithDurationAddedLong:WARN',
+ // '-Xep:LabelledBreakTarget:OFF', // stylistic
'-Xep:LiteEnumValueOf:WARN',
'-Xep:LiteProtoToString:WARN',
'-Xep:LockNotBeforeTry:WARN',
@@ -377,7 +384,7 @@ allprojects { prj ->
'-Xep:LongFloatConversion:WARN',
'-Xep:LoopOverCharArray:WARN',
'-Xep:MalformedInlineTag:WARN',
- '-Xep:MathAbsoluteRandom:WARN',
+ '-Xep:MathAbsoluteNegative:WARN',
// '-Xep:MemoizeConstantVisitorStateLookups:OFF', // we don't use
this class
'-Xep:MissingCasesInEnumSwitch:WARN',
'-Xep:MissingFail:WARN',
@@ -396,6 +403,7 @@ allprojects { prj ->
'-Xep:NarrowingCompoundAssignment:WARN',
// '-Xep:NegativeCharLiteral:OFF', // todo check if useful or
comment why not
'-Xep:NestedInstanceOfConditions:WARN',
+ '-Xep:NewFileSystem:WARN',
// '-Xep:NonAtomicVolatileUpdate:OFF', // todo check if useful or
comment why not
// '-Xep:NonCanonicalType:OFF', // todo check if useful or comment
why not
'-Xep:NonOverridingEquals:WARN',
@@ -465,10 +473,12 @@ allprojects { prj ->
'-Xep:UnnecessaryMethodInvocationMatcher:WARN',
'-Xep:UnnecessaryMethodReference:WARN',
// '-Xep:UnnecessaryParentheses:OFF', // style preference that we
don't want to enforce
+ // '-Xep:UnqualifiedYield:OFF', // javac takes care
'-Xep:UnrecognisedJavadocTag:WARN',
'-Xep:UnsafeFinalization:WARN',
'-Xep:UnsafeReflectiveConstructionCast:WARN',
'-Xep:UnsynchronizedOverridesSynchronized:WARN',
+ '-Xep:UnusedLabel:WARN',
// '-Xep:UnusedMethod:OFF', // todo check if useful or comment why
not
'-Xep:UnusedNestedClass:WARN',
'-Xep:UnusedTypeParameter:WARN',
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8868647c1ee..e708dff7561 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -213,7 +213,7 @@ Build
* SOLR-16508: Upgrade gradle wrapper to 7.6 (Kevin Risden)
-* SOLR-16578: Upgrade to errorprone 2.16 (Kevin Risden)
+* SOLR-16578: Upgrade to errorprone 2.18.0 (Kevin Risden)
* SOLR-16581: Upgrade OWASP dependency check to 7.4.1 (Kevin Risden)
@@ -246,7 +246,7 @@ Other Changes
* SOLR-16579: Upgrade Jackson to 2.14.1 (Kevin Risden)
-* SOLR-16562: Upgrade to Caffeine 3.1.2 (Kevin Risden)
+* SOLR-16562: Upgrade to Caffeine 3.1.4 (Kevin Risden)
* SOLR-16569: Add java system property to overseer queue size (Nick Ginther
via noble)
diff --git
a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
index e2a451e7dcf..237777ea18b 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
@@ -108,6 +108,7 @@ public class TestJsonFacets extends SolrTestCaseHS {
private static final FacetField.FacetMethod TEST_ONLY_ONE_FACET_METHOD =
null; // FacetField.FacetMethod.DEFAULT_METHOD;
+ @SuppressWarnings("MathAbsoluteNegative")
@ParametersFactory
public static Iterable<Object[]> parameters() {
if (null != TEST_ONLY_ONE_FACET_METHOD) {
diff --git a/solr/licenses/asm-9.3.jar.sha1 b/solr/licenses/asm-9.3.jar.sha1
new file mode 100644
index 00000000000..b20c901de24
--- /dev/null
+++ b/solr/licenses/asm-9.3.jar.sha1
@@ -0,0 +1 @@
+8e6300ef51c1d801a7ed62d07cd221aca3a90640
diff --git a/solr/licenses/asm-9.4.jar.sha1 b/solr/licenses/asm-9.4.jar.sha1
deleted file mode 100644
index b105357c21c..00000000000
--- a/solr/licenses/asm-9.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b4e0e2d2e023aa317b7cfcfc916377ea348e07d1
diff --git a/solr/licenses/asm-analysis-7.2.jar.sha1
b/solr/licenses/asm-analysis-7.2.jar.sha1
new file mode 100644
index 00000000000..b0a8b7b83ed
--- /dev/null
+++ b/solr/licenses/asm-analysis-7.2.jar.sha1
@@ -0,0 +1 @@
+b6e6abe057f23630113f4167c34bda7086691258
diff --git a/solr/licenses/asm-commons-7.2.jar.sha1
b/solr/licenses/asm-commons-7.2.jar.sha1
new file mode 100644
index 00000000000..3db5daccb9b
--- /dev/null
+++ b/solr/licenses/asm-commons-7.2.jar.sha1
@@ -0,0 +1 @@
+ca2954e8d92a05bacc28ff465b25c70e0f512497
diff --git a/solr/licenses/asm-commons-9.4.jar.sha1
b/solr/licenses/asm-commons-9.4.jar.sha1
deleted file mode 100644
index aea1036a1dc..00000000000
--- a/solr/licenses/asm-commons-9.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8fc2810ddbcbbec0a8bbccb3f8eda58321839912
diff --git a/solr/licenses/asm-tree-7.2.jar.sha1
b/solr/licenses/asm-tree-7.2.jar.sha1
new file mode 100644
index 00000000000..077d6f9c411
--- /dev/null
+++ b/solr/licenses/asm-tree-7.2.jar.sha1
@@ -0,0 +1 @@
+3a23cc36edaf8fc5a89cb100182758ccb5991487
diff --git a/solr/licenses/asm-tree-9.4.jar.sha1
b/solr/licenses/asm-tree-9.4.jar.sha1
deleted file mode 100644
index e4c5d6721a5..00000000000
--- a/solr/licenses/asm-tree-9.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a99175a17d7fdc18cbcbd0e8ea6a5d276844190a
diff --git a/solr/licenses/caffeine-3.1.2.jar.sha1
b/solr/licenses/caffeine-3.1.2.jar.sha1
deleted file mode 100644
index 514db6a30b8..00000000000
--- a/solr/licenses/caffeine-3.1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c79828183e8bfa014cf3287b1aa5200cba18091b
diff --git a/solr/licenses/caffeine-3.1.4.jar.sha1
b/solr/licenses/caffeine-3.1.4.jar.sha1
new file mode 100644
index 00000000000..83a5eb51a0a
--- /dev/null
+++ b/solr/licenses/caffeine-3.1.4.jar.sha1
@@ -0,0 +1 @@
+19021f711c6a8595c567c0a7746b5ce264415912
diff --git a/solr/licenses/checker-qual-3.28.0.jar.sha1
b/solr/licenses/checker-qual-3.28.0.jar.sha1
deleted file mode 100644
index ac99f020146..00000000000
--- a/solr/licenses/checker-qual-3.28.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8d5b904e460c47bf22fa20f35da0f38de6bcacf6
diff --git a/solr/licenses/checker-qual-3.31.0.jar.sha1
b/solr/licenses/checker-qual-3.31.0.jar.sha1
new file mode 100644
index 00000000000..ddd3e1aa436
--- /dev/null
+++ b/solr/licenses/checker-qual-3.31.0.jar.sha1
@@ -0,0 +1 @@
+eeefd4af42e2f4221d145c1791582f91868f99ab
diff --git a/solr/licenses/error_prone_annotations-2.16.jar.sha1
b/solr/licenses/error_prone_annotations-2.16.jar.sha1
deleted file mode 100644
index 26d24ce352b..00000000000
--- a/solr/licenses/error_prone_annotations-2.16.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3fdb501b45ba22c6e9c0f2abdb6ed747a48c71af
diff --git a/solr/licenses/error_prone_annotations-2.18.0.jar.sha1
b/solr/licenses/error_prone_annotations-2.18.0.jar.sha1
new file mode 100644
index 00000000000..df2166e6403
--- /dev/null
+++ b/solr/licenses/error_prone_annotations-2.18.0.jar.sha1
@@ -0,0 +1 @@
+89b684257096f548fa39a7df9fdaa409d4d4df91
diff --git a/solr/licenses/kotlin-reflect-1.6.10.jar.sha1
b/solr/licenses/kotlin-reflect-1.6.10.jar.sha1
new file mode 100644
index 00000000000..c8ade6487d9
--- /dev/null
+++ b/solr/licenses/kotlin-reflect-1.6.10.jar.sha1
@@ -0,0 +1 @@
+1cbe9c92c12a94eea200d23c2bbaedaf3daf5132
diff --git a/solr/licenses/kotlin-reflect-1.7.21.jar.sha1
b/solr/licenses/kotlin-reflect-1.7.21.jar.sha1
deleted file mode 100644
index 5e2338faf3a..00000000000
--- a/solr/licenses/kotlin-reflect-1.7.21.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0ad6d09bc4db0eab1069112eea8ebea0be7be44f
diff --git a/solr/licenses/kotlin-stdlib-1.6.20.jar.sha1
b/solr/licenses/kotlin-stdlib-1.6.20.jar.sha1
new file mode 100644
index 00000000000..35a1db0e8cd
--- /dev/null
+++ b/solr/licenses/kotlin-stdlib-1.6.20.jar.sha1
@@ -0,0 +1 @@
+6cedc143badbb4f1c6b7f5a340b04edff1743208
diff --git a/solr/licenses/kotlin-stdlib-1.7.21.jar.sha1
b/solr/licenses/kotlin-stdlib-1.7.21.jar.sha1
deleted file mode 100644
index 1aa718259bb..00000000000
--- a/solr/licenses/kotlin-stdlib-1.7.21.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1a2eaf898a0dda83037034b10a42053cf8a7caf8
diff --git a/solr/licenses/kotlin-stdlib-common-1.6.20.jar.sha1
b/solr/licenses/kotlin-stdlib-common-1.6.20.jar.sha1
new file mode 100644
index 00000000000..7359fecd8a2
--- /dev/null
+++ b/solr/licenses/kotlin-stdlib-common-1.6.20.jar.sha1
@@ -0,0 +1 @@
+27b4562b6713d70f458c6d7ea39aadacb8e6a92b
diff --git a/solr/licenses/kotlin-stdlib-common-1.7.21.jar.sha1
b/solr/licenses/kotlin-stdlib-common-1.7.21.jar.sha1
deleted file mode 100644
index cb95a2cf6d0..00000000000
--- a/solr/licenses/kotlin-stdlib-common-1.7.21.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cb02257de8e13e8498f8e2f69f742f2d438e794d
diff --git a/solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1
b/solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1
new file mode 100644
index 00000000000..a48893479ee
--- /dev/null
+++ b/solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1
@@ -0,0 +1 @@
+da6bdc87391322974a43ccc00a25536ae74dad51
diff --git a/solr/licenses/kotlin-stdlib-jdk7-1.7.21.jar.sha1
b/solr/licenses/kotlin-stdlib-jdk7-1.7.21.jar.sha1
deleted file mode 100644
index 35ffd5ad4ce..00000000000
--- a/solr/licenses/kotlin-stdlib-jdk7-1.7.21.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a0ba09615c2213d580315e234b3febfea25b757e
diff --git a/solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1
b/solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1
new file mode 100644
index 00000000000..50cd854fef6
--- /dev/null
+++ b/solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1
@@ -0,0 +1 @@
+baf82c475e9372c25407f3d132439e4aa803b8b8
diff --git a/solr/licenses/kotlin-stdlib-jdk8-1.7.21.jar.sha1
b/solr/licenses/kotlin-stdlib-jdk8-1.7.21.jar.sha1
deleted file mode 100644
index ebce2c4c0a1..00000000000
--- a/solr/licenses/kotlin-stdlib-jdk8-1.7.21.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5407c3593c58860cec5ee3f66c468396b42f4c2b
diff --git a/solr/licenses/snakeyaml-1.28.jar.sha1
b/solr/licenses/snakeyaml-1.28.jar.sha1
new file mode 100644
index 00000000000..879e89213e8
--- /dev/null
+++ b/solr/licenses/snakeyaml-1.28.jar.sha1
@@ -0,0 +1 @@
+7cae037c3014350c923776548e71c9feb7a69259
diff --git a/solr/licenses/snakeyaml-1.33.jar.sha1
b/solr/licenses/snakeyaml-1.33.jar.sha1
deleted file mode 100644
index ee3719e3931..00000000000
--- a/solr/licenses/snakeyaml-1.33.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2cd0a87ff7df953f810c344bdf2fe3340b954c69
diff --git a/solr/modules/jwt-auth/build.gradle
b/solr/modules/jwt-auth/build.gradle
index bac8c2ad8b3..66eb1a16f42 100644
--- a/solr/modules/jwt-auth/build.gradle
+++ b/solr/modules/jwt-auth/build.gradle
@@ -41,7 +41,7 @@ dependencies {
implementation 'org.apache.httpcomponents:httpcore'
implementation 'org.eclipse.jetty:jetty-client'
implementation 'org.eclipse.jetty.toolchain:jetty-servlet-api'
- implementation ('com.google.guava:guava') { transitive = false }
+ implementation 'com.google.guava:guava'
implementation 'org.slf4j:slf4j-api'
testImplementation project(':solr:test-framework')
diff --git
a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java
b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java
index b506a79eee1..5d508cd2e4f 100644
---
a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java
+++
b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java
@@ -335,6 +335,7 @@ public class ShortestPathStream extends TupleStream
implements Expressible {
return l;
}
+ @SuppressWarnings("UnusedLabel")
@Override
public void open() throws IOException {
diff --git a/versions.lock b/versions.lock
index 517547aa868..4becff47f18 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,19 +1,19 @@
# Run ./gradlew --write-locks to regenerate this file
biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1 (1 constraints: 0c051336)
com.adobe.xmp:xmpcore:6.1.10 (1 constraints: fd0d5947)
-com.beust:jcommander:1.82 (3 constraints: fd21d419)
+com.beust:jcommander:1.82 (2 constraints: 2b123714)
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.14.1 (13 constraints: 7208a870)
+com.fasterxml.jackson:jackson-bom:2.14.1 (12 constraints: 36f86334)
com.fasterxml.jackson.core:jackson-annotations:2.14.1 (10 constraints:
89beae04)
com.fasterxml.jackson.core:jackson-core:2.14.1 (13 constraints: 29020108)
com.fasterxml.jackson.core:jackson-databind:2.14.1 (18 constraints: c863ae0d)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.14.1 (1
constraints: b80ea766)
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.1 (2
constraints: a42445e0)
com.fasterxml.woodstox:woodstox-core:6.4.0 (3 constraints: af28dcb7)
-com.github.ben-manes.caffeine:caffeine:3.1.2 (1 constraints: 0805ff35)
+com.github.ben-manes.caffeine:caffeine:3.1.4 (1 constraints: 0a050136)
com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01)
com.github.junrar:junrar:7.5.2 (1 constraints: 650c1002)
com.github.openjson:openjson:1.0.12 (1 constraints: 8b0c6d0e)
@@ -42,7 +42,7 @@ com.google.cloud:google-cloud-core-grpc:2.9.0 (1 constraints:
ef0ff495)
com.google.cloud:google-cloud-core-http:2.9.0 (1 constraints: ef0ff495)
com.google.cloud:google-cloud-storage:2.16.0 (2 constraints: d31c2627)
com.google.code.gson:gson:2.10 (7 constraints: 4160fb34)
-com.google.errorprone:error_prone_annotations:2.16 (10 constraints: 537a23c0)
+com.google.errorprone:error_prone_annotations:2.18.0 (10 constraints: b37a2659)
com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
com.google.guava:guava:31.1-jre (25 constraints: 756fc917)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2
constraints: 4b35b0a0)
@@ -53,7 +53,7 @@ com.google.http-client:google-http-client-gson:1.42.3 (6
constraints: f0616ba0)
com.google.http-client:google-http-client-jackson2:1.42.3 (1 constraints:
1e1004a6)
com.google.j2objc:j2objc-annotations:1.3 (4 constraints: 7d3ab454)
com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)
-com.google.protobuf:protobuf-java:3.21.10 (12 constraints: fba64736)
+com.google.protobuf:protobuf-java:3.21.10 (11 constraints: c896aada)
com.google.protobuf:protobuf-java-util:3.21.10 (3 constraints: ba2b3997)
com.google.re2j:re2j:1.6 (2 constraints: 3714a76f)
com.googlecode.json-simple:json-simple:1.1.1 (2 constraints: 321c78d2)
@@ -178,7 +178,7 @@ 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 (5 constraints: 9b3e0e36)
org.apache.commons:commons-math3:3.6.1 (4 constraints: 93247039)
-org.apache.commons:commons-text:1.10.0 (3 constraints: ad262ca9)
+org.apache.commons:commons-text:1.10.0 (2 constraints: 861680f8)
org.apache.curator:curator-client:4.3.0 (2 constraints: e214cba2)
org.apache.curator:curator-framework:4.3.0 (2 constraints: ff13b474)
org.apache.curator:curator-recipes:4.3.0 (1 constraints: 09050836)
@@ -188,7 +188,7 @@ org.apache.hadoop:hadoop-client-api:3.3.4 (3 constraints:
1f28da5f)
org.apache.hadoop:hadoop-client-runtime:3.3.4 (2 constraints: 6b177043)
org.apache.hadoop:hadoop-common:3.3.4 (1 constraints: 0c050736)
org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 (1 constraints:
0505f435)
-org.apache.httpcomponents:httpclient:4.5.13 (10 constraints: 8f9027a9)
+org.apache.httpcomponents:httpclient:4.5.13 (9 constraints: 5d801b3e)
org.apache.httpcomponents:httpcore:4.4.15 (8 constraints: 1c6d2913)
org.apache.httpcomponents:httpmime:4.5.13 (3 constraints: ea1bb9dc)
org.apache.httpcomponents.client5:httpclient5:5.1.3 (1 constraints: 6c10bcb3)
@@ -264,7 +264,7 @@ org.apiguardian:apiguardian-api:1.1.2 (2 constraints:
601bd5a8)
org.bitbucket.b_c:jose4j:0.7.9 (1 constraints: 12050936)
org.bouncycastle:bcmail-jdk15on:1.70 (1 constraints: 310c8af5)
org.bouncycastle:bcpkix-jdk15on:1.70 (2 constraints: ce1b11b3)
-org.bouncycastle:bcprov-jdk15on:1.70 (5 constraints: ee43a815)
+org.bouncycastle:bcprov-jdk15on:1.70 (4 constraints: 1f34ee12)
org.bouncycastle:bcutil-jdk15on:1.70 (2 constraints: 961ad454)
org.brotli:dec:0.1.2 (1 constraints: 5a0ce101)
org.carrot2:carrot2-core:4.5.0 (1 constraints: 0b050e36)
@@ -272,7 +272,7 @@ org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801)
-org.checkerframework:checker-qual:3.28.0 (5 constraints: 5c46c7ed)
+org.checkerframework:checker-qual:3.31.0 (5 constraints: 57468aea)
org.codehaus.janino:commons-compiler:3.1.8 (2 constraints: 2f1983ec)
org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c)
org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
@@ -326,12 +326,11 @@ org.javassist:javassist:3.25.0-GA (1 constraints:
2a110ef1)
org.jctools:jctools-core:3.3.0 (1 constraints: 08050336)
org.jdom:jdom2:2.0.6.1 (1 constraints: be0c371b)
org.jetbrains:annotations:13.0 (1 constraints: df0e795c)
-org.jetbrains.kotlin:kotlin-bom:1.7.21 (1 constraints: 31109caf)
-org.jetbrains.kotlin:kotlin-stdlib:1.7.21 (6 constraints: d65aa2de)
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.21 (4 constraints: 363ab4c3)
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.21 (2 constraints: e11ec2c7)
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21 (4 constraints: 573ab5e7)
-org.junit:junit-bom:5.9.1 (2 constraints: cb21f18e)
+org.jetbrains.kotlin:kotlin-stdlib:1.6.20 (5 constraints: 6c4c1dcd)
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20 (3 constraints: 352cbb71)
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0 (1 constraints: ae1013c2)
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 (3 constraints: 582c9186)
+org.junit:junit-bom:5.9.0 (1 constraints: c7116dde)
org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)
org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
org.locationtech.proj4j:proj4j:1.1.5 (1 constraints: 5f0daf2c)
@@ -341,10 +340,10 @@ org.openjdk.jmh:jmh-core:1.32 (1 constraints: da04f730)
org.osgi:org.osgi.resource:1.0.0 (1 constraints: e60f2999)
org.osgi:org.osgi.service.serviceloader:1.0.0 (1 constraints: e60f2999)
org.osgi:osgi.annotation:8.1.0 (1 constraints: 0b051636)
-org.ow2.asm:asm:9.4 (6 constraints: 1242e83d)
-org.ow2.asm:asm-bom:9.4 (1 constraints: a50fb27f)
-org.ow2.asm:asm-commons:9.4 (2 constraints: 94171c72)
-org.ow2.asm:asm-tree:9.4 (2 constraints: 11129514)
+org.ow2.asm:asm:9.3 (5 constraints: e139bef1)
+org.ow2.asm:asm-analysis:7.2 (1 constraints: e409d9a5)
+org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267)
+org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)
org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530)
org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
org.semver4j:semver4j:2.2.0 (1 constraints: 0605fb35)
@@ -379,7 +378,7 @@ software.amazon.awssdk:third-party-jackson-core:2.17.63 (2
constraints: 931b14a8
software.amazon.awssdk:utils:2.17.63 (17 constraints: 0bffaaab)
software.amazon.eventstream:eventstream:1.0.1 (2 constraints: 2e1ae62b)
ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: d5126e1e)
-xerces:xercesImpl:2.12.2 (2 constraints: ba1cc124)
+xerces:xercesImpl:2.12.2 (1 constraints: 8e0c7d0e)
[Test dependencies]
com.adobe.testing:s3mock:2.1.34 (1 constraints: b012831d)
@@ -436,7 +435,7 @@
org.glassfish.jersey.test-framework:jersey-test-framework-core:2.35 (2 constrain
org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.35
(1 constraints: de04fe30)
org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)
org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)
-org.jetbrains.kotlin:kotlin-reflect:1.7.21 (3 constraints: 61328ffd)
+org.jetbrains.kotlin:kotlin-reflect:1.6.10 (2 constraints: 6224e0e2)
org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)
org.mockito:mockito-core:3.8.0 (1 constraints: 0d051236)
org.objenesis:objenesis:3.1 (1 constraints: b00a12bd)
@@ -458,6 +457,6 @@ org.springframework.boot:spring-boot-starter-jetty:2.5.14
(1 constraints: 1d0d31
org.springframework.boot:spring-boot-starter-json:2.5.14 (1 constraints:
d814609e)
org.springframework.boot:spring-boot-starter-logging:2.5.14 (1 constraints:
6d138546)
org.springframework.boot:spring-boot-starter-web:2.5.14 (1 constraints:
1d0d3137)
-org.yaml:snakeyaml:1.33 (2 constraints: dc224ce5)
+org.yaml:snakeyaml:1.28 (1 constraints: 0e13df1f)
software.amazon.awssdk:url-connection-client:2.17.63 (2 constraints: 471f19f7)
software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831)
diff --git a/versions.props b/versions.props
index 801748ba718..991a4706a36 100644
--- a/versions.props
+++ b/versions.props
@@ -5,11 +5,11 @@ com.carrotsearch:hppc=0.9.1
com.cybozu.labs:langdetect=1.1-20120112
com.fasterxml.jackson:jackson-bom=2.14.1
com.fasterxml.woodstox:woodstox-core=6.4.0
-com.github.ben-manes.caffeine:caffeine=3.1.2
+com.github.ben-manes.caffeine:caffeine=3.1.4
com.github.spotbugs:*=4.7.2
com.github.stephenc.jcip:jcip-annotations=1.0-1
com.google.cloud:google-cloud-bom=0.184.0
-com.google.errorprone:*=2.16
+com.google.errorprone:*=2.18.0
com.google.guava:guava=31.1-jre
com.google.re2j:re2j=1.6
com.jayway.jsonpath:json-path=2.7.0
