Skip to content

Commit b6c6521

Browse files
authored
Pin aws sqs version to fix latest dep tests (#9832)
1 parent e3aab65 commit b6c6521

File tree

6 files changed

+39
-5
lines changed

6 files changed

+39
-5
lines changed

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts

+15-2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ dependencies {
6161

6262
// needed by S3
6363
testImplementation("javax.xml.bind:jaxb-api:2.3.1")
64+
65+
// last version that does not use json protocol
66+
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583")
6467
}
6568

6669
testing {
@@ -94,7 +97,12 @@ testing {
9497
dependencies {
9598
implementation(project(":instrumentation:aws-sdk:aws-sdk-1.11:testing"))
9699

97-
implementation("com.amazonaws:aws-java-sdk-sqs:1.11.106")
100+
if (findProperty("testLatestDeps") as Boolean) {
101+
// last version that does not use json protocol
102+
implementation("com.amazonaws:aws-java-sdk-sqs:1.12.583")
103+
} else {
104+
implementation("com.amazonaws:aws-java-sdk-sqs:1.11.106")
105+
}
98106
}
99107

100108
targets {
@@ -110,7 +118,12 @@ testing {
110118
dependencies {
111119
implementation(project(":instrumentation:aws-sdk:aws-sdk-1.11:testing"))
112120

113-
implementation("com.amazonaws:aws-java-sdk-sqs:1.11.106")
121+
if (findProperty("testLatestDeps") as Boolean) {
122+
// last version that does not use json protocol
123+
implementation("com.amazonaws:aws-java-sdk-sqs:1.12.583")
124+
} else {
125+
implementation("com.amazonaws:aws-java-sdk-sqs:1.11.106")
126+
}
114127
}
115128
}
116129
}

instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ dependencies {
1818
testLibrary("com.amazonaws:aws-java-sdk-dynamodb:1.11.106")
1919
testLibrary("com.amazonaws:aws-java-sdk-sns:1.11.106")
2020
testLibrary("com.amazonaws:aws-java-sdk-sqs:1.11.106")
21+
22+
// last version that does not use json protocol
23+
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583")
2124
}
2225

2326
tasks {

instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts

+3
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ dependencies {
1717
testLibrary("com.amazonaws:aws-java-sdk-kinesis:1.11.106")
1818
testLibrary("com.amazonaws:aws-java-sdk-dynamodb:1.11.106")
1919
testLibrary("com.amazonaws:aws-java-sdk-sns:1.11.106")
20+
21+
// last version that does not use json protocol
22+
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583")
2023
}

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

+3
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ dependencies {
8484
testLibrary("software.amazon.awssdk:sqs:2.2.0")
8585
testLibrary("software.amazon.awssdk:sns:2.2.0")
8686
testLibrary("software.amazon.awssdk:ses:2.2.0")
87+
88+
// last version that does not use json protocol
89+
latestDepTestLibrary("software.amazon.awssdk:sqs:2.21.17")
8790
}
8891

8992
val latestDepTest = findProperty("testLatestDeps") as Boolean

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

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ dependencies {
1919
testLibrary("software.amazon.awssdk:s3:2.2.0")
2020
testLibrary("software.amazon.awssdk:sqs:2.2.0")
2121
testLibrary("software.amazon.awssdk:sns:2.2.0")
22+
23+
// last version that does not use json protocol
24+
latestDepTestLibrary("software.amazon.awssdk:sqs:2.21.17")
2225
}
2326

2427
tasks {

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

+12-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ dependencies {
1919
testLibrary("software.amazon.awssdk:rds:2.2.0")
2020
testLibrary("software.amazon.awssdk:s3:2.2.0")
2121
testLibrary("software.amazon.awssdk:ses:2.2.0")
22+
23+
// last version that does not use json protocol
24+
latestDepTestLibrary("software.amazon.awssdk:sqs:2.21.17")
2225
}
2326

2427
testing {
@@ -33,9 +36,15 @@ testing {
3336
dependencies {
3437
implementation(project())
3538
implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
36-
implementation("software.amazon.awssdk:aws-core:2.2.0")
37-
implementation("software.amazon.awssdk:aws-json-protocol:2.2.0")
38-
implementation("software.amazon.awssdk:dynamodb:2.2.0")
39+
if (findProperty("testLatestDeps") as Boolean) {
40+
implementation("software.amazon.awssdk:aws-core:+")
41+
implementation("software.amazon.awssdk:aws-json-protocol:+")
42+
implementation("software.amazon.awssdk:dynamodb:+")
43+
} else {
44+
implementation("software.amazon.awssdk:aws-core:2.2.0")
45+
implementation("software.amazon.awssdk:aws-json-protocol:2.2.0")
46+
implementation("software.amazon.awssdk:dynamodb:2.2.0")
47+
}
3948
}
4049
}
4150
}

0 commit comments

Comments
 (0)