Consolidate classloader modules
MODIFY
instrumentation/classloaders/javaagent/classloaders-javaagent.gradle
instrumentation/classloaders/javaagent/classloaders-javaagent.gradle
@@ -4,6 +4,19 @@ dependencies {
compileOnly project(':javaagent-bootstrap')
testImplementation project(':javaagent-bootstrap')
+
+ // This is the earliest version that has org.apache.catalina.loader.ParallelWebappClassLoader
+ // which is used in the test
+ testLibrary group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '8.0.14'
+
+ testImplementation group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final'
+
+ // TODO: we should separate core and Eclipse tests at some point,
+ // but right now core-specific tests are quite dumb and are run with
+ // core version provided by Eclipse implementation.
+ //testImplementation group: 'org.osgi', name: 'org.osgi.core', version: '4.0.0'
+ testImplementation group: 'org.eclipse.platform', name: 'org.eclipse.osgi', version: '3.13.200'
+ testImplementation group: 'org.apache.felix', name: 'org.apache.felix.framework', version: '6.0.2'
}
// TODO (trask) ResourceInjectionTest is sort of hybrid integration/unit test

DELETE
instrumentation/classloaders/javaagent/jboss-testing/jboss-testing.gradle
-ext {
- skipPublish = true
-}
-apply from: "$rootDir/gradle/instrumentation.gradle"
-
-dependencies {
- testImplementation group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final'
-}

DELETE
instrumentation/classloaders/javaagent/osgi-testing/osgi-testing.gradle
-ext {
- skipPublish = true
-}
-apply from: "$rootDir/gradle/instrumentation.gradle"
-
-dependencies {
- // TODO: we should separate core and Eclipse tests at some point,
- // but right now core-specific tests are quite dump and are run with
- // core version provided by Eclipse implementation.
- //testImplementation group: 'org.osgi', name: 'org.osgi.core', version: '4.0.0'
- testImplementation group: 'org.eclipse.platform', name: 'org.eclipse.osgi', version: '3.13.200'
- testImplementation group: 'org.apache.felix', name: 'org.apache.felix.framework', version: '6.0.2'
-}

RENAME
instrumentation/classloaders/javaagent/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy
instrumentation/classloaders/javaagent/src/test/groovy/JBossClassloadingTest.groovy
RENAME
instrumentation/classloaders/javaagent/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy
instrumentation/classloaders/javaagent/src/test/groovy/OSGIClassloadingTest.groovy
RENAME
instrumentation/classloaders/javaagent/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy
instrumentation/classloaders/javaagent/src/test/groovy/TomcatClassloadingTest.groovy
DELETE
instrumentation/classloaders/javaagent/tomcat-testing/tomcat-testing.gradle
-ext {
- skipPublish = true
-}
-apply from: "$rootDir/gradle/instrumentation.gradle"
-
-muzzle {
- pass {
- group = "org.apache.tomcat"
- module = 'tomcat-catalina'
- versions = "[3.0.14,)"
- assertInverse = true
- }
-}
-
-dependencies {
- // This is the earliest version that has org.apache.catalina.loader.ParallelWebappClassLoader
- // which is used in the test
- testLibrary group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '8.0.14'
-}

MODIFY
settings.gradle
settings.gradle
@@ -86,9 +86,6 @@ include ':instrumentation:cassandra:cassandra-3.0:javaagent'
include ':instrumentation:cassandra:cassandra-4.0:javaagent'
include ':instrumentation:cdi-testing'
include ':instrumentation:classloaders:javaagent'
-include ':instrumentation:classloaders:javaagent:jboss-testing'
-include ':instrumentation:classloaders:javaagent:osgi-testing'
-include ':instrumentation:classloaders:javaagent:tomcat-testing'
include ':instrumentation:couchbase:couchbase-2.0:javaagent'
include ':instrumentation:couchbase:couchbase-2.0:javaagent-unittests'
include ':instrumentation:couchbase:couchbase-2.6:javaagent'

Consolidate classloader modules (#2670)