diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index 328923fd0e7..be8e0d7ccee 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -102,7 +102,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,swaggerBuild,testRuntimeCl org.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testCompileClasspath,testRuntimeClasspath @@ -133,7 +132,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath @@ -169,11 +167,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,testRun org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,swaggerBuild,swaggerDeps,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,testRuntimeClasspath diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index 65c008902d6..f7e8fcd169d 100644 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@ -73,7 +73,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,testRunti org.apache.commons:commons-math3:3.6.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -104,7 +103,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,runtimeClasspath,testRunti org.apache.lucene:lucene-test-framework:9.12.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,runtimeClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -141,13 +139,9 @@ org.hamcrest:hamcrest:3.0=compileClasspath,jarValidation,runtimeClasspath,testCo org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,testRuntimeClasspath org.openjdk.jmh:jmh-core:1.37=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.openjdk.jmh:jmh-generator-annprocess:1.37=annotationProcessor -org.opentest4j:opentest4j:1.2.0=jarValidation,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java index 152a5742bd9..93a60b10510 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java @@ -19,7 +19,6 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.NoSuchElementException; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -27,7 +26,6 @@ import java.util.function.Predicate; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.cloud.DistributedQueue; -import org.apache.solr.common.cloud.OnDisconnect; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.util.ExecutorUtil; import org.apache.solr.common.util.SolrNamedThreadFactory; @@ -163,7 +161,7 @@ public void testDistributedQueueBlocking() throws Exception { assertFalse(dq.isDirty()); assertEquals(1, dq.watcherCount()); - forceSessionExpire(); + ChaosMonkey.expireSession(zkClient, zkServer); // Session expiry should have fired the watcher. Thread.sleep(100); @@ -290,28 +288,6 @@ public void testPeekElements() throws Exception { "Time was " + timeTaken + "ms, expected 250-1500ms", timeTaken > 250 && timeTaken < 1500); } - private void forceSessionExpire() throws InterruptedException, TimeoutException { - final CountDownLatch hasDisconnected = new CountDownLatch(1); - zkClient - .getCuratorFramework() - .getConnectionStateListenable() - .addListener( - (OnDisconnect) - ((sessionExpired) -> { - if (sessionExpired) { - hasDisconnected.countDown(); - } - })); - long sessionId = zkClient.getZkSessionId(); - zkServer.expire(sessionId); - hasDisconnected.await(10, TimeUnit.SECONDS); - assertEquals( - "ZK Client did not disconnect after session expiration", 0, hasDisconnected.getCount()); - zkClient.getCuratorFramework().blockUntilConnected(10, TimeUnit.SECONDS); - assertTrue(zkClient.isConnected()); - assertNotEquals(sessionId, zkClient.getZkSessionId()); - } - protected ZkDistributedQueue makeDistributedQueue(String dqZNode) throws Exception { return new ZkDistributedQueue(zkClient, setupNewDistributedQueueZNode(dqZNode)); } diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 07efb3712e3..a37522f9b6a 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -93,7 +93,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLi org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -140,7 +139,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,runtimeClasspath,runtimeLi org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.bitbucket.b_c:jose4j:0.9.6=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -182,14 +180,10 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtime org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.lz4:lz4-java:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.mockito:mockito-core:5.16.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index a294ed4d924..3763254aed7 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -74,7 +74,6 @@ org.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -114,7 +113,6 @@ org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspat org.apache.opennlp:opennlp-tools:1.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.carrot2:morfologik-fsa:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.carrot2:morfologik-polish:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.carrot2:morfologik-stemming:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath @@ -153,14 +151,10 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=apiHelper,jarValidati org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.mockito:mockito-core:5.16.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-subclass:5.16.1=jarValidation,testRuntimeClasspath org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index f8c25513ec1..950ca98ae08 100644 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@ -72,7 +72,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLi org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -106,7 +105,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,runtimeClasspath,runtimeLi org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.carrot2:carrot2-core:4.5.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -143,11 +141,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtime org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index e148bf92bad..334be666180 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -75,7 +75,6 @@ org.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -110,7 +109,6 @@ org.apache.lucene:lucene-suggest:9.12.1=apiHelper,jarValidation,runtimeClasspath org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -146,14 +144,10 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=apiHelper,jarValidati org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.lz4:lz4-java:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.mockito:mockito-core:5.16.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 948adb8a28d..54a14ec0e4e 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -109,7 +109,6 @@ org.apache.commons:commons-lang3:3.15.0=compileClasspath,jarValidation,runtimeCl org.apache.commons:commons-math3:3.6.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -166,7 +165,6 @@ org.apache.tika:tika-parsers:1.28.5=compileClasspath,jarValidation,runtimeClassp org.apache.xmlbeans:xmlbeans:5.0.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.bouncycastle:bcmail-jdk15on:1.70=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpkix-jdk15on:1.70=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcprov-jdk15on:1.70=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath @@ -215,12 +213,8 @@ org.itadaki:bzip2:0.9.1=compileClasspath,jarValidation,runtimeClasspath,runtimeL org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jdom:jdom2:2.0.6.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.opengis:geoapi:3.0.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index 394f8226a0c..e2dc8aa1433 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -122,7 +122,6 @@ org.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -156,7 +155,6 @@ org.apache.lucene:lucene-suggest:9.12.1=apiHelper,jarValidation,runtimeClasspath org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath @@ -193,11 +191,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=apiHelper,jarValidati org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index b8ff16b1669..2bba72254b7 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -89,7 +89,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLi org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -123,7 +122,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,runtimeClasspath,runtimeLi org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.bitbucket.b_c:jose4j:0.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpkix-jdk15on:1.70=jarValidation,testRuntimeClasspath org.bouncycastle:bcpkix-jdk18on:1.78.1=jarValidation,testCompileClasspath,testRuntimeClasspath @@ -173,14 +171,10 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,testCompileClasspat org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath org.jetbrains:annotations:26.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.mockito:mockito-core:5.16.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-subclass:5.16.1=jarValidation,testRuntimeClasspath org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index f5e9cd3932f..151fb65e01d 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -74,7 +74,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLi org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -110,7 +109,6 @@ org.apache.opennlp:opennlp-tools:1.9.4=compileClasspath,jarValidation,runtimeCla org.apache.tika:tika-core:1.28.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -146,11 +144,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtime org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfile index 55a18e992de..04e35d70ac2 100644 --- a/solr/modules/llm/gradle.lockfile +++ b/solr/modules/llm/gradle.lockfile @@ -87,7 +87,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLi org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -121,7 +120,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,runtimeClasspath,runtimeLi org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -162,11 +160,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,ru org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index ed50fdc04e4..d022e775d8c 100644 --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@ -73,7 +73,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLi org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -107,7 +106,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,runtimeClasspath,runtimeLi org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -143,14 +141,10 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtime org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.mockito:mockito-core:5.16.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-subclass:5.16.1=jarValidation,testRuntimeClasspath org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index 1f5ae899ade..a9c892a7b00 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -106,7 +106,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLi org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -141,7 +140,6 @@ org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspat org.apache.tomcat:annotations-api:6.0.53=compileClasspath,compileOnlyHelper,jarValidation org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -182,11 +180,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,ru org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index c3367b9a64a..f3ede4256e5 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -91,7 +91,6 @@ org.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -126,7 +125,6 @@ org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspat org.apache.tomcat.embed:tomcat-embed-el:9.0.76=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -167,15 +165,11 @@ org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspat org.hdrhistogram:HdrHistogram:2.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.latencyutils:LatencyUtils:2.0.3=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.mockito:mockito-core:5.16.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-subclass:5.16.1=jarValidation,testRuntimeClasspath org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index d8ef284bf03..90e2b6b3c6b 100644 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@ -72,7 +72,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,runtimeClasspath,runtimeLi org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -106,7 +105,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,runtimeClasspath,runtimeLi org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -142,11 +140,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtime org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index 8ea90b98f78..40826a74a71 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -84,7 +84,6 @@ org.apache.commons:commons-math3:3.6.1=jarValidation,runtimeClasspath,runtimeLib org.apache.commons:commons-text:1.12.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents.client5:httpclient5:5.2.1=jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.httpcomponents.core5:httpcore5-h2:5.2=jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.apache.httpcomponents.core5:httpcore5:5.2.3=jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testRuntimeClasspath @@ -169,14 +168,10 @@ org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspat org.immutables:value-annotations:2.10.1=compileClasspath,compileOnlyHelper,jarValidation org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.jts.io:jts-io-common:1.19.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.locationtech.jts:jts-core:1.19.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.locationtech.proj4j:proj4j:1.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/prometheus-exporter/gradle.lockfile b/solr/prometheus-exporter/gradle.lockfile index 7bd4e1fdd30..952bd044911 100644 --- a/solr/prometheus-exporter/gradle.lockfile +++ b/solr/prometheus-exporter/gradle.lockfile @@ -76,7 +76,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,solrPlatformLibs,testRunti org.apache.commons:commons-math3:3.6.1=jarValidation,solrPlatformLibs,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -110,7 +109,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,solrPlatformLibs,testRunti org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,solrPlatformLibs,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -146,11 +144,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,solrPla org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,solrPlatformLibs,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,solrPlatformLibs,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index ce63c7564aa..57b83e409c2 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -71,7 +71,6 @@ org.apache.commons:commons-lang3:3.15.0=testRuntimeClasspath org.apache.commons:commons-math3:3.6.1=testRuntimeClasspath org.apache.curator:curator-client:5.8.0=testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=testCompileClasspath,testRuntimeClasspath @@ -103,7 +102,6 @@ org.apache.lucene:lucene-suggest:9.12.1=testRuntimeClasspath org.apache.lucene:lucene-test-framework:9.12.1=testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=testCompileClasspath,testRuntimeClasspath @@ -139,11 +137,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=testRuntimeClasspath -org.junit:junit-bom:5.6.2=testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=testRuntimeClasspath org.ow2.asm:asm:9.7.1=testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index 1902382f55b..ab8ce909d4c 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -91,7 +91,6 @@ org.apache.commons:commons-math3:3.6.1=compileClasspath,jarValidation,permitTest org.apache.commons:commons-text:1.12.0=jarValidation,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents.client5:httpclient5:5.2.1=jarValidation,testRuntimeClasspath org.apache.httpcomponents.core5:httpcore5-h2:5.2=jarValidation,testRuntimeClasspath org.apache.httpcomponents.core5:httpcore5:5.2.3=jarValidation,testRuntimeClasspath @@ -165,14 +164,10 @@ org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspat org.hsqldb:hsqldb:2.7.4=jarValidation,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.jts.io:jts-io-common:1.19.0=jarValidation,testRuntimeClasspath org.locationtech.jts:jts-core:1.19.0=jarValidation,testRuntimeClasspath org.locationtech.proj4j:proj4j:1.2.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index 5b66c971cce..021c307e0d5 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -88,7 +88,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,testRuntimeClasspath org.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=apiHelper,compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=apiHelper,compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -119,7 +118,6 @@ org.apache.lucene:lucene-suggest:9.12.1=jarValidation,testRuntimeClasspath org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=apiHelper,compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=apiHelper,compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.33.0=apiHelper org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath @@ -156,11 +154,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,testRun org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,testRuntimeClasspath diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 84741aa1b0e..0bdf26b4547 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -87,7 +87,6 @@ org.apache.commons:commons-lang3:3.15.0=jarValidation,testCompileClasspath,testR org.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=jarValidation,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=jarValidation,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -119,7 +118,6 @@ org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspat org.apache.yetus:audience-annotations:0.12.0=permitTestUnusedDeclared org.apache.zookeeper:zookeeper-jute:3.9.2=jarValidation,permitTestUnusedDeclared,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=jarValidation,permitTestUnusedDeclared,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -157,14 +155,10 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,testRun org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=jarValidation,testRuntimeClasspath org.mockito:mockito-core:5.16.1=jarValidation,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-subclass:5.16.1=jarValidation,testRuntimeClasspath org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=jarValidation,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=jarValidation,testRuntimeClasspath org.ow2.asm:asm:9.7.1=jarValidation,testRuntimeClasspath diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle index c9f1be0450c..e3341f3de3c 100644 --- a/solr/test-framework/build.gradle +++ b/solr/test-framework/build.gradle @@ -50,12 +50,6 @@ dependencies { implementation(libs.apache.curator.framework) { exclude group: 'org.apache.zookeeper', module: 'zookeeper' } - // Necessary because ChaosMonkey uses KillSession from curator-test - implementation(libs.apache.curator.test) { - exclude group: 'org.apache.zookeeper', module: 'zookeeper' - exclude group: 'com.google.guava', module: 'guava' - exclude group: 'io.dropwizard.metrics', module: 'metrics-core' - } implementation(libs.apache.zookeeper.zookeeper, zkExcludes) implementation(libs.apache.zookeeper.jute, zkExcludes) diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index b4eb3018413..25598f3209b 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -72,7 +72,6 @@ org.apache.commons:commons-lang3:3.15.0=apiHelper,jarValidation,runtimeClasspath org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.apache.curator:curator-client:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.curator:curator-framework:5.8.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.curator:curator-test:5.8.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpmime:4.5.14=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -103,7 +102,6 @@ org.apache.lucene:lucene-suggest:9.12.1=apiHelper,compileClasspath,jarValidation org.apache.lucene:lucene-test-framework:9.12.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -139,11 +137,7 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=apiHelper,jarValidati org.hamcrest:hamcrest:3.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor -org.junit.jupiter:junit-jupiter-api:5.6.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.6.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.6.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.7.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-tree:9.7.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.7.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath @@ -151,5 +145,5 @@ org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotatio org.semver4j:semver4j:5.3.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:2.0.16=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.xerial.snappy:snappy-java:1.1.10.5=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath empty=apiHelperTest,compileOnlyHelperTest,missingdoclet,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUsedUndeclared,signatures diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java index 1ac793e852d..80774d86e47 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZk2TestBase.java @@ -149,14 +149,6 @@ public void test() throws Exception { // expire a session... CloudJettyRunner cloudJetty = shardToJetty.get(SHARD1).get(0); chaosMonkey.expireSession(cloudJetty.jetty); - // Wait until the jetty is reconnected, otherwise the following index command could fail - cloudJetty - .jetty - .getCoreContainer() - .getZkController() - .getZkClient() - .getCuratorFramework() - .blockUntilConnected(50, TimeUnit.MILLISECONDS); indexr("id", docId + 1, t1, "slip this doc in"); diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java index 7aba886eeb6..ffbaa6ba48b 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java @@ -23,15 +23,16 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; -import org.apache.curator.test.KillSession; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.solr.cloud.AbstractFullDistribZkTestBase.CloudJettyRunner; import org.apache.solr.common.cloud.DocCollection; +import org.apache.solr.common.cloud.OnDisconnect; import org.apache.solr.common.cloud.Replica; import org.apache.solr.common.cloud.Replica.Type; import org.apache.solr.common.cloud.Slice; @@ -48,6 +49,7 @@ import org.apache.solr.util.TestInjection; import org.apache.solr.util.TimeOut; import org.apache.zookeeper.KeeperException; +import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -153,20 +155,44 @@ public static void expireSession(final JettySolrRunner jetty, final ZkTestServer CoreContainer cores = jetty.getCoreContainer(); if (cores != null) { monkeyLog("expire session for node " + jetty.getBaseUrl() + " !"); - SolrZkClient zkClient = cores.getZkController().getZkClient(); - long sessionId = zkClient.getZkSessionId(); - zkServer.expire(sessionId); - causeConnectionLoss(jetty); - // Loop until either the Zookeeper Client is no longer connected, or the zkSessionID changes - // (which means the connection was lost in the client) - while (zkClient.getCuratorFramework().getZookeeperClient().isConnected()) { - if (zkClient.getZkSessionId() != sessionId) { - break; - } + try { + expireSession(cores.getZkController().getZkClient(), zkServer); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + log.warn("Exception causing connection loss", e); } } } + public static void expireSession(final SolrZkClient zkClient, final ZkTestServer zkServer) + throws InterruptedException { + final CountDownLatch hasDisconnected = new CountDownLatch(1); + final OnDisconnect onDisconnect = + (sessionExpired) -> { + if (sessionExpired) { + hasDisconnected.countDown(); + } + }; + zkClient.getCuratorFramework().getConnectionStateListenable().addListener(onDisconnect); + long sessionId = zkClient.getZkSessionId(); + zkServer.expire(sessionId); + Assert.assertTrue( + "ZK Client did not disconnect after session expiration", + hasDisconnected.await(10, TimeUnit.SECONDS)); + Assert.assertTrue( + "Curator Client did not reconnect within 10 seconds", + zkClient.getCuratorFramework().blockUntilConnected(10, TimeUnit.SECONDS)); + Assert.assertTrue( + "Curator ZK Client did not reconnect within timeout", + zkClient.getCuratorFramework().getZookeeperClient().blockUntilConnectedOrTimedOut()); + Assert.assertTrue("ZK Client is not connected", zkClient.isConnected()); + Assert.assertNotEquals( + "ZK Client session ID did not change, not a real session expiration", + sessionId, + zkClient.getZkSessionId()); + zkClient.getCuratorFramework().getConnectionStateListenable().removeListener(onDisconnect); + } + public void expireRandomSession() throws KeeperException, InterruptedException { String sliceName = getRandomSlice(); @@ -194,7 +220,12 @@ public static void causeConnectionLoss(JettySolrRunner jetty) { monkeyLog("Will cause connection loss on node " + jetty.getBaseUrl()); SolrZkClient zkClient = cores.getZkController().getZkClient(); try { - KillSession.kill(zkClient.getCuratorFramework().getZookeeperClient().getZooKeeper()); + zkClient + .getCuratorFramework() + .getZookeeperClient() + .getZooKeeper() + .getTestable() + .closeSocket(); } catch (Exception e) { log.warn("Exception causing connection loss", e); }