From d2e75a166893f4cdf9d12743df2dee9728b9ae6c Mon Sep 17 00:00:00 2001 From: Ben Manes Date: Sat, 28 Oct 2023 10:27:31 -0700 Subject: [PATCH] fix dependency check analysis --- gradle/libs.versions.toml | 6 ++++-- .../main/kotlin/analyze/jmh-caffeine-conventions.gradle.kts | 1 - .../dependency-check-caffeine-conventions.gradle.kts | 6 ------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b9f50f5f91..888f7b0863 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -67,6 +67,7 @@ nexus-publish = "2.0.0-rc-1" nullaway-core = "0.10.15" nullaway-plugin = "1.6.0" ohc = "0.6.1" +okhttp = "4.12.0" osgi-annotations = "1.5.1" osgi-function = "1.2.0" osgi-promise = "1.3.0" @@ -174,6 +175,7 @@ nexus-publish = { module = "io.github.gradle-nexus:publish-plugin", version.ref nullaway-core = { module = "com.uber.nullaway:nullaway", version.ref = "nullaway-core" } nullaway-plugin = { module = "net.ltgt.gradle:gradle-nullaway-plugin", version.ref = "nullaway-plugin" } ohc = { module = "org.caffinitas.ohc:ohc-core-j8", version.ref = "ohc" } +okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } osgi-annotations = { module = "org.osgi:org.osgi.service.component.annotations", version.ref = "osgi-annotations" } osgi-function = { module = "org.osgi:org.osgi.util.function", version.ref = "osgi-function" } osgi-promise = { module = "org.osgi:org.osgi.util.promise", version.ref = "osgi-promise" } @@ -208,8 +210,8 @@ zstd = { module = "com.github.luben:zstd-jni", version.ref = "zstd" } [bundles] coherence = ["coherence-core", "json-bind"] -constraints = ["bcel", "bouncycastle", "commons-text", "httpclient", - "jcommander", "jgit", "jsoup", "protobuf", "snakeyaml" ] +constraints = ["bcel", "bouncycastle", "commons-text", "guava", "httpclient", + "jcommander", "jgit", "jsoup", "okhttp", "protobuf", "snakeyaml" ] errorprone-support = [ "errorprone-support", "errorprone-support-refaster" ] jmh = ["jmh-core", "jmh-plugin", "jmh-report"] junit = ["junit4", "junit5"] diff --git a/gradle/plugins/src/main/kotlin/analyze/jmh-caffeine-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/analyze/jmh-caffeine-conventions.gradle.kts index 88b02339d1..23a1cbd67f 100644 --- a/gradle/plugins/src/main/kotlin/analyze/jmh-caffeine-conventions.gradle.kts +++ b/gradle/plugins/src/main/kotlin/analyze/jmh-caffeine-conventions.gradle.kts @@ -1,5 +1,4 @@ /** Java microbenchmark harness: https://github.com/melix/jmh-gradle-plugin */ -import org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry import org.gradle.plugins.ide.eclipse.model.Classpath import org.gradle.plugins.ide.eclipse.model.Library import me.champeau.jmh.JmhBytecodeGeneratorTask diff --git a/gradle/plugins/src/main/kotlin/quality/dependency-check-caffeine-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/quality/dependency-check-caffeine-conventions.gradle.kts index d9542bf895..b25cde648b 100644 --- a/gradle/plugins/src/main/kotlin/quality/dependency-check-caffeine-conventions.gradle.kts +++ b/gradle/plugins/src/main/kotlin/quality/dependency-check-caffeine-conventions.gradle.kts @@ -7,9 +7,3 @@ dependencyCheck { scanBuildEnv = true formats = listOf("HTML", "SARIF") } - -subprojects { - tasks.withType().configureEach { - rootProject.tasks.dependencyCheckAggregate.get().dependsOn(this) - } -}