diff --git a/changelog/unreleased/SOLR-17855-dropwizard-removal.yml b/changelog/unreleased/SOLR-17855-dropwizard-removal.yml new file mode 100644 index 000000000000..a4dae43ed5bd --- /dev/null +++ b/changelog/unreleased/SOLR-17855-dropwizard-removal.yml @@ -0,0 +1,9 @@ +title: Remove Dropwizard Metrics as a direct Solr dependency. The `OVERSEERSTATUS` response no longer includes per-operation timing metrics per-operation `requests` and `errors` counts still exist. Users needing per-operation latency can use distributed tracing as a substitute. +type: removed +authors: + - name: Matthew Biscocho + - name: Eric Pugh + - name: David Smiley +links: + - name: SOLR-17855 + url: https://issues.apache.org/jira/browse/SOLR-17855 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e01a559bf1f4..aa37bf60e843 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -82,7 +82,6 @@ decompose = "3.4.0" diffplug-spotless = "8.3.0" # @keep Use for dockerfile JRE version dockerfile-baseimage-java = "25" -dropwizard-metrics = "4.2.33" eclipse-ecj = "3.39.0" eclipse-jetty = "12.0.34" # @keep jgit version used by git-status.gradle @@ -326,8 +325,6 @@ cuvs-java = { module = "com.nvidia.cuvs:cuvs-java", version.ref = "cuvs-java" } cuvs-lucene = { module = "com.nvidia.cuvs.lucene:cuvs-lucene", version.ref = "cuvs-lucene" } decompose-decompose = { module = "com.arkivanov.decompose:decompose", version.ref = "decompose" } decompose-extensions-compose = { module = "com.arkivanov.decompose:extensions-compose", version.ref = "decompose" } -dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core", version.ref = "dropwizard-metrics" } -dropwizard-metrics-jetty12-ee10 = { module = "io.dropwizard.metrics:metrics-jetty12-ee10", version.ref = "dropwizard-metrics" } eclipse-jdt-ecj = { module = "org.eclipse.jdt:ecj", version.ref = "eclipse-ecj" } eclipse-jetty-alpnjavaclient = { module = "org.eclipse.jetty:jetty-alpn-java-client", version.ref = "eclipse-jetty" } eclipse-jetty-alpnjavaserver = { module = "org.eclipse.jetty:jetty-alpn-java-server", version.ref = "eclipse-jetty" } diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index 874ea4343754..b3671bdd38a7 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -38,10 +38,7 @@ com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.classgraph:classgraph:4.8.165=swaggerBuild io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/benchmark/build.gradle b/solr/benchmark/build.gradle index eeb67b7dbf7f..fab56a4c3f43 100644 --- a/solr/benchmark/build.gradle +++ b/solr/benchmark/build.gradle @@ -49,7 +49,6 @@ dependencies { implementation libs.apache.lucene.core implementation libs.commonsio.commonsio - implementation libs.dropwizard.metrics.core implementation libs.apache.commons.math3 implementation libs.jctools.core implementation libs.quicktheories.quicktheories diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index 975a714e17bf..17d788a364b5 100644 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@ -34,10 +34,7 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,testRuntimeClasspath commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,runtimeClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,runtimeClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,runtimeClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,runtimeClasspath,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/solr/benchmark/src/java/org/apache/solr/bench/SolrBenchState.java b/solr/benchmark/src/java/org/apache/solr/bench/SolrBenchState.java index ff6a09cfe51e..3caf03a2f539 100755 --- a/solr/benchmark/src/java/org/apache/solr/bench/SolrBenchState.java +++ b/solr/benchmark/src/java/org/apache/solr/bench/SolrBenchState.java @@ -19,7 +19,6 @@ import static org.apache.commons.io.file.PathUtils.deleteDirectory; import static org.apache.solr.bench.BaseBenchState.log; -import com.codahale.metrics.Meter; import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; @@ -37,6 +36,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.jetty.HttpJettySolrClient; import org.apache.solr.client.solrj.request.CollectionAdminRequest; @@ -396,7 +396,8 @@ public void index(String collection, Docs docs, int docCount, boolean parallel) @SuppressForbidden(reason = "Benchmarks may use JDK ExecutorService impls") private void indexParallel(String collection, Docs docs, int docCount) throws InterruptedException { - Meter meter = new Meter(); + AtomicLong meterCount = new AtomicLong(); + long meterStartNanos = System.nanoTime(); ExecutorService executorService = Executors.newFixedThreadPool( Runtime.getRuntime().availableProcessors(), @@ -406,10 +407,11 @@ private void indexParallel(String collection, Docs docs, int docCount) new SolrNamedThreadFactory("SolrJMH Indexer Progress")); scheduledExecutor.scheduleAtFixedRate( () -> { - if (meter.getCount() == docCount) { + long count = meterCount.get(); + if (count == docCount) { scheduledExecutor.shutdown(); } else { - log(meter.getCount() + " docs at " + meter.getMeanRate() + " doc/s"); + logIndexingRate(count, meterStartNanos); } }, 10, @@ -427,7 +429,7 @@ public void run() { SolrInputDocument doc = docs.inputDocument(); // log("add doc " + doc); updateRequest.add(doc); - meter.mark(); + meterCount.incrementAndGet(); try { client.requestWithBaseUrl(url, updateRequest, collection); @@ -451,7 +453,8 @@ public void run() { private void indexBatch(String collection, Docs docs, int docCount, int batchSize) throws SolrServerException, IOException { - Meter meter = new Meter(); + long meterCount = 0; + long meterStartNanos = System.nanoTime(); List batch = new ArrayList<>(batchSize); for (int i = 1; i <= docCount; i++) { batch.add(docs.inputDocument()); @@ -459,19 +462,19 @@ private void indexBatch(String collection, Docs docs, int docCount, int batchSiz UpdateRequest updateRequest = new UpdateRequest(); updateRequest.add(batch); client.requestWithBaseUrl(nodes.get(0), updateRequest, collection); - meter.mark(batch.size()); + meterCount += batch.size(); batch.clear(); - log(meter.getCount() + " docs at " + (long) meter.getMeanRate() + " doc/s"); + logIndexingRate(meterCount, meterStartNanos); } } if (!batch.isEmpty()) { UpdateRequest updateRequest = new UpdateRequest(); updateRequest.add(batch); client.requestWithBaseUrl(nodes.get(0), updateRequest, collection); - meter.mark(batch.size()); + meterCount += batch.size(); batch = null; } - log(meter.getCount() + " docs at " + (long) meter.getMeanRate() + " doc/s"); + logIndexingRate(meterCount, meterStartNanos); } /** @@ -586,4 +589,10 @@ public static Path getFile(String name) { + " CWD=" + Path.of("").toAbsolutePath()); } + + private static void logIndexingRate(long docCount, long startNanos) { + long elapsedSec = TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - startNanos); + long rate = elapsedSec > 0 ? docCount / elapsedSec : 0; + log(docCount + " docs at " + rate + " doc/s"); + } } diff --git a/solr/core/build.gradle b/solr/core/build.gradle index 819ad44f6452..5d801a99ece8 100644 --- a/solr/core/build.gradle +++ b/solr/core/build.gradle @@ -50,8 +50,6 @@ dependencies { api project(':solr:solrj-zookeeper') api project(':solr:solrj-streaming') - implementation libs.dropwizard.metrics.core - implementation platform(libs.jersey.bom) runtimeOnly(libs.jersey.containers.jettyhttp, { exclude group: "org.eclipse.jetty", module: "jetty-continuation" @@ -205,5 +203,4 @@ dependencies { testImplementation libs.apache.httpcomponents.httpclient testImplementation libs.opentelemetry.sdk.testing - testImplementation libs.dropwizard.metrics.core } diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index d6baad62929c..7267ab45b84a 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -38,10 +38,7 @@ com.tdunning:t-digest:3.3=compileClasspath,jarValidation,runtimeClasspath,runtim commons-cli:commons-cli:1.11.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testCompileClasspath,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java index c1f3eefcdb20..e3b1651eeeef 100644 --- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java +++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java @@ -18,7 +18,6 @@ import static org.apache.solr.common.params.CommonParams.ID; -import com.codahale.metrics.Timer; import io.opentelemetry.api.common.Attributes; import java.io.Closeable; import java.io.IOException; @@ -427,7 +426,6 @@ private ClusterState processQueueItem( "Message missing " + QUEUE_OPERATION + ":" + message); } List zkWriteCommands = null; - final Timer.Context timerContext = stats.time(operation); try { zkWriteCommands = processMessage(clusterState, message, operation); stats.success(operation); @@ -442,8 +440,6 @@ private ClusterState processQueueItem( message, e); stats.error(operation); - } finally { - timerContext.stop(); } if (zkWriteCommands != null) { clusterState = zkStateWriter.enqueueUpdate(clusterState, zkWriteCommands, callback); @@ -594,7 +590,6 @@ private List processMessage( } private LeaderStatus amILeader() { - Timer.Context timerContext = stats.time("am_i_leader"); boolean success = true; String propsId = null; try { @@ -623,7 +618,6 @@ private LeaderStatus amILeader() { success = false; log.warn("Unexpected exception", e); } finally { - timerContext.stop(); if (success) { stats.success("am_i_leader"); } else { diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java index 30ff9a31996e..b7755a01ef81 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java @@ -20,7 +20,6 @@ import static org.apache.solr.common.params.CommonAdminParams.ASYNC; import static org.apache.solr.common.params.CommonParams.ID; -import com.codahale.metrics.Timer; import io.opentelemetry.api.common.Attributes; import java.io.Closeable; import java.lang.invoke.MethodHandles; @@ -497,7 +496,6 @@ public static String getLeaderId(SolrZkClient zkClient) protected LeaderStatus amILeader() { String statsName = "collection_am_i_leader"; - Timer.Context timerContext = stats.time(statsName); boolean success = true; String propsId = null; try { @@ -524,7 +522,6 @@ protected LeaderStatus amILeader() { success = false; Thread.currentThread().interrupt(); } finally { - timerContext.stop(); if (success) { stats.success(statsName); } else { @@ -577,7 +574,6 @@ public Runner( @Override public void run() { String statsName = messageHandler.getTimerName(operation); - final Timer.Context timerContext = stats.time(statsName); boolean success = false; final String asyncId = message.getStr(ASYNC); @@ -590,7 +586,6 @@ public void run() { } response = messageHandler.processMessage(message, operation, lock); } finally { - timerContext.stop(); updateStats(statsName); } diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java index 535c233bf073..b21a39e8a0c8 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java @@ -16,7 +16,6 @@ */ package org.apache.solr.cloud; -import com.codahale.metrics.Timer; import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; @@ -114,32 +113,26 @@ public boolean containsTaskWithRequestId(String requestIdKey, String requestId) */ public void remove(QueueEvent event, boolean setResult) throws KeeperException, InterruptedException { - Timer.Context time = stats.time(dir + "_remove_event"); - try { - String path = event.getId(); + String path = event.getId(); - // Set response data in the response node - if (setResult) { - String responsePath = - dir + "/" + RESPONSE_PREFIX + path.substring(path.lastIndexOf('-') + 1); + // Set response data in the response node + if (setResult) { + String responsePath = dir + "/" + RESPONSE_PREFIX + path.substring(path.lastIndexOf('-') + 1); - try { - zookeeper.setData(responsePath, event.getBytes()); - } catch (KeeperException.NoNodeException ignored) { - // we must handle the race case where the node no longer exists - log.info( - "Response ZK path: {} doesn't exist. Requestor may have disconnected from ZooKeeper", - responsePath); - } - } - - // Remove the request node try { - zookeeper.delete(path, -1); + zookeeper.setData(responsePath, event.getBytes()); } catch (KeeperException.NoNodeException ignored) { + // we must handle the race case where the node no longer exists + log.info( + "Response ZK path: {} doesn't exist. Requestor may have disconnected from ZooKeeper", + responsePath); } - } finally { - time.stop(); + } + + // Remove the request node + try { + zookeeper.delete(path, -1); + } catch (KeeperException.NoNodeException ignored) { } } @@ -232,7 +225,6 @@ public QueueEvent offer(byte[] data, long timeout) throws KeeperException, Inter SolrException.ErrorCode.CONFLICT, "Solr is shutting down, no more overseer tasks may be offered"); } - Timer.Context time = stats.time(dir + "_offer"); try { // Create and watch the response node before creating the request node; // otherwise we may miss the response. @@ -255,7 +247,6 @@ public QueueEvent offer(byte[] data, long timeout) throws KeeperException, Inter zookeeper.delete(watchID, -1); return event; } finally { - time.stop(); pendingResponses.decrementAndGet(); } } @@ -276,20 +267,12 @@ public List peekTopN(int n, Predicate excludeSet, long waitM ArrayList topN = new ArrayList<>(); log.debug("Peeking for top {} elements. ExcludeSet: {}", n, excludeSet); - Timer.Context time; - if (waitMillis == Long.MAX_VALUE) time = stats.time(dir + "_peekTopN_wait_forever"); - else time = stats.time(dir + "_peekTopN_wait" + waitMillis); - - try { - for (Pair element : - peekElements(n, waitMillis, child -> !excludeSet.test(dir + "/" + child))) { - topN.add(new QueueEvent(dir + "/" + element.first(), element.second(), null)); - } - printQueueEventsListElementIds(topN); - return topN; - } finally { - time.stop(); + for (Pair element : + peekElements(n, waitMillis, child -> !excludeSet.test(dir + "/" + child))) { + topN.add(new QueueEvent(dir + "/" + element.first(), element.second(), null)); } + printQueueEventsListElementIds(topN); + return topN; } private static void printQueueEventsListElementIds(ArrayList topN) { diff --git a/solr/core/src/java/org/apache/solr/cloud/Stats.java b/solr/core/src/java/org/apache/solr/cloud/Stats.java index f1fbe1abb970..b12acaa8efda 100644 --- a/solr/core/src/java/org/apache/solr/cloud/Stats.java +++ b/solr/core/src/java/org/apache/solr/cloud/Stats.java @@ -16,7 +16,6 @@ */ package org.apache.solr.cloud; -import com.codahale.metrics.Timer; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.List; @@ -72,16 +71,6 @@ public void error(String operation) { stat.errors.incrementAndGet(); } - public Timer.Context time(String operation) { - String op = operation.toLowerCase(Locale.ROOT); - Stat stat = stats.get(op); - if (stat == null) { - stat = new Stat(); - stats.put(op, stat); - } - return stat.requestTime.time(); - } - public void storeFailureDetails(String operation, ZkNodeProps request, SolrResponse resp) { String op = operation.toLowerCase(Locale.ROOT); Stat stat = stats.get(op); @@ -116,20 +105,14 @@ public void setQueueLength(int queueLength) { this.queueLength = queueLength; } - public void clear() { - stats.clear(); - } - public static class Stat { public final AtomicInteger success; public final AtomicInteger errors; - public final Timer requestTime; public final ArrayDeque failureDetails; public Stat() { this.success = new AtomicInteger(); this.errors = new AtomicInteger(); - this.requestTime = new Timer(); this.failureDetails = new ArrayDeque<>(); } } diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java b/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java index ec312447d441..6127176b2302 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java @@ -16,7 +16,6 @@ */ package org.apache.solr.cloud; -import com.codahale.metrics.Timer; import com.google.common.annotations.VisibleForTesting; import java.lang.invoke.MethodHandles; import java.util.ArrayList; @@ -144,12 +143,7 @@ public ZkDistributedQueue(SolrZkClient zookeeper, String dir, Stats stats, int m */ @Override public byte[] peek() throws KeeperException, InterruptedException { - Timer.Context time = stats.time(dir + "_peek"); - try { - return firstElement(); - } finally { - time.stop(); - } + return firstElement(); } /** @@ -176,12 +170,6 @@ public byte[] peek(long wait) throws KeeperException, InterruptedException { if (wait < 0) { throw new IllegalArgumentException("Wait must be greater than 0. Wait was " + wait); } - Timer.Context time; - if (wait == Long.MAX_VALUE) { - time = stats.time(dir + "_peek_wait_forever"); - } else { - time = stats.time(dir + "_peek_wait" + wait); - } updateLock.lockInterruptibly(); try { long waitNanos = TimeUnit.MILLISECONDS.toNanos(wait); @@ -195,7 +183,6 @@ public byte[] peek(long wait) throws KeeperException, InterruptedException { return null; } finally { updateLock.unlock(); - time.stop(); } } @@ -206,12 +193,7 @@ public byte[] peek(long wait) throws KeeperException, InterruptedException { */ @Override public byte[] poll() throws KeeperException, InterruptedException { - Timer.Context time = stats.time(dir + "_poll"); - try { - return removeFirst(); - } finally { - time.stop(); - } + return removeFirst(); } /** @@ -221,16 +203,11 @@ public byte[] poll() throws KeeperException, InterruptedException { */ @Override public byte[] remove() throws NoSuchElementException, KeeperException, InterruptedException { - Timer.Context time = stats.time(dir + "_remove"); - try { - byte[] result = removeFirst(); - if (result == null) { - throw new NoSuchElementException(); - } - return result; - } finally { - time.stop(); + byte[] result = removeFirst(); + if (result == null) { + throw new NoSuchElementException(); } + return result; } public void remove(Collection paths) throws KeeperException, InterruptedException { @@ -274,7 +251,6 @@ public void remove(Collection paths) throws KeeperException, Interrupted @Override public byte[] take() throws KeeperException, InterruptedException { // Same as for element. Should refactor this. - Timer.Context timer = stats.time(dir + "_take"); updateLock.lockInterruptibly(); try { while (true) { @@ -286,7 +262,6 @@ public byte[] take() throws KeeperException, InterruptedException { } } finally { updateLock.unlock(); - timer.stop(); } } @@ -296,44 +271,39 @@ public byte[] take() throws KeeperException, InterruptedException { */ @Override public void offer(byte[] data) throws KeeperException, InterruptedException { - Timer.Context time = stats.time(dir + "_offer"); - try { - while (true) { - try { - if (maxQueueSize > 0) { - if (offerPermits.get() <= 0 || offerPermits.getAndDecrement() <= 0) { - // If a max queue size is set, check it before creating a new queue item. - Stat stat = zookeeper.exists(dir, null); - if (stat == null) { - // jump to the code below, which tries to create dir if it doesn't exist - throw new KeeperException.NoNodeException(); - } - int remainingCapacity = maxQueueSize - stat.getNumChildren(); - if (remainingCapacity <= 0) { - throw new IllegalStateException("queue is full"); - } - - // Allow this client to push up to 1% of the remaining queue capacity without - // rechecking. - offerPermits.set(remainingCapacity / 100); + while (true) { + try { + if (maxQueueSize > 0) { + if (offerPermits.get() <= 0 || offerPermits.getAndDecrement() <= 0) { + // If a max queue size is set, check it before creating a new queue item. + Stat stat = zookeeper.exists(dir, null); + if (stat == null) { + // jump to the code below, which tries to create dir if it doesn't exist + throw new KeeperException.NoNodeException(); + } + int remainingCapacity = maxQueueSize - stat.getNumChildren(); + if (remainingCapacity <= 0) { + throw new IllegalStateException("queue is full"); } - } - // Explicitly set isDirty here so that synchronous same-thread calls behave as expected. - // This will get set again when the watcher actually fires, but that's ok. - zookeeper.create(dir + "/" + PREFIX, data, CreateMode.PERSISTENT_SEQUENTIAL); - isDirty = true; - return; - } catch (KeeperException.NoNodeException e) { - try { - zookeeper.create(dir, new byte[0], CreateMode.PERSISTENT); - } catch (KeeperException.NodeExistsException ne) { - // someone created it + // Allow this client to push up to 1% of the remaining queue capacity without + // rechecking. + offerPermits.set(remainingCapacity / 100); } } + + // Explicitly set isDirty here so that synchronous same-thread calls behave as expected. + // This will get set again when the watcher actually fires, but that's ok. + zookeeper.create(dir + "/" + PREFIX, data, CreateMode.PERSISTENT_SEQUENTIAL); + isDirty = true; + return; + } catch (KeeperException.NoNodeException e) { + try { + zookeeper.create(dir, new byte[0], CreateMode.PERSISTENT); + } catch (KeeperException.NodeExistsException ne) { + // someone created it + } } - } finally { - time.stop(); } } diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerStatusCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerStatusCmd.java index 031808b5b058..28a56ae52cd2 100644 --- a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerStatusCmd.java +++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerStatusCmd.java @@ -17,8 +17,6 @@ package org.apache.solr.cloud.api.collections; -import com.codahale.metrics.Timer; -import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -28,10 +26,7 @@ import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; -import org.apache.solr.util.stats.MetricUtils; import org.apache.zookeeper.data.Stat; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * This command returns stats about the Overseer, the cluster state updater and collection API @@ -84,7 +79,6 @@ *
    *
  • {@code requests}: success count of the given operation *
  • {@code errors}: error count of the operation - *
  • More metrics (see below) *
