test latest deps cleanup (#5269)
* test latest deps cleanup * Revert currently irrelevant change * Update instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts Co-authored-by: Nikita Salnikov-Tarnovski <gnikem@gmail.com> Co-authored-by: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
This commit is contained in:
Trask Stalnaker
GitHub
parent
3bbc41a6ce
commit
022914139e
|
|
@ -34,7 +34,14 @@ extra["testLatestDeps"] = testLatestDeps
|
|||
abstract class TestLatestDepsRule : ComponentMetadataRule {
|
||||
override fun execute(context: ComponentMetadataContext) {
|
||||
val version = context.details.id.version
|
||||
if (version.contains("-alpha") || version.contains("-beta") || version.contains("-rc")) {
|
||||
if (version.contains("-alpha", true)
|
||||
|| version.contains("-beta", true)
|
||||
|| version.contains("-rc", true)
|
||||
|| version.contains("-m", true) // e.g. spring milestones are published to grails repo
|
||||
|| version.contains(".alpha", true) // e.g. netty
|
||||
|| version.contains(".beta", true) // e.g. hibernate
|
||||
|| version.contains(".cr", true) // e.g. hibernate
|
||||
) {
|
||||
context.details.status = "milestone"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ These are the supported libraries and frameworks:
|
|||
| [Akka Actors](https://doc.akka.io/docs/akka/current/typed/index.html) | 2.5+ |
|
||||
| [Akka HTTP](https://doc.akka.io/docs/akka-http/current/index.html) | 10.0+ |
|
||||
| [Apache Axis2](https://axis.apache.org/axis2/java/core/) | 1.6+ |
|
||||
| [Apache Camel](https://camel.apache.org/) | 2.20+ |
|
||||
| [Apache Camel](https://camel.apache.org/) | 2.20+ (not including 3.x yet) |
|
||||
| [Apache CXF JAX-RS](https://cxf.apache.org/) | 3.2+ |
|
||||
| [Apache CXF JAX-RS Client](https://cxf.apache.org/) | 3.0+ |
|
||||
| [Apache CXF JAX-WS](https://cxf.apache.org/) | 3.0+ |
|
||||
|
|
|
|||
|
|
@ -49,14 +49,14 @@ dependencies {
|
|||
testImplementation("org.testcontainers:localstack")
|
||||
testImplementation("org.testcontainers:cassandra")
|
||||
|
||||
latestDepTestLibrary("org.apache.camel:camel-core:2.+")
|
||||
latestDepTestLibrary("org.apache.camel:camel-spring-boot-starter:2.+")
|
||||
latestDepTestLibrary("org.apache.camel:camel-jetty-starter:2.+")
|
||||
latestDepTestLibrary("org.apache.camel:camel-http-starter:2.+")
|
||||
latestDepTestLibrary("org.apache.camel:camel-jaxb-starter:2.+")
|
||||
latestDepTestLibrary("org.apache.camel:camel-undertow:2.+")
|
||||
latestDepTestLibrary("org.apache.camel:camel-aws:2.+")
|
||||
latestDepTestLibrary("org.apache.camel:camel-cassandraql:2.+")
|
||||
latestDepTestLibrary("org.apache.camel:camel-core:2.+") // documented limitation
|
||||
latestDepTestLibrary("org.apache.camel:camel-spring-boot-starter:2.+") // documented limitation
|
||||
latestDepTestLibrary("org.apache.camel:camel-jetty-starter:2.+") // documented limitation
|
||||
latestDepTestLibrary("org.apache.camel:camel-http-starter:2.+") // documented limitation
|
||||
latestDepTestLibrary("org.apache.camel:camel-jaxb-starter:2.+") // documented limitation
|
||||
latestDepTestLibrary("org.apache.camel:camel-undertow:2.+") // documented limitation
|
||||
latestDepTestLibrary("org.apache.camel:camel-aws:2.+") // documented limitation
|
||||
latestDepTestLibrary("org.apache.camel:camel-cassandraql:2.+") // documented limitation
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@ dependencies {
|
|||
testImplementation(project(":instrumentation:apache-dubbo-2.7:testing"))
|
||||
|
||||
testLibrary("org.apache.dubbo:dubbo-config-api:2.7.0")
|
||||
latestDepTestLibrary("org.apache.dubbo:dubbo:2.+")
|
||||
latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+")
|
||||
latestDepTestLibrary("org.apache.dubbo:dubbo:2.+") // documented limitation
|
||||
latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+") // documented limitation
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@ dependencies {
|
|||
testImplementation(project(":instrumentation:apache-dubbo-2.7:testing"))
|
||||
|
||||
testLibrary("org.apache.dubbo:dubbo-config-api:2.7.0")
|
||||
latestDepTestLibrary("org.apache.dubbo:dubbo:2.+")
|
||||
latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+")
|
||||
latestDepTestLibrary("org.apache.dubbo:dubbo:2.+") // documented limitation
|
||||
latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+") // documented limitation
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,5 +13,5 @@ muzzle {
|
|||
dependencies {
|
||||
library("commons-httpclient:commons-httpclient:2.0")
|
||||
|
||||
latestDepTestLibrary("commons-httpclient:commons-httpclient:3.+")
|
||||
latestDepTestLibrary("commons-httpclient:commons-httpclient:3.+") // see apache-httpclient-4.0 module
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,5 +11,5 @@ dependencies {
|
|||
|
||||
testImplementation(project(":instrumentation:apache-httpclient:apache-httpclient-4.3:testing"))
|
||||
|
||||
latestDepTestLibrary("org.apache.httpcomponents:httpclient:4.+")
|
||||
latestDepTestLibrary("org.apache.httpcomponents:httpclient:4.+") // see apache-httpclient-5.0 module
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,9 +23,9 @@ dependencies {
|
|||
testImplementation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))
|
||||
testImplementation(project(":instrumentation:netty:netty-4.1:javaagent"))
|
||||
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114")
|
||||
latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114")
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114")
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114") // issue #5259
|
||||
latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114") // issue #5259
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114") // issue #5259
|
||||
}
|
||||
|
||||
tasks.withType<Test>().configureEach {
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ dependencies {
|
|||
|
||||
testImplementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
|
||||
|
||||
latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114")
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114")
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114")
|
||||
latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114") // issue #5259
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114") // issue #5259
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114") // issue #5259
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ dependencies {
|
|||
testImplementation("org.assertj:assertj-core")
|
||||
testImplementation("org.mockito:mockito-core")
|
||||
|
||||
latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114")
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114")
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114")
|
||||
latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114") // issue #5259
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114") // issue #5259
|
||||
latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114") // issue #5259
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ dependencies {
|
|||
testLibrary("com.datastax.cassandra:cassandra-driver-core:3.2.0")
|
||||
testInstrumentation(project(":instrumentation:guava-10.0:javaagent"))
|
||||
|
||||
latestDepTestLibrary("com.datastax.cassandra:cassandra-driver-core:3.+")
|
||||
latestDepTestLibrary("com.datastax.cassandra:cassandra-driver-core:3.+") // see cassandra-4.0 module
|
||||
}
|
||||
|
||||
// Requires old Guava. Can't use enforcedPlatform since predates BOM
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ dependencies {
|
|||
|
||||
compileOnly("com.google.auto.value:auto-value-annotations")
|
||||
annotationProcessor("com.google.auto.value:auto-value")
|
||||
|
||||
latestDepTestLibrary("com.datastax.oss:java-driver-core:4.+")
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ dependencies {
|
|||
testImplementation("org.testcontainers:elasticsearch")
|
||||
testLibrary("org.elasticsearch.client:rest:5.0.0")
|
||||
|
||||
latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.3.+")
|
||||
latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.3.+") // see elasticsearch-rest-6.4 module
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ dependencies {
|
|||
testImplementation("org.testcontainers:elasticsearch")
|
||||
testLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.4.0")
|
||||
|
||||
latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.+")
|
||||
latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.+") // see elasticsearch-rest-7.0 module
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -37,8 +37,11 @@ dependencies {
|
|||
testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
|
||||
testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
|
||||
|
||||
testImplementation("org.elasticsearch.plugin:transport-netty3-client:5.0.0")
|
||||
testImplementation("org.elasticsearch.client:transport:5.0.0")
|
||||
testLibrary("org.elasticsearch.plugin:transport-netty3-client:5.0.0")
|
||||
testLibrary("org.elasticsearch.client:transport:5.0.0")
|
||||
|
||||
latestDepTestLibrary("org.elasticsearch.plugin:transport-netty3-client:5.0.0")
|
||||
latestDepTestLibrary("org.elasticsearch.client:transport:5.0.0")
|
||||
}
|
||||
|
||||
tasks.withType<Test>().configureEach {
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@ dependencies {
|
|||
|
||||
testLibrary("org.springframework.data:spring-data-elasticsearch:3.0.0.RELEASE")
|
||||
|
||||
latestDepTestLibrary("org.elasticsearch.plugin:transport-netty3-client:5.+")
|
||||
latestDepTestLibrary("org.elasticsearch.client:transport:5.+")
|
||||
latestDepTestLibrary("org.elasticsearch.plugin:transport-netty3-client:5.+") // see elasticsearch-transport-6.0 module
|
||||
latestDepTestLibrary("org.elasticsearch.client:transport:5.+") // see elasticsearch-transport-6.0 module
|
||||
latestDepTestLibrary("org.springframework.data:spring-data-elasticsearch:3.0.+")
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -43,8 +43,4 @@ dependencies {
|
|||
|
||||
testLibrary("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
|
||||
testLibrary("org.springframework.boot:spring-boot-starter-tomcat:$springBootVersion")
|
||||
|
||||
// spring boot 3 uses spring 6 which requires java 17
|
||||
latestDepTestLibrary("org.springframework.boot:spring-boot-autoconfigure:2.+")
|
||||
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-tomcat:2.+")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ dependencies {
|
|||
testImplementation("com.sun.xml.bind:jaxb-impl:2.2.11")
|
||||
testImplementation("javax.activation:activation:1.1.1")
|
||||
|
||||
latestDepTestLibrary("org.hibernate:hibernate-core:3.+")
|
||||
latestDepTestLibrary("org.hibernate:hibernate-core:3.+") // see hibernate-4.0 module
|
||||
}
|
||||
|
||||
if (findProperty("testLatestDeps") as Boolean) {
|
||||
|
|
|
|||
|
|
@ -26,10 +26,6 @@ dependencies {
|
|||
testImplementation("org.hsqldb:hsqldb:2.0.0")
|
||||
testImplementation("javax.xml.bind:jaxb-api:2.3.1")
|
||||
testImplementation("org.glassfish.jaxb:jaxb-runtime:2.3.3")
|
||||
|
||||
// hibernate 6 is alpha so use 5 as latest version
|
||||
latestDepTestLibrary("org.hibernate:hibernate-core:5.+")
|
||||
latestDepTestLibrary("org.hibernate:hibernate-entitymanager:5.+")
|
||||
}
|
||||
|
||||
tasks.withType<Test>().configureEach {
|
||||
|
|
|
|||
|
|
@ -14,6 +14,4 @@ dependencies {
|
|||
library("org.jboss.resteasy:resteasy-client:3.0.0.Final")
|
||||
|
||||
implementation(project(":instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-common:javaagent"))
|
||||
|
||||
latestDepTestLibrary("org.jboss.resteasy:resteasy-client:5+")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,8 +22,7 @@ dependencies {
|
|||
testInstrumentation(project(":instrumentation:jedis:jedis-3.0:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:jedis:jedis-4.0:javaagent"))
|
||||
|
||||
// Jedis 3.0 has API changes that prevent instrumentation from applying
|
||||
latestDepTestLibrary("redis.clients:jedis:2.+")
|
||||
latestDepTestLibrary("redis.clients:jedis:2.+") // see jedis-3.0 module
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ dependencies {
|
|||
testInstrumentation(project(":instrumentation:jedis:jedis-1.4:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:jedis:jedis-4.0:javaagent"))
|
||||
|
||||
latestDepTestLibrary("redis.clients:jedis:3.+")
|
||||
latestDepTestLibrary("redis.clients:jedis:3.+") // see jedis-4.0 module
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ muzzle {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
library("org.eclipse.jetty:jetty-server:11.0.0")
|
||||
|
||||
implementation(project(":instrumentation:jetty:jetty-common:javaagent"))
|
||||
implementation(project(":instrumentation:servlet:servlet-5.0:javaagent"))
|
||||
bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
|
||||
|
||||
library("org.eclipse.jetty:jetty-server:11.0.0")
|
||||
|
||||
testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
|
||||
|
||||
testLibrary("org.eclipse.jetty:jetty-servlet:11.0.0")
|
||||
|
|
|
|||
|
|
@ -13,21 +13,17 @@ muzzle {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
library("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
|
||||
|
||||
implementation(project(":instrumentation:jetty:jetty-common:javaagent"))
|
||||
implementation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
|
||||
bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
|
||||
|
||||
library("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
|
||||
|
||||
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:jetty:jetty-11.0:javaagent"))
|
||||
|
||||
testLibrary("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901")
|
||||
testLibrary("org.eclipse.jetty:jetty-continuation:8.0.0.v20110901")
|
||||
|
||||
// Jetty 10 seems to refuse to run on java8.
|
||||
// TODO: we need to setup separate test for Jetty 10 when that is released.
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-server:9.+")
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:9.+")
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-continuation:9.+")
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-server:10.+") // see jetty-11.0 module
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:10.+") // see jetty-11.0 module
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,67 +0,0 @@
|
|||
/*
|
||||
* Copyright The OpenTelemetry Authors
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
import org.eclipse.jetty.continuation.Continuation
|
||||
import org.eclipse.jetty.continuation.ContinuationSupport
|
||||
import org.eclipse.jetty.server.Request
|
||||
import org.eclipse.jetty.server.handler.AbstractHandler
|
||||
|
||||
import javax.servlet.ServletException
|
||||
import javax.servlet.http.HttpServletRequest
|
||||
import javax.servlet.http.HttpServletResponse
|
||||
import java.util.concurrent.ExecutorService
|
||||
import java.util.concurrent.Executors
|
||||
|
||||
// FIXME: We don't currently handle jetty continuations properly (at all).
|
||||
abstract class JettyContinuationHandlerTest extends JettyHandlerTest {
|
||||
|
||||
@Override
|
||||
AbstractHandler handler() {
|
||||
ContinuationTestHandler.INSTANCE
|
||||
}
|
||||
|
||||
static class ContinuationTestHandler extends AbstractHandler {
|
||||
static final ContinuationTestHandler INSTANCE = new ContinuationTestHandler()
|
||||
final ExecutorService executorService = Executors.newSingleThreadExecutor()
|
||||
|
||||
@Override
|
||||
void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
|
||||
final Continuation continuation = ContinuationSupport.getContinuation(request)
|
||||
if (continuation.initial) {
|
||||
continuation.suspend()
|
||||
executorService.execute {
|
||||
continuation.resume()
|
||||
}
|
||||
} else {
|
||||
handleRequest(baseRequest, response)
|
||||
}
|
||||
baseRequest.handled = true
|
||||
}
|
||||
}
|
||||
|
||||
// // This server seems to generate a TEST_SPAN twice... once for the initial request, and once for the continuation.
|
||||
// void cleanAndAssertTraces(
|
||||
// final int size,
|
||||
// @ClosureParams(value = SimpleType, options = "io.opentelemetry.instrumentation.test.asserts.ListWriterAssert")
|
||||
// @DelegatesTo(value = ListWriterAssert, strategy = Closure.DELEGATE_FIRST)
|
||||
// final Closure spec) {
|
||||
//
|
||||
// // If this is failing, make sure HttpServerTestAdvice is applied correctly.
|
||||
// testWriter.waitForTraces(size * 3)
|
||||
// // testWriter is a CopyOnWriteArrayList, which doesn't support remove()
|
||||
// def toRemove = testWriter.findAll {
|
||||
// it.size() == 1 && it.get(0).name == "TEST_SPAN"
|
||||
// }
|
||||
// toRemove.each {
|
||||
// assertTrace(it, 1) {
|
||||
// basicSpan(it, 0, "TEST_SPAN")
|
||||
// }
|
||||
// }
|
||||
// assert toRemove.size() == size * 2
|
||||
// testWriter.removeAll(toRemove)
|
||||
//
|
||||
// assertTraces(size, spec)
|
||||
// }
|
||||
}
|
||||
|
|
@ -18,10 +18,6 @@ dependencies {
|
|||
// Note, we do not have a :testing library yet because there doesn't seem to be a way to have the Kotlin classes
|
||||
// available for use from Spock. We will first need to migrate HttpServerTest to be usable outside of Spock.
|
||||
testLibrary("io.ktor:ktor-server-netty:1.0.0")
|
||||
|
||||
latestDepTestLibrary("io.ktor:ktor-server-core:1.+")
|
||||
|
||||
latestDepTestLibrary("io.ktor:ktor-server-netty:1.+")
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ muzzle {
|
|||
dependencies {
|
||||
library("biz.paluch.redis:lettuce:4.0.Final")
|
||||
|
||||
latestDepTestLibrary("biz.paluch.redis:lettuce:4.+")
|
||||
latestDepTestLibrary("biz.paluch.redis:lettuce:4.+") // see lettuce-5.0 module
|
||||
}
|
||||
|
||||
tasks.withType<Test>().configureEach {
|
||||
|
|
|
|||
|
|
@ -12,12 +12,14 @@ muzzle {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("io.lettuce:lettuce-core:5.0.0.RELEASE")
|
||||
library("io.lettuce:lettuce-core:5.0.0.RELEASE")
|
||||
|
||||
implementation(project(":instrumentation:lettuce:lettuce-common:library"))
|
||||
|
||||
testImplementation("io.lettuce:lettuce-core:5.0.0.RELEASE")
|
||||
testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
|
||||
|
||||
latestDepTestLibrary("io.lettuce:lettuce-core:5.0.+") // see lettuce-5.1 module
|
||||
}
|
||||
|
||||
tasks.withType<Test>().configureEach {
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ dependencies {
|
|||
|
||||
testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2-common:testing"))
|
||||
|
||||
latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.15.+")
|
||||
latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.15.+") // see log4j-context-data-2.16
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ dependencies {
|
|||
testLibrary("io.netty:netty:3.8.0.Final")
|
||||
testLibrary("com.ning:async-http-client:1.8.0")
|
||||
|
||||
latestDepTestLibrary("io.netty:netty:3.10.+")
|
||||
latestDepTestLibrary("io.netty:netty:3.+") // see netty-4.0 module
|
||||
latestDepTestLibrary("com.ning:async-http-client:1.9.+")
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ dependencies {
|
|||
testInstrumentation(project(":instrumentation:netty:netty-3.8:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
|
||||
|
||||
latestDepTestLibrary("io.netty:netty-codec-http:4.0.56.Final")
|
||||
latestDepTestLibrary("io.netty:netty-codec-http:4.0.+")
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -36,12 +36,6 @@ dependencies {
|
|||
|
||||
// first version with kqueue, add it only as a compile time dependency
|
||||
testCompileOnly("io.netty:netty-transport-native-kqueue:4.1.11.Final:osx-x86_64")
|
||||
|
||||
latestDepTestLibrary(enforcedPlatform("io.netty:netty-bom:(,5.0)"))
|
||||
latestDepTestLibrary("io.netty:netty-codec-http:(,5.0)")
|
||||
latestDepTestLibrary("io.netty:netty-handler:(,5.0)")
|
||||
latestDepTestLibrary("io.netty:netty-transport-native-epoll:(,5.0):linux-x86_64")
|
||||
latestDepTestLibrary("io.netty:netty-transport-native-kqueue:(,5.0):osx-x86_64")
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ muzzle {
|
|||
dependencies {
|
||||
library("com.squareup.okhttp:okhttp:2.2.0")
|
||||
|
||||
latestDepTestLibrary("com.squareup.okhttp:okhttp:[2.6,3)")
|
||||
latestDepTestLibrary("com.squareup.okhttp:okhttp:2.+") // see okhttp-3.0 module
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@ dependencies {
|
|||
exclude("org.eclipse.jetty.websocket", "websocket-client")
|
||||
}
|
||||
|
||||
latestDepTestLibrary("com.typesafe.play:play-java_2.11:2.5.+")
|
||||
latestDepTestLibrary("com.typesafe.play:play-java-ws_2.11:2.5.+")
|
||||
latestDepTestLibrary("com.typesafe.play:play-test_2.11:2.5.+") {
|
||||
latestDepTestLibrary("com.typesafe.play:play-java_2.11:2.5.+") // see play-2.6 module
|
||||
latestDepTestLibrary("com.typesafe.play:play-java-ws_2.11:2.5.+") // see play-2.6 module
|
||||
latestDepTestLibrary("com.typesafe.play:play-test_2.11:2.5.+") { // see play-2.6 module
|
||||
exclude("org.eclipse.jetty.websocket", "websocket-client")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ dependencies {
|
|||
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
|
||||
testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
|
||||
|
||||
latestDepTestLibrary("io.projectreactor.netty:reactor-netty:(,1.0.0)")
|
||||
latestDepTestLibrary("io.projectreactor.netty:reactor-netty:0.+") // see reactor-netty-1.0 modules
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ dependencies {
|
|||
|
||||
testInstrumentation(project(":instrumentation:rxjava:rxjava-3.1.1:javaagent"))
|
||||
|
||||
latestDepTestLibrary("io.reactivex.rxjava3:rxjava:3.1.0")
|
||||
latestDepTestLibrary("io.reactivex.rxjava3:rxjava:3.1.0") // see rxjava-3.1.1 module
|
||||
}
|
||||
|
||||
tasks.withType<Test>().configureEach {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ dependencies {
|
|||
|
||||
testImplementation(project(":instrumentation:rxjava:rxjava-3-common:testing"))
|
||||
|
||||
latestDepTestLibrary("io.reactivex.rxjava3:rxjava:3.1.0")
|
||||
latestDepTestLibrary("io.reactivex.rxjava3:rxjava:3.1.0") // see rxjava-3.1.1 module
|
||||
}
|
||||
|
||||
tasks.withType<Test>().configureEach {
|
||||
|
|
|
|||
|
|
@ -29,6 +29,6 @@ dependencies {
|
|||
testLibrary("org.eclipse.jetty:jetty-server:7.0.0.v20091005")
|
||||
testLibrary("org.eclipse.jetty:jetty-servlet:7.0.0.v20091005")
|
||||
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-server:7.+")
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:7.+")
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-server:7.+") // see servlet-3.0 module
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:7.+") // see servlet-3.0 module
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,12 +29,11 @@ dependencies {
|
|||
testLibrary("org.apache.tomcat.embed:tomcat-embed-core:8.0.41")
|
||||
testLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:8.0.41")
|
||||
|
||||
// Jetty 10 seems to refuse to run on java8.
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-server:9.+")
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:9.+")
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-server:10.+") // see servlet-5.0 module
|
||||
latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:10.+") // see servlet-5.0 module
|
||||
|
||||
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:9.+")
|
||||
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:9.+")
|
||||
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:9.+") // see servlet-5.0 module
|
||||
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:9.+") // see servlet-5.0 module
|
||||
}
|
||||
|
||||
tasks.withType<Test>().configureEach {
|
||||
|
|
|
|||
|
|
@ -25,8 +25,9 @@ dependencies {
|
|||
|
||||
testLibrary("org.apache.tomcat.embed:tomcat-embed-core:8.0.41")
|
||||
testLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:8.0.41")
|
||||
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:[9.+, 10)")
|
||||
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:[9.+, 10)")
|
||||
|
||||
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:9.+") // see tomcat-10.0 module
|
||||
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:9.+") // see tomcat-10.0 module
|
||||
}
|
||||
|
||||
tasks.withType<Test>().configureEach {
|
||||
|
|
|
|||
|
|
@ -6,18 +6,19 @@ muzzle {
|
|||
pass {
|
||||
group.set("com.twilio.sdk")
|
||||
module.set("twilio")
|
||||
// this is first version in maven central (there's a 0.0.1 but that is really 7.14.4)
|
||||
versions.set("[6.6.9,8.0.0)")
|
||||
versions.set("(,8.0.0)")
|
||||
assertInverse.set(true)
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// this is first version in maven central (there's a 0.0.1 but that is really 7.14.4)
|
||||
library("com.twilio.sdk:twilio:6.6.9")
|
||||
|
||||
// included to make sure the apache httpclient nested spans are suppressed
|
||||
testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))
|
||||
|
||||
latestDepTestLibrary("com.twilio.sdk:twilio:7.+")
|
||||
latestDepTestLibrary("com.twilio.sdk:twilio:7.+") // documented limitation
|
||||
}
|
||||
|
||||
tasks.withType<Test>().configureEach {
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ dependencies {
|
|||
// Vert.x 4.0 is incompatible with our tests.
|
||||
// 3.9.7 Requires Netty 4.1.60, no other version works with it.
|
||||
latestDepTestLibrary(enforcedPlatform("io.netty:netty-bom:4.1.60.Final"))
|
||||
latestDepTestLibrary("io.vertx:vertx-core:3.+")
|
||||
latestDepTestLibrary("io.vertx:vertx-codegen:3.+")
|
||||
latestDepTestLibrary("io.vertx:vertx-docgen:3.+")
|
||||
latestDepTestLibrary("io.vertx:vertx-core:3.+") // see vertx-http-client-4.0 module
|
||||
latestDepTestLibrary("io.vertx:vertx-codegen:3.+") // see vertx-http-client-4.0 module
|
||||
latestDepTestLibrary("io.vertx:vertx-docgen:3.+") // see vertx-http-client-4.0 module
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
|
|
|||
Loading…
Reference in New Issue