Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use latest.release instead of + #13485

Merged
merged 3 commits into from
Mar 11, 2025
Merged

Use latest.release instead of + #13485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c92d8c7
Use latest.release instead of +
laurit Mar 10, 2025
88fe215
one more
laurit Mar 10, 2025
8c11170
Merge branch 'main' into latest-release
laurit Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion instrumentation/akka/akka-actor-2.3/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies {
compileOnly("com.typesafe.akka:akka-actor_2.11:2.3.2") // first version in maven central
testImplementation("com.typesafe.akka:akka-actor_2.11:2.3.2") // first version in maven central

latestDepTestLibrary("com.typesafe.akka:akka-actor_2.13:+")
latestDepTestLibrary("com.typesafe.akka:akka-actor_2.13:latest.release")
}

if (findProperty("testLatestDeps") as Boolean) {
Expand Down
8 changes: 4 additions & 4 deletions instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ dependencies {
testInstrumentation(project(":instrumentation:akka:akka-actor-fork-join-2.5:javaagent"))
testInstrumentation(project(":instrumentation:scala-fork-join-2.8:javaagent"))

latestDepTestLibrary("com.typesafe.akka:akka-http_2.13:+")
latestDepTestLibrary("com.typesafe.akka:akka-stream_2.13:+")
latestDepTestLibrary("com.typesafe.akka:akka-http_2.13:latest.release")
latestDepTestLibrary("com.typesafe.akka:akka-stream_2.13:latest.release")
}

testing {
suites {
val javaRouteTest by registering(JvmTestSuite::class) {
dependencies {
if (findProperty("testLatestDeps") as Boolean) {
implementation("com.typesafe.akka:akka-http_2.13:+")
implementation("com.typesafe.akka:akka-stream_2.13:+")
implementation("com.typesafe.akka:akka-http_2.13:latest.release")
implementation("com.typesafe.akka:akka-stream_2.13:latest.release")
} else {
implementation("com.typesafe.akka:akka-http_2.12:10.2.0")
implementation("com.typesafe.akka:akka-stream_2.12:2.6.21")
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ testing {
dependencies {
implementation(project(":instrumentation:apache-dubbo-2.7:testing"))
if (latestDepTest) {
implementation("org.apache.dubbo:dubbo:+")
implementation("org.apache.dubbo:dubbo-config-api:+")
implementation("org.apache.dubbo:dubbo:latest.release")
implementation("org.apache.dubbo:dubbo-config-api:latest.release")
} else {
implementation("org.apache.dubbo:dubbo:2.7.0")
implementation("org.apache.dubbo:dubbo-config-api:2.7.0")
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ testing {
val s3PresignerTest by registering(JvmTestSuite::class) {
dependencies {
if (latestDepTest) {
implementation("software.amazon.awssdk:s3:+")
implementation("software.amazon.awssdk:s3:latest.release")
} else {
implementation("software.amazon.awssdk:s3:2.10.12")
}
Expand All @@ -141,7 +141,7 @@ testing {
dependencies {
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
if (findProperty("testLatestDeps") as Boolean) {
implementation("software.amazon.awssdk:bedrockruntime:+")
implementation("software.amazon.awssdk:bedrockruntime:latest.release")
} else {
// First release with Converse API
implementation("software.amazon.awssdk:bedrockruntime:2.25.63")
Expand Down
12 changes: 6 additions & 6 deletions instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ testing {
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
compileOnly("software.amazon.awssdk:sqs:2.2.0")
if (findProperty("testLatestDeps") as Boolean) {
implementation("software.amazon.awssdk:aws-core:+")
implementation("software.amazon.awssdk:aws-json-protocol:+")
implementation("software.amazon.awssdk:dynamodb:+")
implementation("software.amazon.awssdk:lambda:+")
implementation("software.amazon.awssdk:aws-core:latest.release")
implementation("software.amazon.awssdk:aws-json-protocol:latest.release")
implementation("software.amazon.awssdk:dynamodb:latest.release")
implementation("software.amazon.awssdk:lambda:latest.release")
} else {
implementation("software.amazon.awssdk:aws-core:2.2.0")
implementation("software.amazon.awssdk:aws-json-protocol:2.2.0")
Expand All @@ -55,7 +55,7 @@ testing {
implementation(project())
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
if (findProperty("testLatestDeps") as Boolean) {
implementation("software.amazon.awssdk:lambda:+")
implementation("software.amazon.awssdk:lambda:latest.release")
} else {
implementation("software.amazon.awssdk:lambda:2.17.0")
}
Expand All @@ -67,7 +67,7 @@ testing {
implementation(project())
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
if (findProperty("testLatestDeps") as Boolean) {
implementation("software.amazon.awssdk:bedrockruntime:+")
implementation("software.amazon.awssdk:bedrockruntime:latest.release")
} else {
implementation("software.amazon.awssdk:bedrockruntime:2.25.63")
}
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/azure-core/azure-core-1.36/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ testing {
val testAzure by registering(JvmTestSuite::class) {
dependencies {
if (latestDepTest) {
implementation("com.azure:azure-core:+")
implementation("com.azure:azure-core-test:+")
implementation("com.azure:azure-core:latest.release")
implementation("com.azure:azure-core-test:latest.release")
} else {
implementation("com.azure:azure-core:1.36.0")
implementation("com.azure:azure-core-test:1.16.2")
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ testing {
val elasticsearch7Test by registering(JvmTestSuite::class) {
dependencies {
if (latestDepTest) {
implementation("org.elasticsearch.client:transport:+")
implementation("org.elasticsearch.plugin:transport-netty4-client:+")
implementation("org.elasticsearch.client:transport:latest.release")
implementation("org.elasticsearch.plugin:transport-netty4-client:latest.release")
} else {
implementation("org.elasticsearch.client:transport:7.0.0")
implementation("org.elasticsearch.plugin:transport-netty4-client:7.0.0")
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/finatra-2.9/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependencies {
// Required for older versions of finatra on JDKs >= 11
testImplementation("com.sun.activation:javax.activation:1.2.0")

finatraLatest("com.twitter:finatra-http_2.13:+") {
finatraLatest("com.twitter:finatra-http_2.13:latest.release") {
exclude("io.netty", "netty-transport-native-epoll")
}
}
Expand Down
8 changes: 4 additions & 4 deletions instrumentation/gwt-2.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ sourceSets {
dependencies {
// these are needed for compileGwt task
if (findProperty("testLatestDeps") as Boolean) {
compileOnly("org.gwtproject:gwt-user:+")
compileOnly("org.gwtproject:gwt-dev:+")
compileOnly("org.gwtproject:gwt-servlet:+")
testImplementation("org.gwtproject:gwt-servlet:+")
compileOnly("org.gwtproject:gwt-user:latest.release")
compileOnly("org.gwtproject:gwt-dev:latest.release")
compileOnly("org.gwtproject:gwt-servlet:latest.release")
testImplementation("org.gwtproject:gwt-servlet:latest.release")
} else {
compileOnly("com.google.gwt:gwt-user:2.0.0")
compileOnly("com.google.gwt:gwt-dev:2.0.0")
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/jdbc/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
testLibrary("com.mchange:c3p0:0.9.5")

// some classes in earlier versions of derby were split out into derbytools in later versions
latestDepTestLibrary("org.apache.derby:derbytools:+")
latestDepTestLibrary("org.apache.derby:derbytools:latest.release")

testImplementation(project(":instrumentation:jdbc:testing"))

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/kubernetes-client-7.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ testing {
val version20Test by registering(JvmTestSuite::class) {
dependencies {
if (findProperty("testLatestDeps") as Boolean) {
implementation("io.kubernetes:client-java-api:+")
implementation("io.kubernetes:client-java-api:latest.release")
} else {
implementation("io.kubernetes:client-java-api:20.0.0")
}
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
}

if (findProperty("testLatestDeps") as Boolean) {
testImplementation("ch.qos.logback:logback-classic:+")
testImplementation("ch.qos.logback:logback-classic:latest.release")
} else {
testImplementation("ch.qos.logback:logback-classic") {
version {
Expand Down
10 changes: 5 additions & 5 deletions instrumentation/logback/logback-appender-1.0/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {
}

if (findProperty("testLatestDeps") as Boolean) {
testImplementation("ch.qos.logback:logback-classic:+")
testImplementation("ch.qos.logback:logback-classic:latest.release")
} else {
testImplementation("ch.qos.logback:logback-classic") {
version {
Expand Down Expand Up @@ -78,9 +78,9 @@ testing {
implementation(project(":testing-common"))

if (latestDepTest) {
implementation("ch.qos.logback:logback-classic:+")
implementation("org.slf4j:slf4j-api:+")
implementation("net.logstash.logback:logstash-logback-encoder:+")
implementation("ch.qos.logback:logback-classic:latest.release")
implementation("org.slf4j:slf4j-api:latest.release")
implementation("net.logstash.logback:logstash-logback-encoder:latest.release")
} else {
implementation("ch.qos.logback:logback-classic") {
version {
Expand Down Expand Up @@ -108,7 +108,7 @@ testing {
implementation(project(":testing-common"))

if (latestDepTest) {
implementation("ch.qos.logback:logback-classic:+")
implementation("ch.qos.logback:logback-classic:latest.release")
} else {
implementation("ch.qos.logback:logback-classic") {
version {
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/logback/logback-mdc-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ testing {
withType(JvmTestSuite::class) {
dependencies {
if (findProperty("testLatestDeps") as Boolean) {
implementation("ch.qos.logback:logback-classic:+")
implementation("ch.qos.logback:logback-classic:latest.release")
} else {
implementation("ch.qos.logback:logback-classic") {
version {
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/logback/logback-mdc-1.0/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ testing {
withType(JvmTestSuite::class) {
dependencies {
if (findProperty("testLatestDeps") as Boolean) {
implementation("ch.qos.logback:logback-classic:+")
implementation("ch.qos.logback:logback-classic:latest.release")
} else {
implementation("ch.qos.logback:logback-classic") {
version {
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/okhttp/okhttp-3.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ testing {
val http2Test by registering(JvmTestSuite::class) {
dependencies {
if (testLatestDeps) {
implementation("com.squareup.okhttp3:okhttp:+")
implementation("com.squareup.okhttp3:okhttp:latest.release")
compileOnly("com.google.android:annotations:4.1.1.4")
} else {
implementation("com.squareup.okhttp3:okhttp:3.11.0")
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/okhttp/okhttp-3.0/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ testing {
dependencies {
implementation(project())
if (testLatestDeps) {
implementation("com.squareup.okhttp3:okhttp:+")
implementation("com.squareup.okhttp3:okhttp:latest.release")
compileOnly("com.google.android:annotations:4.1.1.4")
} else {
implementation("com.squareup.okhttp3:okhttp:3.11.0")
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/pekko/pekko-actor-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {

library("org.apache.pekko:pekko-actor_2.12:1.0.1")

latestDepTestLibrary("org.apache.pekko:pekko-actor_2.13:+")
latestDepTestLibrary("org.apache.pekko:pekko-actor_2.13:latest.release")

testImplementation(project(":instrumentation:executors:testing"))
}
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/play/play-ws/play-ws-2.1/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ testing {
suites {
val latestDepTest by registering(JvmTestSuite::class) {
dependencies {
implementation("com.typesafe.play:play-ahc-ws-standalone_2.13:+")
implementation("com.typesafe.play:play-ahc-ws-standalone_2.13:latest.release")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ testing {
implementation(project(":instrumentation:reactor:reactor-3.1:library"))
implementation(project(":instrumentation-annotations"))
if (findProperty("testLatestDeps") as Boolean) {
implementation("io.projectreactor:reactor-test:+")
implementation("io.projectreactor:reactor-test:latest.release")
} else {
implementation("io.projectreactor:reactor-test:3.1.0.RELEASE")
}
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/reactor/reactor-kafka-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ testing {
implementation(project(":instrumentation:reactor:reactor-kafka-1.0:testing"))

if (testLatestDeps) {
implementation("io.projectreactor.kafka:reactor-kafka:+")
implementation("io.projectreactor.kafka:reactor-kafka:latest.release")
implementation("io.projectreactor:reactor-core:3.4.+")
} else {
implementation("io.projectreactor.kafka:reactor-kafka:1.3.3")
Expand All @@ -65,7 +65,7 @@ testing {
implementation(project(":instrumentation:reactor:reactor-kafka-1.0:testing"))

if (testLatestDeps) {
implementation("io.projectreactor.kafka:reactor-kafka:+")
implementation("io.projectreactor.kafka:reactor-kafka:latest.release")
implementation("io.projectreactor:reactor-core:3.4.+")
} else {
implementation("io.projectreactor.kafka:reactor-kafka:1.3.21")
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/rediscala-1.8/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ muzzle {
dependencies {
library("com.github.etaty:rediscala_2.11:1.8.0")

latestDepTestLibrary("io.github.rediscala:rediscala_2.13:+")
latestDepTestLibrary("io.github.rediscala:rediscala_2.13:latest.release")
}

tasks {
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
implementation(project(":instrumentation:micrometer:micrometer-1.5:javaagent"))

// dependency management pins logback-classic to 1.3 which is the last release that supports java 8
latestDepTestLibrary("ch.qos.logback:logback-classic:+")
latestDepTestLibrary("ch.qos.logback:logback-classic:latest.release")
}

tasks.withType<Test>().configureEach {
Expand Down
6 changes: 3 additions & 3 deletions instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ testing {

// the "library" configuration is not recognized by the test suite plugin
if (latestDepTest) {
implementation("org.springframework.kafka:spring-kafka:+")
implementation("org.springframework.boot:spring-boot-starter-test:+")
implementation("org.springframework.boot:spring-boot-starter:+")
implementation("org.springframework.kafka:spring-kafka:latest.release")
implementation("org.springframework.boot:spring-boot-starter-test:latest.release")
implementation("org.springframework.boot:spring-boot-starter:latest.release")
} else {
implementation("org.springframework.kafka:spring-kafka:2.7.0")
implementation("org.springframework.boot:spring-boot-starter-test:2.5.3")
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/tomcat/tomcat-10.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

library("org.apache.tomcat.embed:tomcat-embed-core:10.0.0")

latestDepTestLibrary("org.apache.tomcat:jakartaee-migration:+")
latestDepTestLibrary("org.apache.tomcat:jakartaee-migration:latest.release")

// Make sure nothing breaks due to both 7.0 and 10.0 modules being present together
testInstrumentation(project(":instrumentation:tomcat:tomcat-7.0:javaagent"))
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/zio/zio-2.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {

testImplementation("dev.zio:zio_$scalaVersion:$zioVersion")

latestDepTestLibrary("dev.zio:zio_$scalaVersion:+")
latestDepTestLibrary("dev.zio:zio_$scalaVersion:latest.release")
}

tasks {
Expand Down
Loading