*
  • {@code collection_operations}: map (of maps) of success and error counts for * collection related operations. The operations(keys) tracked in this map are all @@ -107,48 +101,10 @@ * having two entries, one with key {@code request} with a failed request properties (a * {@link ZkNodeProps}) and the other with key {@code response} with the corresponding * response properties (a {@link org.apache.solr.client.solrj.SolrResponse}). - *
  • More metrics (see below) * - *
  • {@code overseer_queue}: metrics on operations done on the Zookeeper queue {@code - * /overseer/queue} (see metrics below).
    - * The operations that can be done on the queue and that can be keys whose values are a - * metrics map are: - *
      - *
    • {@code offer} - *
    • {@code peek} - *
    • {@code peek_wait} - *
    • {@code peek_wait_forever} - *
    • {@code peekTopN_wait} - *
    • {@code peekTopN_wait_forever} - *
    • {@code poll} - *
    • {@code remove} - *
    • {@code remove_event} - *
    • {@code take} - *
    - *
  • {@code collection_queue}: same as above but for queue {@code - * /overseer/collection-queue-work} - * - * - *

    Maps returned as values of keys in {@code overseer_operations}, {@code - * collection_operations}, {@code overseer_queue} and {@code collection_queue} - * include additional stats. These stats are provided by {@link MetricUtils}, and represent metrics - * on each type of operation execution (be it failed or successful), see calls to {@link - * Stats#time(String)}. The metric keys are: - * - *

      - *
    • {@code avgRequestsPerSecond} - *
    • {@code 5minRateRequestsPerSecond} - *
    • {@code 15minRateRequestsPerSecond} - *
    • {@code avgTimePerRequest} - *
    • {@code medianRequestTime} - *
    • {@code 75thPcRequestTime} - *
    • {@code 95thPcRequestTime} - *
    • {@code 99thPcRequestTime} - *
    • {@code 999thPcRequestTime} *
    */ public class OverseerStatusCmd implements CollApiCmds.CollectionApiCommand { - private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private final CollectionCommandContext ccc; public OverseerStatusCmd(CollectionCommandContext ccc) { @@ -178,8 +134,6 @@ public void call(AdminCmdContext adminCmdContext, ZkNodeProps message, NamedList NamedList overseerStats = new NamedList<>(); NamedList collectionStats = new NamedList<>(); - NamedList stateUpdateQueueStats = new NamedList<>(); - NamedList collectionQueueStats = new NamedList<>(); Stats stats = ccc.getOverseerStats(); for (Map.Entry entry : stats.getStats().entrySet()) { String key = entry.getKey(); @@ -201,25 +155,16 @@ public void call(AdminCmdContext adminCmdContext, ZkNodeProps message, NamedList } lst.add("recent_failures", failures); } - } else if (key.startsWith("/overseer/queue_")) { - stateUpdateQueueStats.add(key.substring(16), lst); - } else if (key.startsWith("/overseer/collection-queue-work_")) { - collectionQueueStats.add(key.substring(32), lst); } else { - // overseer stats overseerStats.add(key, lst); int successes = stats.getSuccessCount(entry.getKey()); int errors = stats.getErrorCount(entry.getKey()); lst.add("requests", successes); lst.add("errors", errors); } - Timer timer = entry.getValue().requestTime; - MetricUtils.addMetrics(lst, timer); } results.add("overseer_operations", overseerStats); results.add("collection_operations", collectionStats); - results.add("overseer_queue", stateUpdateQueueStats); - results.add("collection_queue", collectionQueueStats); } } diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java index 5ee0fd03fa33..8059a2b16b6d 100644 --- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java +++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java @@ -16,7 +16,6 @@ */ package org.apache.solr.cloud.overseer; -import com.codahale.metrics.Timer; import java.lang.invoke.MethodHandles; import java.time.Instant; import java.util.HashMap; @@ -255,7 +254,6 @@ public ClusterState writePendingUpdates( } return clusterState; } - Timer.Context timerContext = stats.time("update_state"); boolean success = false; try { if (!updates.isEmpty()) { @@ -347,7 +345,6 @@ public ClusterState writePendingUpdates( invalidState = true; throw bve; } finally { - timerContext.stop(); if (success) { stats.success("update_state"); } else { diff --git a/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java b/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java index 506799af323c..696150349241 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java +++ b/solr/core/src/java/org/apache/solr/util/stats/MetricUtils.java @@ -16,8 +16,6 @@ */ package org.apache.solr.util.stats; -import com.codahale.metrics.Snapshot; -import com.codahale.metrics.Timer; import io.prometheus.metrics.model.snapshots.CounterSnapshot; import io.prometheus.metrics.model.snapshots.GaugeSnapshot; import io.prometheus.metrics.model.snapshots.HistogramSnapshot; @@ -35,7 +33,6 @@ import java.util.TreeMap; import java.util.concurrent.TimeUnit; import org.apache.solr.common.params.SolrParams; -import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.StrUtils; /** Metrics specific utility functions. */ @@ -98,25 +95,6 @@ public class MetricUtils { "com.ibm.lang.management.OperatingSystemMXBean" }; - /** - * Adds metrics from a Timer to a NamedList, using well-known back-compat names. - * - * @param lst The NamedList to add the metrics data to - * @param timer The Timer to extract the metrics from - */ - public static void addMetrics(NamedList lst, Timer timer) { - Snapshot snapshot = timer.getSnapshot(); - lst.add("avgRequestsPerSecond", timer.getMeanRate()); - lst.add("5minRateRequestsPerSecond", timer.getFiveMinuteRate()); - lst.add("15minRateRequestsPerSecond", timer.getFifteenMinuteRate()); - lst.add("avgTimePerRequest", nsToMs(snapshot.getMean())); - lst.add("medianRequestTime", nsToMs(snapshot.getMedian())); - lst.add("75thPcRequestTime", nsToMs(snapshot.get75thPercentile())); - lst.add("95thPcRequestTime", nsToMs(snapshot.get95thPercentile())); - lst.add("99thPcRequestTime", nsToMs(snapshot.get99thPercentile())); - lst.add("999thPcRequestTime", nsToMs(snapshot.get999thPercentile())); - } - /** * Converts a double representing nanoseconds to a double representing milliseconds. * diff --git a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java index e4436b625321..cd3dced45cff 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java @@ -78,7 +78,6 @@ public static void setupCluster() throws Exception { .addConfig( "conf", TEST_PATH().resolve("configsets").resolve("exitable-directory").resolve("conf")); - clusterBuilder.withMetrics(true); clusterBuilder.configure(); // pick an arbitrary node to use for our requests diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java index f8883662e74d..4cbe6759f42a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java @@ -113,7 +113,6 @@ public void test() throws Exception { assertNotNull(amIleader.get("requests")); assertTrue(Integer.parseInt(amIleader.get("requests").toString()) > 0); assertNotNull(amIleader.get("errors")); - assertNotNull(amIleader.get("avgTimePerRequest")); // When cluster state updates are distributed, Overseer doesn't see the updates and doesn't // report stats on them. @@ -123,7 +122,6 @@ public void test() throws Exception { assertNotNull(amIleader.get("requests")); assertTrue(Integer.parseInt(amIleader.get("requests").toString()) > 0); assertNotNull(amIleader.get("errors")); - assertNotNull(amIleader.get("avgTimePerRequest")); SimpleOrderedMap updateState = (SimpleOrderedMap) overseer_operations.get("update_state"); @@ -131,7 +129,6 @@ public void test() throws Exception { assertNotNull(updateState.get("requests")); assertTrue(Integer.parseInt(updateState.get("requests").toString()) > 0); assertNotNull(updateState.get("errors")); - assertNotNull(updateState.get("avgTimePerRequest")); } } } diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java index 644d47f96a1c..4c0077c2e96e 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java @@ -28,8 +28,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.codahale.metrics.Snapshot; -import com.codahale.metrics.Timer; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.nio.file.Path; @@ -1487,17 +1485,13 @@ public void testPerformance() throws Exception { // operations createCollection("perf_sentinel", 1); - Timer t = new Timer(); - Timer.Context context = t.time(); reader.waitForState( "perf_sentinel", 15000, TimeUnit.MILLISECONDS, (liveNodes, collectionState) -> collectionState != null); - context.stop(); - log.info("Overseer loop finished processing: "); - printTimingStats(t); + log.info("Overseer loop finished processing"); Overseer overseer = overseers.get(0); Stats stats = overseer.getStats(); @@ -1511,8 +1505,6 @@ public void testPerformance() throws Exception { if (log.isInfoEnabled()) { log.info("op: {}, success: {}, failure: {}", op, stat.success.get(), stat.errors.get()); } - Timer timer = stat.requestTime; - printTimingStats(timer); } } finally { @@ -1522,25 +1514,6 @@ public void testPerformance() throws Exception { } } - private void printTimingStats(Timer timer) { - Snapshot snapshot = timer.getSnapshot(); - if (log.isInfoEnabled()) { - log.info("\t avgRequestsPerSecond: {}", timer.getMeanRate()); - log.info("\t 5minRateRequestsPerSecond: {}", timer.getFiveMinuteRate()); // nowarn - log.info("\t 15minRateRequestsPerSecond: {}", timer.getFifteenMinuteRate()); // nowarn - log.info("\t avgTimePerRequest: {}", nsToMs(snapshot.getMean())); // nowarn - log.info("\t medianRequestTime: {}", nsToMs(snapshot.getMedian())); // nowarn - log.info("\t 75thPcRequestTime: {}", nsToMs(snapshot.get75thPercentile())); // nowarn - log.info("\t 95thPcRequestTime: {}", nsToMs(snapshot.get95thPercentile())); // nowarn - log.info("\t 99thPcRequestTime: {}", nsToMs(snapshot.get99thPercentile())); // nowarn - log.info("\t 999thPcRequestTime: {}", nsToMs(snapshot.get999thPercentile())); // nowarn - } - } - - private static long nsToMs(double ns) { - return TimeUnit.MILLISECONDS.convert((long) ns, TimeUnit.NANOSECONDS); - } - private void close(MockZKController mockController) { if (mockController != null) { mockController.close(); diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 0cccba9d6ef9..1a4c1b3845e1 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -54,10 +54,7 @@ commons-collections:commons-collections:3.2.2=jarValidation,runtimeClasspath,run commons-digester:commons-digester:2.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath commons-validator:commons-validator:1.10.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.1.12.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.grpc:grpc-api:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath diff --git a/solr/licenses/metrics-annotation-4.2.33.jar.sha1 b/solr/licenses/metrics-annotation-4.2.33.jar.sha1 deleted file mode 100644 index cd57c5b390ba..000000000000 --- a/solr/licenses/metrics-annotation-4.2.33.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -369ea30468f0ce00c4db45f1befce37f17a43f83 diff --git a/solr/licenses/metrics-core-3.2.5.jar.sha1 b/solr/licenses/metrics-core-3.2.5.jar.sha1 new file mode 100644 index 000000000000..2b5b1e128580 --- /dev/null +++ b/solr/licenses/metrics-core-3.2.5.jar.sha1 @@ -0,0 +1 @@ +ea2316646e9787c5b2d14ca97f4ef7ad5c6b94e9 diff --git a/solr/licenses/metrics-core-4.1.12.1.jar.sha1 b/solr/licenses/metrics-core-4.1.12.1.jar.sha1 new file mode 100644 index 000000000000..bc15d23cf0c8 --- /dev/null +++ b/solr/licenses/metrics-core-4.1.12.1.jar.sha1 @@ -0,0 +1 @@ +cb2f351bf4463751201f43bb99865235d5ba07ca diff --git a/solr/licenses/metrics-core-4.2.33.jar.sha1 b/solr/licenses/metrics-core-4.2.33.jar.sha1 deleted file mode 100644 index 73cb90c5dd65..000000000000 --- a/solr/licenses/metrics-core-4.2.33.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -703e6a1d55238024576a3e0d253511bd4d9c02bb diff --git a/solr/licenses/metrics-jetty12-4.2.33.jar.sha1 b/solr/licenses/metrics-jetty12-4.2.33.jar.sha1 deleted file mode 100644 index 70117a2ac4cf..000000000000 --- a/solr/licenses/metrics-jetty12-4.2.33.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d554e780d5dcdeaee9c7e73d7c38054cfe67a8c2 diff --git a/solr/licenses/metrics-jetty12-ee10-4.2.33.jar.sha1 b/solr/licenses/metrics-jetty12-ee10-4.2.33.jar.sha1 deleted file mode 100644 index 27207d6bb199..000000000000 --- a/solr/licenses/metrics-jetty12-ee10-4.2.33.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -05c4d053f14fdf16301745946ffcc846201c6f65 diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index ea2b716d3cab..959fe0e15429 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -36,10 +36,7 @@ com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,s commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index 285e6bf46c9d..793882edea38 100644 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@ -34,10 +34,7 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatfor commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index 2ba24ada0d9c..52fe93a58be2 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -36,10 +36,7 @@ com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,s commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfile index 282575ad5667..933980dbc1a6 100644 --- a/solr/modules/cuvs/gradle.lockfile +++ b/solr/modules/cuvs/gradle.lockfile @@ -36,10 +36,7 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatfor commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 97d72a04dac9..d59161cf3509 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -37,10 +37,7 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatfor commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index 67e061b9f210..eb04f041e5d9 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -67,10 +67,7 @@ com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,s commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.grpc:grpc-alts:1.80.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index de3055b0b4b2..63071e565760 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -44,10 +44,7 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatfor commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.github.microutils:kotlin-logging-jvm:3.0.5=jarValidation,testRuntimeClasspath diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index a3a8216ae710..3514bb148bf5 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -34,10 +34,7 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatfor commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.azagniotov:language-detection:12.5.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfile index d2cdfd08dd84..fb79289383dd 100644 --- a/solr/modules/language-models/gradle.lockfile +++ b/solr/modules/language-models/gradle.lockfile @@ -49,10 +49,7 @@ dev.langchain4j:langchain4j-http-client:1.9.1=jarValidation,runtimeClasspath,run dev.langchain4j:langchain4j-hugging-face:1.9.1-beta17=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath dev.langchain4j:langchain4j-mistral-ai:1.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath dev.langchain4j:langchain4j-open-ai:1.9.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index a6d75e790465..44d8e58774ae 100644 --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@ -34,10 +34,7 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatfor commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index 43f05053b2c0..9c11765122b4 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -41,10 +41,7 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatfor commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.grpc:grpc-api:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index 42c7fd4b4bfb..3725a0dc9be5 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -47,10 +47,7 @@ com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,s commons-cli:commons-cli:1.11.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.micrometer:micrometer-commons:1.13.3=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index 094e8d94e4e6..889234e4e0fd 100644 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@ -34,10 +34,7 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatfor commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index 8a8b6c829558..3af24e910d8a 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -37,10 +37,7 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatfor commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index 7c9d3a8102f7..708f40862b34 100644 --- a/solr/server/gradle.lockfile +++ b/solr/server/gradle.lockfile @@ -33,7 +33,6 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,solrCore commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,solrCore commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,solrCore commons-io:commons-io:2.21.0=jarValidation,runtimeClasspath,solrCore -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,solrCore io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=jarValidation,runtimeClasspath,solrCore diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index d93c68891655..35a6de3f6353 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -34,10 +34,7 @@ com.tdunning:t-digest:3.3=testRuntimeClasspath commons-cli:commons-cli:1.11.0=testRuntimeClasspath commons-codec:commons-codec:1.21.0=testRuntimeClasspath commons-io:commons-io:2.21.0=testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=testCompileClasspath,testRuntimeClasspath @@ -179,4 +176,4 @@ org.semver4j:semver4j:6.0.0=testRuntimeClasspath org.slf4j:jcl-over-slf4j:2.0.17=testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.8=testRuntimeClasspath -empty=apiHelper,apiHelperTest,compileClasspath,compileClasspathCopy,compileOnlyHelper,compileOnlyHelperTest,jarValidation,localPlaybook,missingdoclet,officialPlaybook,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,refGuide,runtimeClasspath,runtimeClasspathCopy,testCompileClasspathCopy,testRuntimeClasspathCopy +empty=apiHelper,apiHelperTest,compileClasspath,compileOnlyHelper,compileOnlyHelperTest,jarValidation,localPlaybook,missingdoclet,officialPlaybook,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,refGuide,runtimeClasspath diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc index 994d521a2105..e9f0a7d29083 100644 --- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc +++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc @@ -360,6 +360,10 @@ Users who consume Solr metrics via OTLP and rely on the 10.0 underscore-format n The metric `solr_core_indexsearcher_open_warmup_time` has been removed as it duplicated `solr_core_indexsearcher_warmup_time`. Update your dashboards to use `solr_core_indexsearcher_warmup_time` instead. +==== Overseer Status Metrics Removed + +The `OVERSEERSTATUS` Collection API response no longer includes per-operation timing metrics but per-operation `requests` and `errors` counts still exist. Users needing per-operation latency can use distributed tracing as a substitute via OpenTelemetry. + === Lucene Codec Change Solr 10.1 upgrades the underlying Lucene library from 10.3 to 10.4, which introduces a new index codec (`Lucene104`). diff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfile index 8f531bef3f88..ee611917aaec 100644 --- a/solr/solrj-jetty/gradle.lockfile +++ b/solr/solrj-jetty/gradle.lockfile @@ -34,10 +34,7 @@ com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index ff6daf80a0ae..e0b32df6d924 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -34,10 +34,7 @@ com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java index 53f293cc5a01..caad026da658 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java @@ -84,7 +84,6 @@ public static void setupCluster() throws Exception { System.setProperty("solr.tests.numeric.dv", "true"); configureCluster(NUM_COLLECTIONS) - .withMetrics(false) .addConfig( "conf", getFile("solrj") diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index d3f14e0c61f4..f0f9c46d494c 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -1,17 +1,17 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.carrotsearch:hppc:0.10.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.core:jackson-core:2.21.2=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.core:jackson-databind:2.21.2=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.21.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath,testRuntimeClasspathCopy +com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4=jarValidation,testCompileClasspath,testRuntimeClasspath +com.carrotsearch:hppc:0.10.0=jarValidation,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.2=jarValidation,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.21.2=jarValidation,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.21.2=jarValidation,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=jarValidation,testRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=jarValidation,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspath +com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyHelper com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor @@ -19,169 +19,166 @@ com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorpro com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.18.0=apiHelper -com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.guava:failureaccess:1.0.1=apiHelper -com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,compileClasspathCopy,errorprone,jarValidation,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +com.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.0-jre=apiHelper -com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,compileClasspathCopy,errorprone,jarValidation,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,compileClasspathCopy,errorprone,jarValidation,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +com.google.guava:guava:33.5.0-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=apiHelper -com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,compileClasspathCopy,errorprone,jarValidation,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor -com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy +com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath +com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath +com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath +commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath +commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath commons-io:commons-io:2.17.0=apiHelper -commons-io:commons-io:2.21.0=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy +commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.1.119.Final=apiHelper -io.netty:netty-buffer:4.2.12.Final=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.netty:netty-codec-base:4.2.12.Final=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-base:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec:4.1.119.Final=apiHelper io.netty:netty-common:4.1.119.Final=apiHelper -io.netty:netty-common:4.2.12.Final=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +io.netty:netty-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler:4.1.119.Final=apiHelper -io.netty:netty-handler:4.2.12.Final=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +io.netty:netty-handler:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.119.Final=apiHelper -io.netty:netty-resolver:4.2.12.Final=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +io.netty:netty-resolver:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.70.Final=apiHelper -io.netty:netty-tcnative-boringssl-static:2.0.75.Final=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +io.netty:netty-tcnative-boringssl-static:2.0.75.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-classes:2.0.70.Final=apiHelper -io.netty:netty-tcnative-classes:2.0.75.Final=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +io.netty:netty-tcnative-classes:2.0.75.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.119.Final=apiHelper -io.netty:netty-transport-classes-epoll:4.2.12.Final=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +io.netty:netty-transport-classes-epoll:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.119.Final=apiHelper -io.netty:netty-transport-native-epoll:4.2.12.Final=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +io.netty:netty-transport-native-epoll:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.119.Final=apiHelper -io.netty:netty-transport-native-unix-common:4.2.12.Final=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +io.netty:netty-transport-native-unix-common:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.119.Final=apiHelper -io.netty:netty-transport:4.2.12.Final=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.22.0-alpha=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.22.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.22.0-alpha=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.22.0-alpha=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry.semconv:opentelemetry-semconv:1.37.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-api-incubator:1.56.0-alpha=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-api:1.56.0=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-common:1.56.0=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-context:1.56.0=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-exporter-prometheus:1.56.0-alpha=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.activation:jakarta.activation-api:2.1.3=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.annotation:jakarta.annotation-api:3.0.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeClasspathCopy -jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy +io.netty:netty-transport:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.22.0-alpha=jarValidation,testRuntimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.22.0=jarValidation,testRuntimeClasspath +io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.22.0-alpha=jarValidation,testRuntimeClasspath +io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.22.0-alpha=jarValidation,testRuntimeClasspath +io.opentelemetry.semconv:opentelemetry-semconv:1.37.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-api-incubator:1.56.0-alpha=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.56.0=jarValidation,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-common:1.56.0=jarValidation,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.56.0=jarValidation,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-prometheus:1.56.0-alpha=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,testRuntimeClasspath +io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,testRuntimeClasspath +io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath +io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.activation:jakarta.activation-api:2.1.3=jarValidation,testRuntimeClasspath +jakarta.annotation:jakarta.annotation-api:3.0.0=jarValidation,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,testRuntimeClasspath +jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspath +jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath +jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor -junit:junit:4.13.2=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.commons:commons-lang3:3.20.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-analysis-common:10.4.0=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-analysis-kuromoji:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-analysis-nori:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-analysis-phonetic:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-backward-codecs:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-classification:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-codecs:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-core:10.4.0=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-expressions:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-facet:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-grouping:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-highlighter:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-join:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-memory:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-misc:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-queries:10.4.0=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-queryparser:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-sandbox:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-spatial-extras:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-spatial3d:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-suggest:10.4.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-test-framework:10.4.0=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.zookeeper:zookeeper-jute:3.9.4=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.zookeeper:zookeeper:3.9.4=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy +junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.13.2=jarValidation,testRuntimeClasspath +org.apache.commons:commons-exec:1.6.0=jarValidation,testRuntimeClasspath +org.apache.commons:commons-lang3:3.20.0=jarValidation,testRuntimeClasspath +org.apache.commons:commons-math3:3.6.1=jarValidation,testRuntimeClasspath +org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.curator:curator-test:5.9.0=jarValidation,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=jarValidation,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=jarValidation,testRuntimeClasspath +org.apache.httpcomponents:httpmime:4.5.14=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.3=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.3=jarValidation,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-analysis-common:10.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-analysis-kuromoji:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-analysis-nori:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-analysis-phonetic:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-backward-codecs:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-classification:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-codecs:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-core:10.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-expressions:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-facet:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-grouping:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-highlighter:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-join:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-memory:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-misc:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-queries:10.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-queryparser:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-sandbox:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-spatial-extras:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-spatial3d:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-suggest:10.4.0=jarValidation,testRuntimeClasspath +org.apache.lucene:lucene-test-framework:10.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath +org.apache.zookeeper:zookeeper-jute:3.9.4=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.zookeeper:zookeeper:3.9.4=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.33.0=apiHelper -org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-client:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-http:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-io:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.core:jersey-common:4.0.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.core:jersey-server:4.0.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.ext:jersey-entity-filtering:4.0.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.inject:jersey-hk2:4.0.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,compileClasspathCopy,errorprone,jarValidation,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy +org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.0.34=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,testRuntimeClasspath +org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,testRuntimeClasspath +org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,testRuntimeClasspath +org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,testRuntimeClasspath +org.glassfish.jersey.core:jersey-common:4.0.2=jarValidation,testRuntimeClasspath +org.glassfish.jersey.core:jersey-server:4.0.2=jarValidation,testRuntimeClasspath +org.glassfish.jersey.ext:jersey-entity-filtering:4.0.2=jarValidation,testRuntimeClasspath +org.glassfish.jersey.inject:jersey-hk2:4.0.2=jarValidation,testRuntimeClasspath +org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=jarValidation,testRuntimeClasspath +org.glassfish.jersey:jersey-bom:4.0.2=jarValidation,testRuntimeClasspath +org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath +org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +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.14.0=compileOnlyHelper -org.junit:junit-bom:5.6.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.locationtech.spatial4j:spatial4j:0.8=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.ow2.asm:asm-commons:9.8=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy -org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy +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.8=jarValidation,testRuntimeClasspath +org.ow2.asm:asm-tree:9.8=jarValidation,testRuntimeClasspath +org.ow2.asm:asm:9.8=jarValidation,testRuntimeClasspath org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor -org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.semver4j:semver4j:6.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:2.0.17=jarValidation,runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.13=apiHelper -org.slf4j:slf4j-api:2.0.17=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:slf4j-api:2.0.17=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.xerial.snappy:snappy-java:1.1.10.8=jarValidation,testRuntimeClasspath empty=apiHelperTest,compileOnlyHelperTest,missingdoclet,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,signatures diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 180be6254699..449d53a460d7 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -17,19 +17,13 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,compileOnlyHelp com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=spotless865458226 com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.18.0=spotless865458226 com.google.errorprone:error_prone_annotations:2.41.0=jarValidation,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.googlejavaformat:google-java-format:1.18.1=spotless865458226 com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.guava:failureaccess:1.0.1=spotless865458226 com.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava-parent:32.1.1-jre=spotless865458226 -com.google.guava:guava:32.1.1-jre=spotless865458226 com.google.guava:guava:33.5.0-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath @@ -40,10 +34,7 @@ com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath -io.dropwizard.metrics:metrics-annotation:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=jarValidation,testRuntimeClasspath -io.dropwizard.metrics:metrics-jetty12:4.2.33=jarValidation,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=jarValidation,testCompileClasspath,testRuntimeClasspath @@ -124,7 +115,6 @@ org.apache.lucene:lucene-test-framework:10.4.0=jarValidation,testCompileClasspat org.apache.zookeeper:zookeeper-jute:3.9.4=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=jarValidation,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath -org.checkerframework:checker-qual:3.33.0=spotless865458226 org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle index 345b62785807..c116e384469c 100644 --- a/solr/test-framework/build.gradle +++ b/solr/test-framework/build.gradle @@ -53,7 +53,6 @@ dependencies { 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) @@ -64,8 +63,6 @@ dependencies { implementation libs.slf4j.api implementation libs.apache.log4j.api implementation libs.apache.log4j.core - implementation libs.dropwizard.metrics.core - implementation libs.dropwizard.metrics.jetty12.ee10 implementation libs.commonscli.commonscli implementation libs.apache.httpcomponents.httpclient implementation libs.apache.httpcomponents.httpcore diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index 2c18a8ac03cc..e55bbe89b7fb 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -1,173 +1,170 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,compileClasspathCopy,testCompileClasspath,testCompileClasspathCopy -com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.carrotsearch:hppc:0.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.core:jackson-annotations:2.21=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.core:jackson-core:2.21.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.core:jackson-databind:2.21.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.21.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testRuntimeClasspath,testRuntimeClasspathCopy +biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,testCompileClasspath +com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.carrotsearch:hppc:0.10.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.21=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.21.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.21.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.21.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.21.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.github.ben-manes.caffeine:caffeine:3.2.3=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyHelper com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +com.google.errorprone:error_prone_annotations:2.41.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.43.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,compileClasspathCopy,errorprone,jarValidation,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,compileClasspathCopy,errorprone,jarValidation,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,compileClasspathCopy,errorprone,jarValidation,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,compileClasspathCopy,errorprone,jarValidation,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +com.google.guava:failureaccess:1.0.3=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.5.0-jre=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.25.8=annotationProcessor,errorprone,testAnnotationProcessor -com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -commons-cli:commons-cli:1.11.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -commons-codec:commons-codec:1.21.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -commons-io:commons-io:2.21.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.dropwizard.metrics:metrics-annotation:4.2.33=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.dropwizard.metrics:metrics-core:4.2.33=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.dropwizard.metrics:metrics-jetty12-ee10:4.2.33=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.dropwizard.metrics:metrics-jetty12:4.2.33=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +commons-cli:commons-cli:1.11.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:3.2.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor -io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.netty:netty-codec-base:4.2.12.Final=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.netty:netty-common:4.2.12.Final=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.netty:netty-handler:4.2.12.Final=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.netty:netty-resolver:4.2.12.Final=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.netty:netty-tcnative-boringssl-static:2.0.75.Final=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.netty:netty-tcnative-classes:2.0.75.Final=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.netty:netty-transport-classes-epoll:4.2.12.Final=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.netty:netty-transport-native-epoll:4.2.12.Final=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.netty:netty-transport-native-unix-common:4.2.12.Final=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.netty:netty-transport:4.2.12.Final=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.22.0-alpha=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.22.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.22.0-alpha=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.22.0-alpha=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry.semconv:opentelemetry-semconv:1.37.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-api-incubator:1.56.0-alpha=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-api:1.56.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-common:1.56.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-context:1.56.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-exporter-prometheus:1.56.0-alpha=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-sdk-common:1.56.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-sdk-trace:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.opentelemetry:opentelemetry-sdk:1.56.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.prometheus:prometheus-metrics-model:1.1.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.activation:jakarta.activation-api:2.1.3=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.annotation:jakarta.annotation-api:3.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.validation:jakarta.validation-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-base:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-tcnative-boringssl-static:2.0.75.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.75.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-epoll:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.22.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.22.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.22.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.22.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry.semconv:opentelemetry-semconv:1.37.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-api-incubator:1.56.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.56.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-common:1.56.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.56.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-prometheus:1.56.0-alpha=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.56.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.56.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk:1.56.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.prometheus:prometheus-metrics-model:1.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.activation:jakarta.activation-api:2.1.3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +jakarta.annotation:jakarta.annotation-api:3.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.validation:jakarta.validation-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor -junit:junit:4.13.2=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.antlr:antlr4-runtime:4.13.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.commons:commons-exec:1.6.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.commons:commons-lang3:3.20.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.curator:curator-test:5.9.0=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.httpcomponents:httpmime:4.5.14=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.logging.log4j:log4j-api:2.25.3=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.logging.log4j:log4j-core:2.25.3=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-analysis-common:10.4.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-analysis-kuromoji:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-analysis-nori:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-analysis-phonetic:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-backward-codecs:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-classification:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-codecs:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-core:10.4.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-expressions:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-facet:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-grouping:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-highlighter:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-join:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-memory:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-misc:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-queries:10.4.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-queryparser:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-sandbox:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-spatial-extras:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-spatial3d:10.4.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-suggest:10.4.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.lucene:lucene-test-framework:10.4.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.zookeeper:zookeeper-jute:3.9.4=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.zookeeper:zookeeper:3.9.4=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apiguardian:apiguardian-api:1.1.2=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.http2:jetty-http2-client:12.0.34=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.http2:jetty-http2-common:12.0.34=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty.http2:jetty-http2-server:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-alpn-client:12.0.34=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-alpn-java-client:12.0.34=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-alpn-server:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-client:12.0.34=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-http:12.0.34=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-io:12.0.34=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-rewrite:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-security:12.0.34=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-server:12.0.34=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-session:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.eclipse.jetty:jetty-util:12.0.34=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.hk2:hk2-api:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.hk2:hk2-locator:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.hk2:hk2-utils:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.hk2:osgi-resource-locator:3.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.core:jersey-client:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.core:jersey-common:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.core:jersey-server:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.ext:jersey-entity-filtering:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.inject:jersey-hk2:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.hamcrest:hamcrest:3.0=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jspecify:jspecify:1.0.0=annotationProcessor,apiHelper,compileClasspath,compileClasspathCopy,errorprone,jarValidation,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.junit.jupiter:junit-jupiter-api:5.6.2=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.junit.platform:junit-platform-commons:1.6.2=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +junit:junit:4.13.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.13.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.commons:commons-exec:1.6.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.20.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.commons:commons-math3:3.6.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.curator:curator-client:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.curator:curator-framework:5.9.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.curator:curator-test:5.9.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,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 +org.apache.logging.log4j:log4j-api:2.25.3=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.25.3=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-analysis-common:10.4.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-analysis-kuromoji:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-analysis-nori:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-analysis-phonetic:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-backward-codecs:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-classification:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-codecs:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-core:10.4.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-expressions:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-facet:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-grouping:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-highlighter:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-join:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-memory:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-misc:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-queries:10.4.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-queryparser:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-sandbox:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-spatial-extras:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-spatial3d:10.4.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-suggest:10.4.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-test-framework:10.4.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.zookeeper:zookeeper-jute:3.9.4=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.zookeeper:zookeeper:3.9.4=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-client:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-common:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:jetty-http2-server:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:12.0.34=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-client:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-rewrite:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2:hk2-api:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2:hk2-locator:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2:hk2-utils:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.hk2:osgi-resource-locator:3.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.jersey.core:jersey-client:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.jersey.core:jersey-common:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.jersey.core:jersey-server:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.jersey.ext:jersey-entity-filtering:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.jersey.inject:jersey-hk2:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.glassfish.jersey:jersey-bom:4.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +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,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +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.14.0=compileOnlyHelper -org.junit:junit-bom:5.6.2=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.locationtech.spatial4j:spatial4j:0.8=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.opentest4j:opentest4j:1.2.0=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,compileClasspathCopy,testCompileClasspath,testCompileClasspathCopy -org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,compileClasspathCopy,testCompileClasspath,testCompileClasspathCopy -org.osgi:org.osgi.resource:1.0.0=compileClasspath,compileClasspathCopy,testCompileClasspath,testCompileClasspathCopy -org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,compileClasspathCopy,testCompileClasspath,testCompileClasspathCopy -org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +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.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath +org.osgi:org.osgi.resource:1.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,testCompileClasspath +org.ow2.asm:asm-commons:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-tree:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.ow2.asm:asm:9.8=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor -org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:slf4j-api:2.0.17=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.xerial.snappy:snappy-java:1.1.10.8=apiHelper,compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.semver4j:semver4j:6.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:2.0.17=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.xerial.snappy:snappy-java:1.1.10.8=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=apiHelperTest,compileOnlyHelperTest,missingdoclet,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUsedUndeclared,signatures diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java index 62470e6913d3..ae9a8fe87f6b 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java @@ -16,8 +16,6 @@ */ package org.apache.solr.cloud; -import com.codahale.metrics.MetricRegistry; -import io.dropwizard.metrics.jetty12.ee10.InstrumentedEE10Handler; import jakarta.servlet.Filter; import java.io.IOException; import java.io.PrintStream; @@ -84,7 +82,6 @@ import org.apache.solr.util.tracing.TraceUtils; import org.apache.zookeeper.KeeperException; import org.eclipse.jetty.ee10.servlet.ServletHolder; -import org.eclipse.jetty.server.Handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -158,7 +155,6 @@ public class MiniSolrCloudCluster implements SolrBackend { private CloudSolrClient solrClient; private final JettyConfig jettyConfig; private final String solrXml; - private final boolean trackJettyMetrics; private final AtomicInteger nodeIds = new AtomicInteger(); private final Map solrClientByCollection = new ConcurrentHashMap<>(); @@ -233,47 +229,11 @@ public MiniSolrCloudCluster( Optional securityJson, boolean formatZkServer) throws Exception { - this( - numServers, - baseDir, - solrXml, - jettyConfig, - zkTestServer, - securityJson, - false, - formatZkServer); - } - - /** - * Create a MiniSolrCloudCluster. Note - this constructor visibility is changed to package - * protected to discourage its usage. Ideally *new* functionality should use {@linkplain - * SolrCloudTestCase} to configure any additional parameters. - * - * @param numServers number of Solr servers to start - * @param baseDir base directory that the mini cluster should be run from - * @param solrXml solr.xml file to be uploaded to ZooKeeper - * @param jettyConfig Jetty configuration - * @param zkTestServer ZkTestServer to use. If null, one will be created - * @param securityJson A string representation of security.json file (optional). - * @param trackJettyMetrics supply jetties with metrics registry - * @throws Exception if there was an error starting the cluster - */ - MiniSolrCloudCluster( - int numServers, - Path baseDir, - String solrXml, - JettyConfig jettyConfig, - ZkTestServer zkTestServer, - Optional securityJson, - boolean trackJettyMetrics, - boolean formatZkServer) - throws Exception { Objects.requireNonNull(securityJson); this.baseDir = Objects.requireNonNull(baseDir); this.jettyConfig = Objects.requireNonNull(jettyConfig); this.solrXml = solrXml == null ? DEFAULT_CLOUD_SOLR_XML : solrXml; - this.trackJettyMetrics = trackJettyMetrics; log.info("Starting cluster of {} servers in {}", numServers, baseDir); @@ -490,10 +450,7 @@ public JettySolrRunner startJettySolrRunner(String name, JettyConfig config, Str } Files.write(runnerPath.resolve("solr.xml"), solrXml.getBytes(StandardCharsets.UTF_8)); JettyConfig newConfig = JettyConfig.builder(config).build(); - JettySolrRunner jetty = - !trackJettyMetrics - ? new JettySolrRunner(runnerPath.toString(), nodeProps, newConfig) - : new JettySolrRunnerWithMetrics(runnerPath.toString(), nodeProps, newConfig); + JettySolrRunner jetty = new JettySolrRunner(runnerPath.toString(), nodeProps, newConfig); jetty.start(); jettys.add(jetty); synchronized (startupWait) { @@ -963,25 +920,6 @@ public void dumpCoreInfo(PrintStream out) { } } - /** - * @lucene.experimental - */ - public static final class JettySolrRunnerWithMetrics extends JettySolrRunner { - public JettySolrRunnerWithMetrics(String solrHome, Properties nodeProps, JettyConfig config) { - super(solrHome, nodeProps, config); - } - - private volatile MetricRegistry metricRegistry; - - @Override - protected Handler.Wrapper injectJettyHandlers(Handler.Wrapper chain) { - metricRegistry = new MetricRegistry(); - InstrumentedEE10Handler metrics = new InstrumentedEE10Handler(metricRegistry); - metrics.setHandler(chain); - return metrics; - } - } - private static class Config { final String name; final Path path; @@ -1004,7 +942,6 @@ public static class Builder { private List configs = new ArrayList<>(); private Map clusterProperties = new HashMap<>(); - private boolean trackJettyMetrics; private boolean overseerEnabled = EnvUtils.getPropertyAsBool("solr.cloud.overseer.enabled", true); private boolean formatZkServer = true; @@ -1117,11 +1054,6 @@ public Builder withProperty(String propertyName, String propertyValue) { return this; } - public Builder withMetrics(boolean trackJettyMetrics) { - this.trackJettyMetrics = trackJettyMetrics; - return this; - } - public Builder formatZkServer(boolean formatZkServer) { this.formatZkServer = formatZkServer; return this; @@ -1152,14 +1084,7 @@ public MiniSolrCloudCluster build() throws Exception { JettyConfig jettyConfig = jettyConfigBuilder.build(); MiniSolrCloudCluster cluster = new MiniSolrCloudCluster( - nodeCount, - baseDir, - solrXml, - jettyConfig, - null, - securityJson, - trackJettyMetrics, - formatZkServer); + nodeCount, baseDir, solrXml, jettyConfig, null, securityJson, formatZkServer); for (Config config : configs) { cluster.uploadConfigSet(config.path, config.name); } diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index 0d546bce8746..d0eab79b171a 100644 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@ -33,7 +33,6 @@ com.tdunning:t-digest:3.3=solrCore commons-cli:commons-cli:1.11.0=solrCore commons-codec:commons-codec:1.21.0=solrCore commons-io:commons-io:2.21.0=solrCore -io.dropwizard.metrics:metrics-core:4.2.33=solrCore io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor io.netty:netty-buffer:4.2.12.Final=solrCore