From b9bea71627acc7989af78bee02714a2d0d3543aa Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 8 Jul 2021 02:42:50 +0300 Subject: [PATCH] Remove repo.gradle.org dependency (#3522) --- .../jaxrs-2.0-arquillian-testing/build.gradle.kts | 14 +------------- .../jaxrs-2.0-payara-testing/build.gradle.kts | 8 -------- .../jaxrs-2.0-tomee-testing/build.gradle.kts | 13 ------------- .../jaxrs-2.0-wildfly-testing/build.gradle.kts | 13 ------------- .../jaxws-2.0-arquillian-testing/build.gradle.kts | 14 +------------- .../jaxws/jaxws-2.0-tomee-testing/build.gradle.kts | 13 ------------- .../jaxws-2.0-wildfly-testing/build.gradle.kts | 13 ------------- 7 files changed, 2 insertions(+), 86 deletions(-) diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/build.gradle.kts index 8dd5b01893..d2a15fac98 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/build.gradle.kts @@ -2,18 +2,6 @@ plugins { id("otel.javaagent-testing") } -// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain depends on -repositories { - mavenCentral() - maven { - setUrl("https://repo.gradle.org/artifactory/libs-releases-local") - content { - includeGroup("org.gradle") - } - } - mavenLocal() -} - dependencies { compileOnly("javax:javaee-api:7.0") @@ -24,5 +12,5 @@ dependencies { implementation("org.jboss.arquillian.junit:arquillian-junit-container:${arquillianVersion}") implementation("org.jboss.arquillian.protocol:arquillian-protocol-servlet:${arquillianVersion}") implementation("org.jboss.arquillian.spock:arquillian-spock-container:1.0.0.CR1") - api("org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain:3.1.3") + api("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6") } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-payara-testing/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-payara-testing/build.gradle.kts index 49ed1aeba3..636a00dec5 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-payara-testing/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-payara-testing/build.gradle.kts @@ -2,14 +2,6 @@ plugins { id("otel.javaagent-testing") } -// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain -// which is used by jaxrs-2.0-arquillian-testing depends on -repositories { - mavenCentral() - maven { setUrl("https://repo.gradle.org/artifactory/libs-releases-local") } - mavenLocal() -} - dependencies { testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing")) testRuntimeOnly("fish.payara.arquillian:arquillian-payara-server-embedded:2.4.1") diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/build.gradle.kts index 9d09617955..ec1f335d7b 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/build.gradle.kts @@ -2,19 +2,6 @@ plugins { id("otel.javaagent-testing") } -// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain -// which is used by jaxrs-2.0-arquillian-testing depends on -repositories { - mavenCentral() - maven { - setUrl("https://repo.gradle.org/artifactory/libs-releases-local") - content { - includeGroup("org.gradle") - } - } - mavenLocal() -} - dependencies { testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing")) testCompileOnly("jakarta.enterprise:jakarta.enterprise.cdi-api:2.0.2") diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts index d3d71f2c27..254b87dfc5 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts @@ -2,19 +2,6 @@ plugins { id("otel.javaagent-testing") } -// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain -// which is used by jaxrs-2.0-arquillian-testing depends on -repositories { - mavenCentral() - maven { - setUrl("https://repo.gradle.org/artifactory/libs-releases-local") - content { - includeGroup("org.gradle") - } - } - mavenLocal() -} - val testServer by configurations.creating dependencies { diff --git a/instrumentation/jaxws/jaxws-2.0-arquillian-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-arquillian-testing/build.gradle.kts index 3e45131644..83ffd67f69 100644 --- a/instrumentation/jaxws/jaxws-2.0-arquillian-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-arquillian-testing/build.gradle.kts @@ -2,18 +2,6 @@ plugins { id("otel.javaagent-testing") } -// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain depends on -repositories { - mavenCentral() - maven { - setUrl("https://repo.gradle.org/artifactory/libs-releases-local") - content { - includeGroup("org.gradle") - } - } - mavenLocal() -} - dependencies { compileOnly("javax:javaee-api:7.0") @@ -25,5 +13,5 @@ dependencies { implementation("org.jboss.arquillian.junit:arquillian-junit-container:${arquillianVersion}") implementation("org.jboss.arquillian.protocol:arquillian-protocol-servlet:${arquillianVersion}") implementation("org.jboss.arquillian.spock:arquillian-spock-container:1.0.0.CR1") - api("org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain:3.1.3") + api("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6") } diff --git a/instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts index b045af6a0a..0e949c0779 100644 --- a/instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts @@ -2,19 +2,6 @@ plugins { id("otel.javaagent-testing") } -// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain -// which is used by jaxws-2.0-arquillian-testing depends on -repositories { - mavenCentral() - maven { - setUrl("https://repo.gradle.org/artifactory/libs-releases-local") - content { - includeGroup("org.gradle") - } - } - mavenLocal() -} - dependencies { testImplementation(project(":instrumentation:jaxws:jaxws-2.0-arquillian-testing")) testCompileOnly("jakarta.enterprise:jakarta.enterprise.cdi-api:2.0.2") diff --git a/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts index 48c8b342fa..de8c5904c7 100644 --- a/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts @@ -2,19 +2,6 @@ plugins { id("otel.javaagent-testing") } -// add repo for org.gradle:gradle-tooling-api which org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-gradle-depchain -// which is used by jaxws-2.0-arquillian-testing depends on -repositories { - mavenCentral() - maven { - setUrl("https://repo.gradle.org/artifactory/libs-releases-local") - content { - includeGroup("org.gradle") - } - } - mavenLocal() -} - val testServer by configurations.creating dependencies {