This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new af89e0379f3 SOLR-18302: dependency-analysis (DAGP) — reporting + build
hygiene (#4612)
af89e0379f3 is described below
commit af89e0379f3e499a46a88b7c7483aa5c0ea6e474
Author: Serhiy Bzhezytskyy <[email protected]>
AuthorDate: Sat Jul 11 04:13:16 2026 +0300
SOLR-18302: dependency-analysis (DAGP) — reporting + build hygiene (#4612)
Adds the Dependency Analysis Gradle Plugin (com.autonomousapps
build-health) as an opt-in `analyzeDependencies` task — it reports
advice, doesn't fail the build, since api-vs-implementation calls need
human judgement rather than blanket enforcement.
- Remove redundant project() declarations that solr-core already
provides via api (24 across 17 modules) — cutterslade-era
"state the obvious" leftovers.
- Force kotlin-metadata-jvm to Solr's Kotlin so DAGP can analyze
:solr:ui (autonomousapps/dependency-analysis-gradle-plugin#1661;
temporary).
- Ensure lockfile doesn't have spotless or DAGP related special
configurations.
Co-authored-by: David Smiley <[email protected]>
---
build.gradle | 1 +
changelog/unreleased/dagp-SOLR-18302.yml | 11 ++++
dev-docs/gradle-help/dependencies.txt | 31 ++++++-----
gradle/libs.versions.toml | 1 +
gradle/validation/dependencies.gradle | 10 +++-
gradle/validation/dependency-analyze.gradle.kts | 72 +++++++++++++++++++++++++
settings.gradle | 15 ++++++
solr/api/build.gradle | 1 -
solr/benchmark/build.gradle | 6 ++-
solr/benchmark/gradle.lockfile | 8 +--
solr/core/build.gradle | 6 +--
solr/cross-dc-manager/build.gradle | 5 +-
solr/modules/analysis-extras/build.gradle | 2 -
solr/modules/clustering/build.gradle | 1 -
solr/modules/cross-dc/build.gradle | 9 ----
solr/modules/cross-dc/gradle.lockfile | 14 ++---
solr/modules/cuvs/build.gradle | 1 -
solr/modules/extraction/build.gradle | 1 -
solr/modules/gcs-repository/build.gradle | 1 -
solr/modules/jwt-auth/build.gradle | 1 -
solr/modules/langid/build.gradle | 1 -
solr/modules/language-models/build.gradle | 1 -
solr/modules/ltr/build.gradle | 1 -
solr/modules/opentelemetry/build.gradle | 2 +-
solr/modules/s3-repository/build.gradle | 1 -
solr/modules/scripting/build.gradle | 1 -
solr/modules/sql/build.gradle | 4 +-
solr/solrj-jetty/build.gradle | 3 --
solr/solrj-streaming/build.gradle | 3 --
solr/solrj-zookeeper/build.gradle | 3 --
solr/solrj/build.gradle | 2 -
solr/solrj/gradle.lockfile | 7 ---
solr/test-framework/build.gradle | 5 +-
solr/ui/build.gradle.kts | 8 +--
solr/ui/gradle.lockfile | 22 +++-----
35 files changed, 155 insertions(+), 106 deletions(-)
diff --git a/build.gradle b/build.gradle
index b82fdbbdcad..dd939aac66a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -171,6 +171,7 @@ apply from: file('gradle/validation/git-status.gradle')
apply from: file('gradle/validation/validate-source-patterns.gradle')
apply from: file('gradle/validation/rat-sources.gradle')
apply from: file('gradle/validation/owasp-dependency-check.gradle')
+apply from: file('gradle/validation/dependency-analyze.gradle.kts')
apply from: file('gradle/validation/ecj-lint.gradle')
apply from: file('gradle/validation/gradlew-scripts-tweaked.gradle')
apply from: file('gradle/validation/validate-log-calls.gradle')
diff --git a/changelog/unreleased/dagp-SOLR-18302.yml
b/changelog/unreleased/dagp-SOLR-18302.yml
new file mode 100644
index 00000000000..f1ca75ba03f
--- /dev/null
+++ b/changelog/unreleased/dagp-SOLR-18302.yml
@@ -0,0 +1,11 @@
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+
+title: >
+ Add dependency-analysis (build-health) reporting to the Gradle build in
report-not-fail mode,
+ and apply its safe advice (unused-dependency removals and test-scope
corrections)
+type: other
+authors:
+ - name: Serhiy Bzhezytskyy
+links:
+ - name: SOLR-18302
+ url: https://issues.apache.org/jira/browse/SOLR-18302
diff --git a/dev-docs/gradle-help/dependencies.txt
b/dev-docs/gradle-help/dependencies.txt
index 85742bd686e..4ba74db5720 100644
--- a/dev-docs/gradle-help/dependencies.txt
+++ b/dev-docs/gradle-help/dependencies.txt
@@ -259,27 +259,32 @@ in Maven Central, or in the artifact downloaded by maven
when the library
is added as a dependency (in IntelliJ IDEA the libraries can be found
in the project view under External Libraries at the bottom).
-Gradle analyzeDependencies and analyzeTestDependencies
------------------------------------------
+Analyzing dependencies (dependency-analysis / build-health)
+-------------------------------------------------------------
+
+We use the "com.autonomousapps.dependency-analysis" build plugin (aka "DAGP" or
+"build-health") to help maintain good dependency hygiene. It identifies things
like
+unused dependency declarations, transitive dependencies that are used directly
and
+should be declared, and dependencies declared in the wrong configuration (e.g.
+"implementation" instead of "api").
+
+Run it explicitly with:
+
+ gradlew analyzeDependencies
-We use the "cutterslade.analyze" build plugin to help maintain good dependency
hygiene.
-It tries to identify when a dependency is needlessly declared, and then fail
the build to complain.
-Unfortunately, it also requires us to add declarations that Gradle would
otherwise deem unnecessary,
- since the plugin isn't aware of the semantics of "api" scope.
+This prints a per-project report of current advice; nothing fails.
-Since the plugin is imperfect, there are rare scenarios where we need to use
one of its many special
- gradle configurations, such as permitUnusedDeclared and
permitTestUnusedDeclared.
-Please avoid them by finding alternatives (if possible) -- get peer review.
+Since the plugin is imperfect, some projects/issue-types are suppressed.
Matters of "api" versus
+"implementation" are subjective. Please avoid adding new suppressions where
possible -- get peer review first.
For example, did you declare something as implementation (or
testImplementation) but it's not needed at compile time?
Remove it.
If it's needed at runtime, then add as runtimeOnly (or testRuntimeOnly), *if*
it otherwise
doesn't come transitively as such.
-Let passing tests be your guide.
-Try to be minimalist, omitting dependency declarations unless a failing build
requires that you add them.
-At each iteration of experimentation doing any dependency change in a build,
write the gradle dependency locks.
+If you are iterating / experimentation on dependency changes, regenerate the
gradle lockfiles
+after each change to avoid errors.
*Then* run checks or otherwise evaluate the results.
A failure due to dependency locks is generally a failure to remember to write
locks; it usually doesn't mean your build edits are flawed.
-For more info:
https://github.com/gradle-dependency-analyze/gradle-dependency-analyze
+For more info:
https://github.com/autonomousapps/dependency-analysis-gradle-plugin
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 453e53f24c2..ad0aa4db610 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -490,6 +490,7 @@ opentelemetry-exporter-prometheus = { module =
"io.opentelemetry:opentelemetry-e
opentelemetry-runtime-telemetry = { module =
"io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17",
version.ref = "opentelemetry-runtime-telemetry" }
opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk",
version.ref = "opentelemetry" }
opentelemetry-sdk-extension-autoconfigure = { module =
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref =
"opentelemetry" }
+opentelemetry-sdk-extension-autoconfigure-spi = { module =
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", version.ref =
"opentelemetry" }
opentelemetry-sdk-metrics = { module =
"io.opentelemetry:opentelemetry-sdk-metrics", version.ref = "opentelemetry" }
opentelemetry-sdk-testing = { module =
"io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" }
opentelemetry-sdk-trace = { module =
"io.opentelemetry:opentelemetry-sdk-trace", version.ref = "opentelemetry" }
diff --git a/gradle/validation/dependencies.gradle
b/gradle/validation/dependencies.gradle
index 73767e4ad95..d0df3444bd9 100644
--- a/gradle/validation/dependencies.gradle
+++ b/gradle/validation/dependencies.gradle
@@ -112,8 +112,14 @@ allprojects {
// Resolve and update locks only if --write-locks explicitly included
// This may not be the case where this task is added as a dependency,
like for "dependencies" task
project.configurations.findAll {
- // Add any custom filtering on the configurations to be resolved
- it.canBeResolved
+ // Add any custom filtering on the configurations to be resolved.
+ // Skip the dependency-analysis plugin's synthetic configurations
(marked with "dagp.*"
+ // attributes); they are not meant to be resolved and would fail
lock-file generation.
+ // Skip spotless's own tool-resolution configurations; their
formatter dependencies
+ // don't belong in the project's dependency lock files.
+ it.canBeResolved &&
+ !it.attributes.keySet().any {attr ->
attr.name.startsWith("dagp.")} &&
+ !it.name.startsWith("spotless")
}.each {it.resolve()}
}
}
diff --git a/gradle/validation/dependency-analyze.gradle.kts
b/gradle/validation/dependency-analyze.gradle.kts
new file mode 100644
index 00000000000..b7fc7489481
--- /dev/null
+++ b/gradle/validation/dependency-analyze.gradle.kts
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.autonomousapps.DependencyAnalysisExtension
+
+// See dev-docs/gradle-help/dependencies.txt
+
+// Opt-in only: not wired into "check", since the advice needs human judgment
+tasks.register("analyzeDependencies") {
+ group = "verification"
+ description =
+ "Reports dependency-analysis (DAGP) advice:
unused/undeclared/misconfigured dependencies."
+ dependsOn(tasks.named("buildHealth")) // non-obvious name
+}
+
+configure<DependencyAnalysisExtension> {
+ issues {
+ project(":solr:ui") {
+ onUnusedDependencies {
+ severity("ignore")
+ }
+ onUsedTransitiveDependencies {
+ severity("ignore")
+ }
+ onIncorrectConfiguration {
+ severity("ignore")
+ }
+ }
+
+ project(":solr:solrj-jetty") {
+ onUnusedDependencies {
+ exclude(":solr:solrj")
+ }
+ }
+
+ project(":solr:modules:jwt-auth") {
+ onDuplicateClassWarnings {
+ severity("ignore")
+ }
+ }
+
+ all {
+ // Report advice as warnings rather than failing the build: several
categories
+ // (api-vs-implementation promotions, some test-scope changes) need
case-by-case
+ // human judgment.
+ onAny {
+ severity("warn")
+ }
+ onUnusedDependencies {
+ exclude(
+ "org.jspecify:jspecify",
+ "com.google.code.findbugs:jsr305",
+ "com.google.errorprone:error_prone_annotations",
+ )
+ }
+ }
+ }
+}
diff --git a/settings.gradle b/settings.gradle
index 782edec4325..76938b2e2cd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -24,9 +24,24 @@ pluginManagement {
includeBuild("build-tools/build-infra")
}
+// The dependency-analysis plugin (build-health) bundles a kotlin-metadata-jvm
that can't yet parse
+// Kotlin 2.4.0 metadata, so it fails ExplodeJarTask on the :solr:ui
(Compose/KMP) module
+// ("Provided Metadata instance has version 2.4.0, while maximum supported
version is 2.3.0").
+// Tracked upstream in autonomousapps/dependency-analysis-gradle-plugin#1661;
until that ships,
+// force the metadata library to match Solr's Kotlin version so DAGP can
analyze the UI module.
+buildscript {
+ configurations.classpath {
+ resolutionStrategy {
+ force "org.jetbrains.kotlin:kotlin-metadata-jvm:2.4.0"
+ }
+ }
+}
+
plugins {
id 'com.gradle.develocity' version '4.2.2'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.4.0'
+ id 'com.autonomousapps.build-health' version '3.16.0'
+ id 'org.jetbrains.kotlin.multiplatform' version '2.4.0' apply false
}
apply from: file('gradle/develocity.gradle')
diff --git a/solr/api/build.gradle b/solr/api/build.gradle
index 74393358374..fb42df27a30 100644
--- a/solr/api/build.gradle
+++ b/solr/api/build.gradle
@@ -71,7 +71,6 @@ dependencies {
implementation libs.semver4j.semver4j
testImplementation project(':solr:test-framework')
- testImplementation project(':solr:api')
testImplementation libs.junit.junit
testImplementation libs.hamcrest.hamcrest
testImplementation libs.apache.lucene.testframework
diff --git a/solr/benchmark/build.gradle b/solr/benchmark/build.gradle
index fab56a4c3f4..8f5fddea41f 100644
--- a/solr/benchmark/build.gradle
+++ b/solr/benchmark/build.gradle
@@ -43,9 +43,7 @@ task echoCp {
dependencies {
implementation project(':solr:test-framework')
implementation project(':solr:core')
- implementation project(':solr:solrj')
implementation project(':solr:solrj-jetty')
- implementation project(':solr:solrj-streaming')
implementation libs.apache.lucene.core
implementation libs.commonsio.commonsio
@@ -56,4 +54,8 @@ dependencies {
implementation libs.slf4j.api
runtimeOnly libs.lmax.disruptor
annotationProcessor libs.openjdk.jmh.generatorannprocess
+
+ testAnnotationProcessor libs.openjdk.jmh.generatorannprocess
+ testImplementation libs.carrotsearch.randomizedtesting.runner
+ testImplementation libs.junit.junit
}
diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile
index 070a606d39b..927e782a7b1 100644
--- a/solr/benchmark/gradle.lockfile
+++ b/solr/benchmark/gradle.lockfile
@@ -76,11 +76,11 @@
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntime
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
junit:junit:4.13.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.sf.jopt-simple:jopt-simple:5.0.4=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.sf.jopt-simple:jopt-simple:5.0.4=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.antlr:antlr4-runtime:4.13.2=jarValidation,runtimeClasspath,testRuntimeClasspath
org.apache.commons:commons-exec:1.6.0=jarValidation,runtimeClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.apache.commons:commons-math3:3.6.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.commons:commons-math3:3.6.1=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-client:5.9.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-framework:5.9.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.curator:curator-test:5.9.0=jarValidation,runtimeClasspath,testRuntimeClasspath
@@ -154,8 +154,8 @@
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,runtimeClasspath,testRun
org.junit.platform:junit-platform-commons:1.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath
org.junit:junit-bom:5.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath
org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.openjdk.jmh:jmh-core:1.37=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.openjdk.jmh:jmh-generator-annprocess:1.37=annotationProcessor
+org.openjdk.jmh:jmh-core:1.37=annotationProcessor,compileClasspath,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+org.openjdk.jmh:jmh-generator-annprocess:1.37=annotationProcessor,testAnnotationProcessor
org.opentest4j:opentest4j:1.2.0=jarValidation,runtimeClasspath,testRuntimeClasspath
org.ow2.asm:asm-commons:9.10.1=jarValidation,runtimeClasspath,testRuntimeClasspath
org.ow2.asm:asm-tree:9.10.1=jarValidation,runtimeClasspath,testRuntimeClasspath
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 503f5c1c459..4ba85d1d830 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -107,7 +107,6 @@ dependencies {
implementation libs.eclipse.jetty.client
implementation libs.eclipse.jetty.http
- implementation libs.eclipse.jetty.io
implementation libs.eclipse.jetty.util
// ZooKeeper
@@ -127,7 +126,6 @@ dependencies {
implementation(libs.apache.zookeeper.jute) {
exclude group: 'org.apache.yetus', module: 'audience-annotations'
}
- testImplementation variantOf(libs.apache.zookeeper.zookeeper) {classifier
'tests'}
// required for instantiating a Zookeeper server (for embedding ZK)
runtimeOnly libs.xerial.snappy.java
@@ -182,15 +180,13 @@ dependencies {
testRuntimeOnly project(':solr:modules:analysis-extras')
- testImplementation project(':solr:core')
testImplementation project(':solr:test-framework')
testImplementation libs.apache.lucene.testframework
+ testImplementation libs.eclipse.jetty.io
testImplementation libs.eclipse.jetty.server
testImplementation libs.eclipse.jetty.ee10.servlet
- testImplementation libs.eclipse.jetty.util
- testImplementation libs.jakarta.servlet.api
testImplementation libs.carrotsearch.randomizedtesting.runner
testImplementation libs.junit.junit
testImplementation libs.hamcrest.hamcrest
diff --git a/solr/cross-dc-manager/build.gradle
b/solr/cross-dc-manager/build.gradle
index 14ed70a5dbc..cb8b5389ff6 100644
--- a/solr/cross-dc-manager/build.gradle
+++ b/solr/cross-dc-manager/build.gradle
@@ -25,8 +25,6 @@ description = 'Cross-DC Manager'
dependencies {
implementation platform(project(':platform'))
implementation project(':solr:core')
- implementation project(':solr:solrj')
- implementation project(':solr:solrj-zookeeper')
implementation project(':solr:modules:cross-dc')
implementation project(':solr:modules:opentelemetry')
@@ -72,7 +70,8 @@ dependencies {
classifier = "test"
}
}
- testImplementation(libs.apache.kafka.clients) {
+ // EmbeddedKafkaCluster loads org.apache.kafka.test.TestCondition from this
at runtime
+ testRuntimeOnly(libs.apache.kafka.clients) {
artifact {
classifier = "test"
}
diff --git a/solr/modules/analysis-extras/build.gradle
b/solr/modules/analysis-extras/build.gradle
index 5b4d13a038f..9f022f842ad 100644
--- a/solr/modules/analysis-extras/build.gradle
+++ b/solr/modules/analysis-extras/build.gradle
@@ -22,8 +22,6 @@ description = 'Additional analysis components'
dependencies {
api project(':solr:core')
- implementation project(':solr:solrj')
-
implementation libs.ibm.icu.icu4j
implementation libs.apache.lucene.analysis.icu
runtimeOnly libs.apache.lucene.analysis.morfologik
diff --git a/solr/modules/clustering/build.gradle
b/solr/modules/clustering/build.gradle
index 49c07c93d04..a45a28a22c1 100644
--- a/solr/modules/clustering/build.gradle
+++ b/solr/modules/clustering/build.gradle
@@ -22,7 +22,6 @@ description = 'Search Results Clustering Integraton'
dependencies {
implementation platform(project(':platform'))
implementation project(':solr:core')
- implementation project(':solr:solrj')
implementation libs.apache.lucene.core
diff --git a/solr/modules/cross-dc/build.gradle
b/solr/modules/cross-dc/build.gradle
index 4d90227db79..d6e6873bfe6 100644
--- a/solr/modules/cross-dc/build.gradle
+++ b/solr/modules/cross-dc/build.gradle
@@ -30,9 +30,6 @@ ext {
dependencies {
implementation platform(project(':platform'))
api project(':solr:core')
- implementation project(':solr:solrj')
- implementation project(':solr:solrj-zookeeper')
- implementation project(':solr:solrj-jetty')
implementation libs.slf4j.api
implementation libs.apache.kafka.clients
@@ -56,12 +53,6 @@ dependencies {
})
testRuntimeOnly libs.bytebuddy
testRuntimeOnly libs.bytebuddy.agent
-
- testImplementation(libs.apache.kafka.clients) {
- artifact {
- classifier = "test"
- }
- }
}
// Make sure that the cloud-minimal.zip artifact is up-to-date with
cloud-minimal/conf
diff --git a/solr/modules/cross-dc/gradle.lockfile
b/solr/modules/cross-dc/gradle.lockfile
index c6d796ef192..f8658268a90 100644
--- a/solr/modules/cross-dc/gradle.lockfile
+++ b/solr/modules/cross-dc/gradle.lockfile
@@ -124,22 +124,22 @@
org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,run
org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/cuvs/build.gradle b/solr/modules/cuvs/build.gradle
index 624b2c94ae0..6dedc144706 100644
--- a/solr/modules/cuvs/build.gradle
+++ b/solr/modules/cuvs/build.gradle
@@ -26,7 +26,6 @@ dependencies {
implementation libs.cuvs.java
implementation libs.opentelemetry.api
implementation project(':solr:core')
- implementation project(':solr:solrj')
implementation libs.apache.lucene.core
implementation libs.slf4j.api
diff --git a/solr/modules/extraction/build.gradle
b/solr/modules/extraction/build.gradle
index 6276b145c37..2d8dc4d2d1f 100644
--- a/solr/modules/extraction/build.gradle
+++ b/solr/modules/extraction/build.gradle
@@ -28,7 +28,6 @@ ext {
dependencies {
implementation platform(project(':platform'))
implementation project(':solr:core')
- implementation project(':solr:solrj')
implementation libs.apache.lucene.core
implementation libs.slf4j.api
diff --git a/solr/modules/gcs-repository/build.gradle
b/solr/modules/gcs-repository/build.gradle
index 9e18c62fef6..573d4046649 100644
--- a/solr/modules/gcs-repository/build.gradle
+++ b/solr/modules/gcs-repository/build.gradle
@@ -29,7 +29,6 @@ ext {
dependencies {
implementation platform(project(':platform'))
api project(':solr:core')
- implementation project(':solr:solrj')
implementation libs.apache.lucene.core
implementation libs.slf4j.api
diff --git a/solr/modules/jwt-auth/build.gradle
b/solr/modules/jwt-auth/build.gradle
index bf19cf2016d..5d14768fd15 100644
--- a/solr/modules/jwt-auth/build.gradle
+++ b/solr/modules/jwt-auth/build.gradle
@@ -24,7 +24,6 @@ dependencies {
implementation platform(libs.fasterxml.jackson.bom)
implementation project(':solr:core')
- implementation project(':solr:solrj')
implementation project(':solr:solrj-jetty')
implementation libs.bc.jose4j
diff --git a/solr/modules/langid/build.gradle b/solr/modules/langid/build.gradle
index 0e43b420a35..0028ae32f7a 100644
--- a/solr/modules/langid/build.gradle
+++ b/solr/modules/langid/build.gradle
@@ -21,7 +21,6 @@ description = 'Language Identifier module for extracting
language from a documen
dependencies {
implementation project(':solr:core')
- implementation project(':solr:solrj')
implementation libs.azagniotov.langdetect
implementation libs.apache.opennlp.tools
diff --git a/solr/modules/language-models/build.gradle
b/solr/modules/language-models/build.gradle
index a4dc82fc15c..375a219f936 100644
--- a/solr/modules/language-models/build.gradle
+++ b/solr/modules/language-models/build.gradle
@@ -24,7 +24,6 @@ dependencies {
implementation platform(project(':platform'))
implementation platform(libs.langchain4j.bom)
implementation project(':solr:core')
- implementation project(':solr:solrj')
implementation libs.apache.lucene.core
diff --git a/solr/modules/ltr/build.gradle b/solr/modules/ltr/build.gradle
index 20582b1d06d..bcbd1077284 100644
--- a/solr/modules/ltr/build.gradle
+++ b/solr/modules/ltr/build.gradle
@@ -30,7 +30,6 @@ configurations {
dependencies {
implementation project(':solr:core')
- implementation project(':solr:solrj')
implementation libs.apache.lucene.core
diff --git a/solr/modules/opentelemetry/build.gradle
b/solr/modules/opentelemetry/build.gradle
index 9e0345ad2b5..b14d3868e41 100644
--- a/solr/modules/opentelemetry/build.gradle
+++ b/solr/modules/opentelemetry/build.gradle
@@ -22,7 +22,6 @@ description = 'Open Telemetry (OTEL) tracer and OTLP exporter'
dependencies {
implementation platform(project(':platform'))
implementation project(':solr:core')
- implementation project(':solr:solrj')
implementation platform(libs.netty.bom)
implementation platform(libs.opentelemetry.bom)
@@ -52,4 +51,5 @@ dependencies {
testImplementation libs.junit.junit
testImplementation libs.opentelemetry.sdk.trace
testImplementation libs.opentelemetry.sdk.testing
+ testImplementation libs.opentelemetry.sdk.extension.autoconfigure.spi
}
diff --git a/solr/modules/s3-repository/build.gradle
b/solr/modules/s3-repository/build.gradle
index 039c3acd4d8..da302c354d2 100644
--- a/solr/modules/s3-repository/build.gradle
+++ b/solr/modules/s3-repository/build.gradle
@@ -28,7 +28,6 @@ ext {
dependencies {
implementation platform(project(':platform'))
api(project(':solr:core'))
- implementation project(':solr:solrj')
implementation libs.apache.lucene.core
diff --git a/solr/modules/scripting/build.gradle
b/solr/modules/scripting/build.gradle
index 6937034419d..43a3311dec3 100644
--- a/solr/modules/scripting/build.gradle
+++ b/solr/modules/scripting/build.gradle
@@ -22,7 +22,6 @@ description = 'Scripting Package'
dependencies {
implementation platform(project(':platform'))
implementation project(':solr:core')
- implementation project(':solr:solrj')
implementation libs.apache.lucene.core
diff --git a/solr/modules/sql/build.gradle b/solr/modules/sql/build.gradle
index f1eaa844fb1..e003464200f 100644
--- a/solr/modules/sql/build.gradle
+++ b/solr/modules/sql/build.gradle
@@ -22,9 +22,7 @@ description = 'SQL Module'
dependencies {
implementation platform(project(':platform'))
implementation project(':solr:core')
- implementation project(':solr:solrj')
- implementation project(':solr:solrj-streaming')
- implementation project(':solr:solrj-zookeeper')
+ implementation project(':solr:solrj-streaming') // sql is built directly on
streaming expressions
implementation libs.slf4j.api
implementation libs.google.guava
diff --git a/solr/solrj-jetty/build.gradle b/solr/solrj-jetty/build.gradle
index 0186f025260..48dcf33fb9e 100644
--- a/solr/solrj-jetty/build.gradle
+++ b/solr/solrj-jetty/build.gradle
@@ -43,11 +43,8 @@ dependencies {
testImplementation project(':solr:test-framework')
testImplementation project(':solr:core')
- testImplementation project(':solr:solrj')
// Access to solrj test classes (e.g., HttpSolrClientTestBase)
testImplementation project(path: ':solr:solrj', configuration:
'testArtifacts')
- // Test classes use main classes from this module
- testImplementation project(':solr:solrj-jetty')
testImplementation libs.apache.lucene.testframework
diff --git a/solr/solrj-streaming/build.gradle
b/solr/solrj-streaming/build.gradle
index 710bb45ed61..946e29c44d5 100644
--- a/solr/solrj-streaming/build.gradle
+++ b/solr/solrj-streaming/build.gradle
@@ -39,7 +39,4 @@ dependencies {
testImplementation libs.apache.lucene.testframework
testImplementation libs.junit.junit
testImplementation libs.hamcrest.hamcrest
-
- // cutterslade requires we state the obvious
- testImplementation project(':solr:solrj-streaming')
}
diff --git a/solr/solrj-zookeeper/build.gradle
b/solr/solrj-zookeeper/build.gradle
index 57abfbf5b0c..0ea56a23108 100644
--- a/solr/solrj-zookeeper/build.gradle
+++ b/solr/solrj-zookeeper/build.gradle
@@ -52,7 +52,4 @@ dependencies {
testImplementation libs.junit.junit
testImplementation libs.commonsio.commonsio
-
- // cutterslade requires we state the obvious
- testImplementation project(':solr:solrj-zookeeper')
}
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index f893d21bcab..b0172034db6 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -39,7 +39,6 @@ dependencies {
testImplementation project(':solr:test-framework')
testImplementation project(':solr:core')
- testImplementation project(':solr:solrj')
testImplementation project(':solr:solrj-jetty')
// ideally ZK centric tests move to solrj-zookeeper but sometimes we depend
on ZK here anyway
@@ -82,7 +81,6 @@ dependencies {
testRuntimeOnly(libs.apache.log4j.slf4j2impl, {
exclude group: "org.apache.logging.log4j", module: "log4j-api"
})
- testImplementation libs.fasterxml.jackson.core.core
}
/**
diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile
index 8fd70e35ffe..3f10b28c9f8 100644
--- a/solr/solrj/gradle.lockfile
+++ b/solr/solrj/gradle.lockfile
@@ -18,19 +18,13 @@
com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,jarValidation
com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
com.google.auto.value:auto-value-annotations:1.11.1=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.47.0=jarValidation,testCompileClasspath,testRuntimeClasspath
com.google.errorprone:error_prone_annotations:2.49.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.6.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
@@ -118,7 +112,6 @@
org.apache.lucene:lucene-test-framework:10.4.0=jarValidation,testCompileClasspat
org.apache.zookeeper:zookeeper-jute:3.9.5=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper:3.9.5=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.3.0=jarValidation,testRuntimeClasspath
org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index 0a5316b26c6..e7338c37042 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -30,10 +30,7 @@ dependencies {
}
api project(':solr:core')
- api project(':solr:solrj')
api project(':solr:solrj-jetty')
- api project(':solr:api')
- implementation project(':solr:solrj-zookeeper')
api libs.apache.lucene.testframework
implementation libs.apache.lucene.core
@@ -68,7 +65,7 @@ dependencies {
implementation(libs.opentelemetry.exporter.prometheus) {
transitive = false // most things don't want or already have
}
- implementation libs.opentelemetry.sdk.metrics // prometheus exporter needs
+ implementation libs.opentelemetry.sdk.metrics // JettySolrRunner uses
MetricReader; exporter is transitive=false
implementation libs.prometheus.metrics.model
implementation libs.jakarta.servlet.api
diff --git a/solr/ui/build.gradle.kts b/solr/ui/build.gradle.kts
index edddc546c1d..eb2fe5630c0 100644
--- a/solr/ui/build.gradle.kts
+++ b/solr/ui/build.gradle.kts
@@ -76,7 +76,6 @@ kotlin {
implementation(libs.compose.components.resources)
implementation(libs.compose.uiToolingPreview)
implementation(libs.androidx.lifecycle.viewmodelCompose)
- implementation(libs.androidx.lifecycle.runtimeCompose)
implementation(libs.androidx.lifecycle.viewModelNav3)
implementation(libs.androidx.navigation3.ui)
implementation(libs.androidx.material3.adaptive.asProvider())
@@ -85,7 +84,6 @@ kotlin {
implementation(libs.kotlinx.serialization.core)
implementation(libs.kotlinx.serialization.json)
implementation(libs.kotlinx.coroutines.core)
- implementation(libs.kotlinx.datetime)
implementation(libs.decompose.decompose)
implementation(libs.essenty.lifecycle)
@@ -93,7 +91,6 @@ kotlin {
implementation(libs.mvikotlin.extensions.coroutines)
implementation(libs.mvikotlin.mvikotlin)
implementation(libs.mvikotlin.main)
- implementation(libs.mvikotlin.logging)
implementation(project.dependencies.platform(libs.ktor.bom))
implementation(libs.ktor.client.auth)
@@ -103,7 +100,6 @@ kotlin {
implementation(libs.squareup.okio)
implementation(libs.oshai.logging)
- implementation(libs.slf4j.api)
}
commonTest.dependencies {
@@ -119,14 +115,14 @@ kotlin {
}
}
- val desktopMain by getting {
+ named("desktopMain") {
dependencies {
implementation(libs.ktor.client.cio)
implementation(libs.ktor.server.core)
implementation(libs.ktor.server.cio)
implementation(libs.ktor.server.htmlBuilder)
implementation(compose.desktop.currentOs)
- implementation(libs.kotlinx.coroutines.swing)
+ runtimeOnly(libs.kotlinx.coroutines.swing)
}
}
}
diff --git a/solr/ui/gradle.lockfile b/solr/ui/gradle.lockfile
index e549a9fbd51..24b90d8ee65 100644
--- a/solr/ui/gradle.lockfile
+++ b/solr/ui/gradle.lockfile
@@ -103,9 +103,6 @@
com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines-jvm:4.4.0=composeHotRelo
com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines-wasm-js:4.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines:4.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependencie
[...]
com.arkivanov.mvikotlin:mvikotlin-jvm:4.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.mvikotlin:mvikotlin-logging-jvm:4.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-com.arkivanov.mvikotlin:mvikotlin-logging-wasm-js:4.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
-com.arkivanov.mvikotlin:mvikotlin-logging:4.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desk
[...]
com.arkivanov.mvikotlin:mvikotlin-main-jvm:4.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
com.arkivanov.mvikotlin:mvikotlin-main-wasm-js:4.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
com.arkivanov.mvikotlin:mvikotlin-main:4.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktop
[...]
@@ -115,7 +112,6 @@
com.squareup.okio:okio-jvm:3.17.0=composeHotReloadDevDesktopDevRuntimeClasspath,
com.squareup.okio:okio-wasm-js:3.17.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
com.squareup.okio:okio:3.17.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClass
[...]
com.typesafe:config:1.4.8=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
io.github.oshai:kotlin-logging-jvm:8.0.4=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
io.github.oshai:kotlin-logging-wasm-js:8.0.4=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
io.github.oshai:kotlin-logging:8.0.4=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRunti
[...]
@@ -346,8 +342,6 @@
org.jetbrains.compose.ui:ui-util:1.11.1=allDevSourceSetsCompileDependenciesMetad
org.jetbrains.compose.ui:ui-wasm-js:1.11.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
org.jetbrains.compose.ui:ui:1.10.0=composeHotReloadDevTools
org.jetbrains.compose.ui:ui:1.11.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntime
[...]
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
org.jetbrains.kotlin:kotlin-build-tools-api:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-build-tools-api:2.4.20-Beta1=kotlinAbiValidationCompatClasspath
org.jetbrains.kotlin:kotlin-build-tools-compat:2.4.0=kotlinAbiValidationCompatClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
@@ -364,9 +358,7 @@
org.jetbrains.kotlin:kotlin-daemon-client:2.4.0=kotlinBuildToolsApiClasspath,kot
org.jetbrains.kotlin:kotlin-daemon-client:2.4.20-Beta1=kotlinAbiValidationCompatClasspath
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.4.20-Beta1=kotlinAbiValidationCompatClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.4.0=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinAbiValidationCompatClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-reflect:2.3.21=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMet
[...]
org.jetbrains.kotlin:kotlin-script-runtime:2.4.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinKlibCommonizerClasspath
@@ -382,7 +374,6 @@
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=composeHotReloadDevTools
org.jetbrains.kotlin:kotlin-stdlib-wasm-js:2.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:2.1.21=composeHotReloadRuntime
org.jetbrains.kotlin:kotlin-stdlib:2.2.21=composeHotReloadDevTools
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinInternalAbiValidation
org.jetbrains.kotlin:kotlin-stdlib:2.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevR
[...]
org.jetbrains.kotlin:kotlin-stdlib:2.4.20-Beta1=kotlinAbiValidationCompatClasspath
org.jetbrains.kotlin:kotlin-test-junit:2.4.0=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
@@ -398,7 +389,7 @@
org.jetbrains.kotlinx:atomicfu:0.33.0=allDevSourceSetsCompileDependenciesMetadat
org.jetbrains.kotlinx:kotlinx-browser-wasm-js:0.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-browser:0.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,desktopDevResolvableDependenciesMetadata,desktopMainResolvableDependenciesMetadata,desktopTestResolvableDependenciesMetadata,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependen
[...]
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2=composeHotReloadDevTools
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.11.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDepend
[...]
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2=composeHotReloadDevTools
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinAbiValidationCompatClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
@@ -407,15 +398,15 @@
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2=composeHotReloadDevTools
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata
[...]
org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.10.2=composeHotReloadDevTools
-org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.11.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDepe
[...]
+org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.11.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.11.0=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-test-wasm-js:1.11.0=wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-test:1.11.0=allTestSourceSetsCompileDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webTestResolvableDependenciesMetadata
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.7.1=composeHotReloadDevTools
-org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.8.0-0.6.x-compat=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-datetime-wasm-js:0.8.0-0.6.x-compat=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.8.0-0.6.x-compat=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-datetime-wasm-js:0.8.0-0.6.x-compat=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-datetime:0.7.1=composeHotReloadDevTools
-org.jetbrains.kotlinx:kotlinx-datetime:0.8.0-0.6.x-compat=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMet
[...]
+org.jetbrains.kotlinx:kotlinx-datetime:0.8.0-0.6.x-compat=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolva
[...]
org.jetbrains.kotlinx:kotlinx-html-jvm:0.12.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-html:0.12.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMeta
[...]
org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.9.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
@@ -445,12 +436,11 @@
org.jetbrains.skiko:skiko-js-wasm-runtime:0.144.6=COMPOSE_SKIKO_JS_WASM_RUNTIME,
org.jetbrains.skiko:skiko-wasm-js:0.144.6=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath
org.jetbrains.skiko:skiko:0.144.6=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeC
[...]
org.jetbrains.skiko:skiko:0.9.37.3=composeHotReloadDevTools
-org.jetbrains:annotations:13.0=composeHotReloadRuntime,kotlinAbiValidationCompatClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
+org.jetbrains:annotations:13.0=composeHotReloadRuntime,kotlinAbiValidationCompatClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathDesktopDev,kotlinCompilerPluginClasspathDesktopMain,kotlinCompilerPluginClasspathDesktopTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinCompilerPluginClasspathWasmJsMain,kotlinCompilerPluginClasspathWasmJsTest,kotlinKlibCommonizerClasspath
org.jetbrains:annotations:23.0.0=composeHotReloadDevTools
org.jetbrains:annotations:26.1.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
org.jspecify:jspecify:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
org.ow2.asm:asm-tree:9.9.1=composeHotReloadAgent
org.ow2.asm:asm:9.9.1=composeHotReloadAgent
-org.slf4j:slf4j-api:2.0.17=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,desktopDevResolvableDependenciesMetadata,desktopMainResolvableDependenciesMetadata,desktopTestResolvableDependenciesMetadata,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasm
[...]
org.slf4j:slf4j-api:2.0.18=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath
empty=commonMainImplementationDependenciesMetadata,commonTestImplementationDependenciesMetadata,desktopDevAnnotationProcessor,desktopDevImplementationDependenciesMetadata,desktopMainAnnotationProcessor,desktopMainImplementationDependenciesMetadata,desktopTestAnnotationProcessor,desktopTestImplementationDependenciesMetadata,devKotlinScriptDefExtensions,jarValidation,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,swiftPMDependenciesMetadataClass
[...]
