Move jaxrs bootstrap module (#4448)

trask · web-flow · commit b1d638fc3507 · 2021-10-20T15:02:06.000-07:00
diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts
@@ -16,7 +16,7 @@ muzzle {
 }
 
 dependencies {
-  compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+  compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
 
   compileOnly("javax.ws.rs:jsr311-api:1.1.1")
 
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/build.gradle.kts
@@ -16,7 +16,7 @@ muzzle {
 }
 
 dependencies {
-  compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+  compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
 
   compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
 
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts
@@ -21,7 +21,7 @@ muzzle {
 }
 
 dependencies {
-  compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+  compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
 
   compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
   compileOnly("javax.servlet:javax.servlet-api:3.1.0")
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts
@@ -20,7 +20,7 @@ muzzle {
 }
 
 dependencies {
-  compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+  compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
 
   compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
   compileOnly("javax.servlet:javax.servlet-api:3.1.0")
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts
@@ -23,7 +23,7 @@ muzzle {
 }
 
 dependencies {
-  compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+  compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
 
   compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
   library("org.jboss.resteasy:resteasy-jaxrs:3.0.0.Final")
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  compileOnly(project(":instrumentation:jaxrs:bootstrap"))
+  compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))
 
   compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
   compileOnly("org.jboss.resteasy:resteasy-jaxrs:3.1.0.Final")
diff --git a/instrumentation/jaxrs/jaxrs-common/bootstrap/build.gradle.kts b/instrumentation/jaxrs/jaxrs-common/bootstrap/build.gradle.kts
diff --git a/instrumentation/jaxrs/jaxrs-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/ClassHierarchyIterable.java b/instrumentation/jaxrs/jaxrs-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/ClassHierarchyIterable.java
diff --git a/instrumentation/jaxrs/jaxrs-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/JaxrsContextPath.java b/instrumentation/jaxrs/jaxrs-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/JaxrsContextPath.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -169,7 +169,7 @@ include(":instrumentation:hibernate:hibernate-procedure-call-4.3:javaagent")
 include(":instrumentation:http-url-connection:javaagent")
 include(":instrumentation:hystrix-1.4:javaagent")
 include(":instrumentation:java-http-client:javaagent")
-include(":instrumentation:jaxrs:bootstrap")
+include(":instrumentation:jaxrs:jaxrs-common:bootstrap")
 include(":instrumentation:jaxrs:jaxrs-1.0:javaagent")
 include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing")
 include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent")

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ muzzle {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`dependencies {`
`19`		`- compileOnly(project(":instrumentation:jaxrs:bootstrap"))`
	`19`	`+ compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))`
`20`	`20`
`21`	`21`	`compileOnly("javax.ws.rs:jsr311-api:1.1.1")`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ muzzle {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`dependencies {`
`24`		`- compileOnly(project(":instrumentation:jaxrs:bootstrap"))`
	`24`	`+ compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))`
`25`	`25`
`26`	`26`	`compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")`
`27`	`27`	`compileOnly("javax.servlet:javax.servlet-api:3.1.0")`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ muzzle {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`dependencies {`
`23`		`- compileOnly(project(":instrumentation:jaxrs:bootstrap"))`
	`23`	`+ compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))`
`24`	`24`
`25`	`25`	`compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")`
`26`	`26`	`compileOnly("javax.servlet:javax.servlet-api:3.1.0")`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ muzzle {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`dependencies {`
`26`		`- compileOnly(project(":instrumentation:jaxrs:bootstrap"))`
	`26`	`+ compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))`
`27`	`27`
`28`	`28`	`compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")`
`29`	`29`	`library("org.jboss.resteasy:resteasy-jaxrs:3.0.0.Final")`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- compileOnly(project(":instrumentation:jaxrs:bootstrap"))`
	`6`	`+ compileOnly(project(":instrumentation:jaxrs:jaxrs-common:bootstrap"))`
`7`	`7`
`8`	`8`	`compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")`
`9`	`9`	`compileOnly("org.jboss.resteasy:resteasy-jaxrs:3.1.0.Final")`