Skip to content

Commit 1ff05cb

Browse files
lauritlaurit
authored
Shorten latest dep version selection in suites (#13984)
1 parent a10f921 commit 1ff05cb

File tree

7 files changed

+37
-78
lines changed

7 files changed

+37
-78
lines changed

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -132,24 +132,16 @@ testing {
132132
suites {
133133
val s3PresignerTest by registering(JvmTestSuite::class) {
134134
dependencies {
135-
if (latestDepTest) {
136-
implementation("software.amazon.awssdk:s3:latest.release")
137-
} else {
138-
implementation("software.amazon.awssdk:s3:2.10.12")
139-
}
135+
val version = if (latestDepTest) "latest.release" else "2.10.12"
136+
implementation("software.amazon.awssdk:s3:$version")
140137
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:library"))
141138
}
142139
}
143140

144141
val s3CrtTest by registering(JvmTestSuite::class) {
145142
dependencies {
146-
if (latestDepTest) {
147-
implementation("software.amazon.awssdk:s3:latest.release")
148-
implementation("software.amazon.awssdk.crt:aws-crt:latest.release")
149-
} else {
150-
implementation("software.amazon.awssdk:s3:2.27.21")
151-
implementation("software.amazon.awssdk.crt:aws-crt:0.30.11")
152-
}
143+
implementation("software.amazon.awssdk:s3:" + if (latestDepTest) "latest.release" else "2.27.21")
144+
implementation("software.amazon.awssdk.crt:aws-crt:" + if (latestDepTest) "latest.release" else "0.30.11")
153145
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:library"))
154146
implementation("org.testcontainers:localstack")
155147
}
@@ -158,12 +150,9 @@ testing {
158150
val testBedrockRuntime by registering(JvmTestSuite::class) {
159151
dependencies {
160152
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
161-
if (findProperty("testLatestDeps") as Boolean) {
162-
implementation("software.amazon.awssdk:bedrockruntime:latest.release")
163-
} else {
164-
// First release with Converse API
165-
implementation("software.amazon.awssdk:bedrockruntime:2.25.63")
166-
}
153+
// 2.25.63 is the first release with Converse API
154+
val version = if (latestDepTest) "latest.release" else "2.25.63"
155+
implementation("software.amazon.awssdk:bedrockruntime:$version")
167156
}
168157

169158
targets {

‎instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,48 +29,38 @@ dependencies {
2929
testLibrary("software.amazon.awssdk:ses:2.2.0")
3030
}
3131

32+
val testLatestDeps = findProperty("testLatestDeps") as Boolean
33+
3234
testing {
3335
suites {
3436
val testCoreOnly by registering(JvmTestSuite::class) {
3537
dependencies {
3638
implementation(project())
3739
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
3840
compileOnly("software.amazon.awssdk:sqs:2.2.0")
39-
if (findProperty("testLatestDeps") as Boolean) {
40-
implementation("software.amazon.awssdk:aws-core:latest.release")
41-
implementation("software.amazon.awssdk:aws-json-protocol:latest.release")
42-
implementation("software.amazon.awssdk:dynamodb:latest.release")
43-
implementation("software.amazon.awssdk:lambda:latest.release")
44-
} else {
45-
implementation("software.amazon.awssdk:aws-core:2.2.0")
46-
implementation("software.amazon.awssdk:aws-json-protocol:2.2.0")
47-
implementation("software.amazon.awssdk:dynamodb:2.2.0")
48-
implementation("software.amazon.awssdk:lambda:2.2.0")
49-
}
41+
val version = if (testLatestDeps) "latest.release" else "2.2.0"
42+
implementation("software.amazon.awssdk:aws-core:$version")
43+
implementation("software.amazon.awssdk:aws-json-protocol:$version")
44+
implementation("software.amazon.awssdk:dynamodb:$version")
45+
implementation("software.amazon.awssdk:lambda:$version")
5046
}
5147
}
5248

5349
val testLambda by registering(JvmTestSuite::class) {
5450
dependencies {
5551
implementation(project())
5652
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
57-
if (findProperty("testLatestDeps") as Boolean) {
58-
implementation("software.amazon.awssdk:lambda:latest.release")
59-
} else {
60-
implementation("software.amazon.awssdk:lambda:2.17.0")
61-
}
53+
val version = if (testLatestDeps) "latest.release" else "2.17.0"
54+
implementation("software.amazon.awssdk:lambda:$version")
6255
}
6356
}
6457

6558
val testBedrockRuntime by registering(JvmTestSuite::class) {
6659
dependencies {
6760
implementation(project())
6861
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
69-
if (findProperty("testLatestDeps") as Boolean) {
70-
implementation("software.amazon.awssdk:bedrockruntime:latest.release")
71-
} else {
72-
implementation("software.amazon.awssdk:bedrockruntime:2.25.63")
73-
}
62+
val version = if (testLatestDeps) "latest.release" else "2.25.63"
63+
implementation("software.amazon.awssdk:bedrockruntime:$version")
7464
}
7565
}
7666
}

‎instrumentation/azure-core/azure-core-1.19/javaagent/build.gradle.kts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,8 @@ testing {
3939
// extracted to the output directory are not available during tests
4040
val testAzure by registering(JvmTestSuite::class) {
4141
dependencies {
42-
if (latestDepTest) {
43-
implementation("com.azure:azure-core:1.35.0")
44-
} else {
45-
implementation("com.azure:azure-core:1.19.0")
46-
}
42+
val version = if (latestDepTest) "1.35.0" else "1.19.0"
43+
implementation("com.azure:azure-core:$version")
4744
}
4845
}
4946
}

‎instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,23 +63,17 @@ testing {
6363
implementation("javax.faces:jsf-api:1.2")
6464
implementation("com.sun.facelets:jsf-facelets:1.1.14")
6565

66-
if (latestDepTest) {
67-
implementation("javax.faces:jsf-impl:1.+")
68-
} else {
69-
implementation("javax.faces:jsf-impl:1.2_04")
70-
}
66+
val version = if (latestDepTest) "1.+" else "1.2_04"
67+
implementation("javax.faces:jsf-impl:$version")
7168
}
7269
}
7370

7471
val mojarra2Test by registering(JvmTestSuite::class) {
7572
dependencies {
7673
implementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
7774

78-
if (latestDepTest) {
79-
implementation("org.glassfish:jakarta.faces:2.+")
80-
} else {
81-
implementation("org.glassfish:javax.faces:2.2.0")
82-
}
75+
val version = if (latestDepTest) "2.+" else "2.2.0"
76+
implementation("org.glassfish:javax.faces:$version")
8377
}
8478
}
8579
}

‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,8 @@ testing {
3131
implementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
3232
implementation("com.sun.facelets:jsf-facelets:1.1.14")
3333

34-
if (latestDepTest) {
35-
implementation("org.apache.myfaces.core:myfaces-impl:1.2.+")
36-
} else {
37-
implementation("org.apache.myfaces.core:myfaces-impl:1.2.2")
38-
}
34+
val version = if (latestDepTest) "1.2.+" else "1.2.2"
35+
implementation("org.apache.myfaces.core:myfaces-impl:$version")
3936
}
4037
}
4138

@@ -45,11 +42,8 @@ testing {
4542
implementation("javax.xml.bind:jaxb-api:2.2.11")
4643
implementation("com.sun.xml.bind:jaxb-impl:2.2.11")
4744

48-
if (latestDepTest) {
49-
implementation("org.apache.myfaces.core:myfaces-impl:2.+")
50-
} else {
51-
implementation("org.apache.myfaces.core:myfaces-impl:2.2.0")
52-
}
45+
val version = if (latestDepTest) "2.+" else "2.2.0"
46+
implementation("org.apache.myfaces.core:myfaces-impl:$version")
5347
}
5448
}
5549
}

‎instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,16 @@ dependencies {
4141
testImplementation("io.opentelemetry:opentelemetry-extension-annotations")
4242
}
4343

44+
val testLatestDeps = findProperty("testLatestDeps") as Boolean
45+
4446
testing {
4547
suites {
4648
val testInitialization by registering(JvmTestSuite::class) {
4749
dependencies {
4850
implementation(project(":instrumentation:reactor:reactor-3.1:library"))
4951
implementation(project(":instrumentation-annotations"))
50-
if (findProperty("testLatestDeps") as Boolean) {
51-
implementation("io.projectreactor:reactor-test:latest.release")
52-
} else {
53-
implementation("io.projectreactor:reactor-test:3.1.0.RELEASE")
54-
}
52+
val version = if (testLatestDeps) "latest.release" else "3.1.0.RELEASE"
53+
implementation("io.projectreactor:reactor-test:$version")
5554
}
5655
}
5756
}

‎instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,11 @@ testing {
4040
implementation(project(":instrumentation:spring:spring-kafka-2.7:testing"))
4141

4242
// the "library" configuration is not recognized by the test suite plugin
43-
if (latestDepTest) {
44-
implementation("org.springframework.kafka:spring-kafka:latest.release")
45-
implementation("org.springframework.boot:spring-boot-starter-test:latest.release")
46-
implementation("org.springframework.boot:spring-boot-starter:latest.release")
47-
} else {
48-
implementation("org.springframework.kafka:spring-kafka:2.7.0")
49-
implementation("org.springframework.boot:spring-boot-starter-test:2.5.3")
50-
implementation("org.springframework.boot:spring-boot-starter:2.5.3")
51-
}
43+
val springKafkaVersion = if (latestDepTest) "latest.release" else "2.7.0"
44+
val springBootVersion = if (latestDepTest) "latest.release" else "2.5.3"
45+
implementation("org.springframework.kafka:spring-kafka:$springKafkaVersion")
46+
implementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
47+
implementation("org.springframework.boot:spring-boot-starter:$springBootVersion")
5248
}
5349

5450
targets {

0 commit comments

Comments
 (0)