Move common testing modules to match convention a bit better(?) (#4451)
* Rename jsf modules to match convention * Couchbase too * Mongo too * Play WS too * Log4j too * Elasticsearch too * JAX-RS too * JAX-WS sort of * Spotless * empty commit
This commit is contained in:
Trask Stalnaker
GitHub
parent
7998c842db
commit
1b37df7afd
|
|
@ -35,7 +35,7 @@ dependencies {
|
|||
|
||||
library("com.couchbase.client:java-client:2.0.0")
|
||||
|
||||
testImplementation(project(":instrumentation:couchbase:couchbase-testing"))
|
||||
testImplementation(project(":instrumentation:couchbase:couchbase-common:testing"))
|
||||
|
||||
latestDepTestLibrary("org.springframework.data:spring-data-couchbase:3.+")
|
||||
latestDepTestLibrary("com.couchbase.client:java-client:2.+")
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ dependencies {
|
|||
library("com.couchbase.client:java-client:2.6.0")
|
||||
|
||||
testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent"))
|
||||
testImplementation(project(":instrumentation:couchbase:couchbase-testing"))
|
||||
testImplementation(project(":instrumentation:couchbase:couchbase-common:testing"))
|
||||
|
||||
testLibrary("org.springframework.data:spring-data-couchbase:3.1.0.RELEASE")
|
||||
testLibrary("com.couchbase.client:encryption:1.0.0")
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ abstract class AbstractCouchbaseAsyncClientTest extends AbstractCouchbaseTest {
|
|||
|
||||
environment = envBuilder(bucketSettings).build()
|
||||
cluster = CouchbaseAsyncCluster.create(environment, Arrays.asList("127.0.0.1"))
|
||||
manager = cluster.clusterManager(USERNAME, PASSWORD).toBlocking().single()
|
||||
manager = cluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD).toBlocking().single()
|
||||
type = bucketSettings.type().name()
|
||||
}
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ abstract class AbstractCouchbaseClientTest extends AbstractCouchbaseTest {
|
|||
|
||||
environment = envBuilder(bucketSettings).build()
|
||||
cluster = CouchbaseCluster.create(environment, Arrays.asList("127.0.0.1"))
|
||||
manager = cluster.clusterManager(USERNAME, PASSWORD)
|
||||
manager = cluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD)
|
||||
type = bucketSettings.type().name()
|
||||
}
|
||||
|
||||
|
|
@ -42,8 +42,8 @@ class AbstractCouchbaseSpringTemplateTest extends AbstractCouchbaseTest {
|
|||
|
||||
couchbaseCluster = CouchbaseCluster.create(couchbaseEnvironment, Arrays.asList("127.0.0.1"))
|
||||
memcacheCluster = CouchbaseCluster.create(memcacheEnvironment, Arrays.asList("127.0.0.1"))
|
||||
ClusterManager couchbaseManager = couchbaseCluster.clusterManager(USERNAME, PASSWORD)
|
||||
ClusterManager memcacheManager = memcacheCluster.clusterManager(USERNAME, PASSWORD)
|
||||
ClusterManager couchbaseManager = couchbaseCluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD)
|
||||
ClusterManager memcacheManager = memcacheCluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD)
|
||||
|
||||
Bucket bucketCouchbase = couchbaseCluster.openBucket(bucketCouchbase.name(), bucketCouchbase.password())
|
||||
Bucket bucketMemcache = memcacheCluster.openBucket(bucketMemcache.name(), bucketMemcache.password())
|
||||
|
|
@ -33,7 +33,7 @@ dependencies {
|
|||
testInstrumentation(project(":instrumentation:apache-httpasyncclient-4.1:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
|
||||
|
||||
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing"))
|
||||
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
|
||||
testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
|
||||
testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ dependencies {
|
|||
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:spring:spring-data-1.8:javaagent"))
|
||||
|
||||
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing"))
|
||||
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
|
||||
testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
|
||||
testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ dependencies {
|
|||
|
||||
testLibrary("org.elasticsearch.plugin:transport-netty4-client:6.0.0")
|
||||
|
||||
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing"))
|
||||
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
|
||||
testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
|
||||
testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import org.eclipse.jetty.webapp.WebAppContext
|
|||
|
||||
import static org.eclipse.jetty.util.resource.Resource.newResource
|
||||
|
||||
class JaxRsJettyHttpServerTest extends JaxRsHttpServerTest<Server> {
|
||||
abstract class JaxRsJettyHttpServerTest extends JaxRsHttpServerTest<Server> {
|
||||
|
||||
@Override
|
||||
Server startServer(int port) {
|
||||
|
|
@ -32,7 +32,7 @@ dependencies {
|
|||
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
|
||||
|
||||
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
|
||||
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
|
||||
testImplementation("javax.xml.bind:jaxb-api:2.2.3")
|
||||
testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ dependencies {
|
|||
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
|
||||
|
||||
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
|
||||
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
|
||||
|
||||
// First version with DropwizardTestSupport:
|
||||
testLibrary("io.dropwizard:dropwizard-testing:0.8.0")
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ dependencies {
|
|||
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
|
||||
|
||||
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
|
||||
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
|
||||
testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
|
||||
|
||||
testLibrary("org.jboss.resteasy:resteasy-undertow:3.0.4.Final") {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ dependencies {
|
|||
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
|
||||
|
||||
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
|
||||
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
|
||||
testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
|
||||
|
||||
testLibrary("org.jboss.resteasy:resteasy-undertow:3.1.0.Final") {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ dependencies {
|
|||
testLibrary("org.apache.axis2:axis2-transport-http:$axis2Version")
|
||||
testLibrary("org.apache.axis2:axis2-transport-local:$axis2Version")
|
||||
|
||||
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing"))
|
||||
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
|
||||
|
||||
testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ dependencies {
|
|||
library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
|
||||
testLibrary("org.apache.cxf:cxf-rt-transports-http:3.0.0")
|
||||
|
||||
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing"))
|
||||
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
|
||||
|
||||
testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ dependencies {
|
|||
|
||||
compileOnly("javax.servlet:javax.servlet-api:3.0.1")
|
||||
|
||||
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing"))
|
||||
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
|
||||
|
||||
testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ dependencies {
|
|||
|
||||
implementation(project(":instrumentation:jsf:jsf-common:library"))
|
||||
|
||||
testImplementation(project(":instrumentation:jsf:jsf-testing-common"))
|
||||
testImplementation(project(":instrumentation:jsf:jsf-common:testing"))
|
||||
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ dependencies {
|
|||
|
||||
implementation(project(":instrumentation:jsf:jsf-common:library"))
|
||||
|
||||
testImplementation(project(":instrumentation:jsf:jsf-testing-common"))
|
||||
testImplementation(project(":instrumentation:jsf:jsf-common:testing"))
|
||||
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ dependencies {
|
|||
|
||||
implementation(project(":instrumentation:log4j:log4j-2.13.2:library"))
|
||||
|
||||
testImplementation(project(":instrumentation:log4j:log4j-2-testing"))
|
||||
testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -9,5 +9,5 @@ dependencies {
|
|||
// around it.
|
||||
testLibrary("org.apache.logging.log4j:log4j-core:2.13.3")
|
||||
|
||||
testImplementation(project(":instrumentation:log4j:log4j-2-testing"))
|
||||
testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ muzzle {
|
|||
dependencies {
|
||||
library("org.apache.logging.log4j:log4j-core:2.7")
|
||||
|
||||
testImplementation(project(":instrumentation:log4j:log4j-2-testing"))
|
||||
testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
|
||||
|
||||
latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.13.1")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ plugins {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
api(project(":instrumentation:mongo:mongo-testing"))
|
||||
api(project(":instrumentation:mongo:mongo-common:testing"))
|
||||
|
||||
compileOnly("org.mongodb:mongo-java-driver:3.1.0")
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ dependencies {
|
|||
// a couple of test attribute verifications don't pass until 3.8.0
|
||||
library("org.mongodb:mongo-java-driver:3.8.0")
|
||||
|
||||
testImplementation(project(":instrumentation:mongo:mongo-testing"))
|
||||
testImplementation(project(":instrumentation:mongo:mongo-common:testing"))
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ dependencies {
|
|||
testLibrary("org.mongodb:mongodb-driver-sync:4.0.0")
|
||||
testLibrary("org.mongodb:mongodb-driver-reactivestreams:4.0.0")
|
||||
|
||||
testImplementation(project(":instrumentation:mongo:mongo-testing"))
|
||||
testImplementation(project(":instrumentation:mongo:mongo-common:testing"))
|
||||
testImplementation("de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.5")
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ dependencies {
|
|||
|
||||
library("org.mongodb:mongodb-driver-async:3.3.0")
|
||||
|
||||
testImplementation(project(":instrumentation:mongo:mongo-testing"))
|
||||
testImplementation(project(":instrumentation:mongo:mongo-common:testing"))
|
||||
|
||||
testInstrumentation(project(":instrumentation:mongo:mongo-3.7:javaagent"))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ dependencies {
|
|||
|
||||
implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
|
||||
|
||||
testImplementation(project(":instrumentation:play-ws:play-ws-testing"))
|
||||
testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
|
||||
|
||||
// These are to ensure cross compatibility
|
||||
testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ dependencies {
|
|||
|
||||
implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
|
||||
|
||||
testImplementation(project(":instrumentation:play-ws:play-ws-testing"))
|
||||
testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
|
||||
|
||||
// These are to ensure cross compatibility
|
||||
testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ dependencies {
|
|||
|
||||
implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
|
||||
|
||||
testImplementation(project(":instrumentation:play-ws:play-ws-testing"))
|
||||
testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
|
||||
|
||||
// These are to ensure cross compatibility
|
||||
testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ include(":instrumentation:couchbase:couchbase-3.1.6:javaagent")
|
|||
include(":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded")
|
||||
include(":instrumentation:couchbase:couchbase-3.2:javaagent")
|
||||
include(":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded")
|
||||
include(":instrumentation:couchbase:couchbase-testing")
|
||||
include(":instrumentation:couchbase:couchbase-common:testing")
|
||||
include(":instrumentation:dropwizard-views-0.7:javaagent")
|
||||
include(":instrumentation:dropwizard-testing")
|
||||
include(":instrumentation:elasticsearch:elasticsearch-rest-common:javaagent")
|
||||
|
|
@ -144,7 +144,7 @@ include(":instrumentation:elasticsearch:elasticsearch-rest-5.0:javaagent")
|
|||
include(":instrumentation:elasticsearch:elasticsearch-rest-6.4:javaagent")
|
||||
include(":instrumentation:elasticsearch:elasticsearch-rest-7.0:javaagent")
|
||||
include(":instrumentation:elasticsearch:elasticsearch-transport-common:library")
|
||||
include(":instrumentation:elasticsearch:elasticsearch-transport-testing")
|
||||
include(":instrumentation:elasticsearch:elasticsearch-transport-common:testing")
|
||||
include(":instrumentation:elasticsearch:elasticsearch-transport-5.0:javaagent")
|
||||
include(":instrumentation:elasticsearch:elasticsearch-transport-5.3:javaagent")
|
||||
include(":instrumentation:elasticsearch:elasticsearch-transport-6.0:javaagent")
|
||||
|
|
@ -179,7 +179,7 @@ include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-payara-testing")
|
|||
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.0:javaagent")
|
||||
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1:javaagent")
|
||||
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent")
|
||||
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing")
|
||||
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing")
|
||||
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-tomee-testing")
|
||||
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-wildfly-testing")
|
||||
include(":instrumentation:jaxrs-client:jaxrs-client-1.1:javaagent")
|
||||
|
|
@ -194,7 +194,7 @@ include(":instrumentation:jaxws:jaxws-2.0-axis2-1.6:library")
|
|||
include(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent")
|
||||
include(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:library")
|
||||
include(":instrumentation:jaxws:jaxws-2.0-metro-2.2:javaagent")
|
||||
include(":instrumentation:jaxws:jaxws-2.0-testing")
|
||||
include(":instrumentation:jaxws:jaxws-2.0-common-testing")
|
||||
include(":instrumentation:jaxws:jaxws-2.0-tomee-testing")
|
||||
include(":instrumentation:jaxws:jaxws-2.0-wildfly-testing")
|
||||
include(":instrumentation:jaxws:jaxws-common:library")
|
||||
|
|
@ -213,9 +213,9 @@ include(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:testing")
|
|||
include(":instrumentation:jms-1.1:javaagent")
|
||||
include(":instrumentation:jms-1.1:javaagent-unit-tests")
|
||||
include(":instrumentation:jsf:jsf-common:library")
|
||||
include(":instrumentation:jsf:jsf-testing-common")
|
||||
include(":instrumentation:jsf:mojarra-1.2:javaagent")
|
||||
include(":instrumentation:jsf:myfaces-1.2:javaagent")
|
||||
include(":instrumentation:jsf:jsf-common:testing")
|
||||
include(":instrumentation:jsf:jsf-mojarra-1.2:javaagent")
|
||||
include(":instrumentation:jsf:jsf-myfaces-1.2:javaagent")
|
||||
include(":instrumentation:jsp-2.3:javaagent")
|
||||
include(":instrumentation:kafka-clients:kafka-clients-0.11:bootstrap")
|
||||
include(":instrumentation:kafka-clients:kafka-clients-0.11:javaagent")
|
||||
|
|
@ -239,7 +239,7 @@ include(":instrumentation:log4j:log4j-1.2:javaagent")
|
|||
include(":instrumentation:log4j:log4j-2.7:javaagent")
|
||||
include(":instrumentation:log4j:log4j-2.13.2:javaagent")
|
||||
include(":instrumentation:log4j:log4j-2.13.2:library")
|
||||
include(":instrumentation:log4j:log4j-2-testing")
|
||||
include(":instrumentation:log4j:log4j-2-common:testing")
|
||||
include(":instrumentation:logback-1.0:javaagent")
|
||||
include(":instrumentation:logback-1.0:library")
|
||||
include(":instrumentation:logback-1.0:testing")
|
||||
|
|
@ -250,7 +250,7 @@ include(":instrumentation:mongo:mongo-3.1:testing")
|
|||
include(":instrumentation:mongo:mongo-3.7:javaagent")
|
||||
include(":instrumentation:mongo:mongo-4.0:javaagent")
|
||||
include(":instrumentation:mongo:mongo-async-3.3:javaagent")
|
||||
include(":instrumentation:mongo:mongo-testing")
|
||||
include(":instrumentation:mongo:mongo-common:testing")
|
||||
include(":instrumentation:netty:netty-3.8:javaagent")
|
||||
include(":instrumentation:netty:netty-4.0:javaagent")
|
||||
include(":instrumentation:netty:netty-4.1:library")
|
||||
|
|
@ -274,7 +274,7 @@ include(":instrumentation:play-ws:play-ws-1.0:javaagent")
|
|||
include(":instrumentation:play-ws:play-ws-2.0:javaagent")
|
||||
include(":instrumentation:play-ws:play-ws-2.1:javaagent")
|
||||
include(":instrumentation:play-ws:play-ws-common:javaagent")
|
||||
include(":instrumentation:play-ws:play-ws-testing")
|
||||
include(":instrumentation:play-ws:play-ws-common:testing")
|
||||
include(":instrumentation:quartz-2.0:javaagent")
|
||||
include(":instrumentation:quartz-2.0:library")
|
||||
include(":instrumentation:quartz-2.0:testing")
|
||||
|
|
|
|||
Loading…
Reference in New Issue