Browse Source

Remove repo.gradle.org dependency (#3522)

Lauri Tulmin 3 years ago
parent
commit
b9bea71627

+ 1 - 13
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")
 }

+ 0 - 8
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")

+ 0 - 13
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")

+ 0 - 13
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 {

+ 1 - 13
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")
 }

+ 0 - 13
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")

+ 0 - 13
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 {