Skip to content

Commit 269cec8

Browse files
committed
Reorder dependencies (google-collections) to not hit Gradle bug 22326
gradle/gradle#22326
1 parent c6ffc00 commit 269cec8

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

samples/sample-all-deactivated/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ dependencies {
1414
implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1")
1515
implementation("com.google.code.findbugs:annotations:3.0.1")
1616
implementation("com.google.code.findbugs:findbugs-annotations:3.0.1")
17-
implementation("com.google.collections:google-collections:1.0")
1817
implementation("com.google.guava:guava-jdk5:17.0")
1918
implementation("com.google.guava:guava:33.0.0-jre")
2019
implementation("com.google.guava:listenablefuture:1.0")
@@ -250,6 +249,7 @@ dependencies {
250249
implementation("velocity:velocity:1.4")
251250
implementation("woodstox:wstx-asl:2.9.3")
252251

252+
implementation("com.google.collections:google-collections:1.0")
253253
implementation("com.sun.activation:jakarta.activation:2.0.1")
254254
implementation("org.bouncycastle:bc-fips-debug:1.0.2.3")
255255
implementation("org.bouncycastle:bc-fips:1.0.2.3")

samples/sample-all-deactivated/build.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ compileClasspath - Compile classpath for source set 'main'.
1313
+--- com.github.stephenc.jcip:jcip-annotations:1.0-1 FAILED
1414
+--- com.google.code.findbugs:annotations:3.0.1 FAILED
1515
+--- com.google.code.findbugs:findbugs-annotations:3.0.1 FAILED
16-
+--- com.google.collections:google-collections:1.0 FAILED
1716
+--- com.google.guava:guava-jdk5:17.0 FAILED
1817
+--- com.google.guava:guava:33.0.0-jre FAILED
1918
+--- com.google.guava:listenablefuture:1.0 FAILED
@@ -245,6 +244,7 @@ compileClasspath - Compile classpath for source set 'main'.
245244
+--- stax:stax-api:1.0.1 FAILED
246245
+--- velocity:velocity:1.4 FAILED
247246
+--- woodstox:wstx-asl:2.9.3 FAILED
247+
+--- com.google.collections:google-collections:1.0 FAILED
248248
+--- com.sun.activation:jakarta.activation:2.0.1 FAILED
249249
+--- org.bouncycastle:bc-fips-debug:1.0.2.3 FAILED
250250
+--- org.bouncycastle:bc-fips:1.0.2.3 FAILED

samples/sample-all/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ dependencies {
1717
implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1")
1818
implementation("com.google.code.findbugs:annotations:3.0.1")
1919
implementation("com.google.code.findbugs:findbugs-annotations:3.0.1")
20-
implementation("com.google.collections:google-collections:1.0")
2120
implementation("com.google.guava:guava-jdk5:17.0")
2221
implementation("com.google.guava:guava:33.0.0-jre")
2322
implementation("com.google.guava:listenablefuture:1.0")
@@ -240,6 +239,7 @@ dependencies {
240239
// Also, some dependencies disappear completely in the result (instead of showing what they have been substituted with).
241240
// E.g.: 'org.bouncycastle:bcprov-*' do not show up as direct dependencies in the ':dependencies' report (or build scan),
242241
// although they are declared in this file.
242+
implementation("com.google.collections:google-collections:1.0")
243243
implementation("com.sun.activation:jakarta.activation:2.0.1")
244244
implementation("org.bouncycastle:bc-fips-debug:1.0.2.3")
245245
implementation("org.bouncycastle:bc-fips:1.0.2.3")

samples/sample-all/build.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@ compileClasspath - Compile classpath for source set 'main'.
3131
+--- com.github.stephenc.jcip:jcip-annotations:1.0-1 -> net.jcip:jcip-annotations:1.0
3232
+--- com.google.code.findbugs:annotations:3.0.1 -> com.github.spotbugs:spotbugs-annotations:4.8.3 (*)
3333
+--- com.google.code.findbugs:findbugs-annotations:3.0.1 -> com.github.spotbugs:spotbugs-annotations:4.8.3 (*)
34-
+--- com.google.collections:google-collections:1.0 -> com.google.guava:guava:33.0.0-jre
34+
+--- com.google.guava:guava-jdk5:17.0 -> com.google.guava:guava:33.0.0-jre
3535
| +--- com.google.guava:failureaccess:1.0.2
3636
| +--- com.google.code.findbugs:jsr305:3.0.2
3737
| +--- org.checkerframework:checker-qual:3.41.0
3838
| +--- com.google.errorprone:error_prone_annotations:2.23.0
3939
| \--- com.google.j2objc:j2objc-annotations:2.8
40-
+--- com.google.guava:guava-jdk5:17.0 -> com.google.guava:guava:33.0.0-jre (*)
4140
+--- com.google.guava:guava:33.0.0-jre (*)
4241
+--- com.google.guava:listenablefuture:1.0 -> com.google.guava:guava:33.0.0-jre (*)
4342
+--- com.intellij:annotations:12.0 -> org.jetbrains:annotations:24.0.0
@@ -282,6 +281,7 @@ compileClasspath - Compile classpath for source set 'main'.
282281
+--- servletapi:servletapi:2.4 -> javax.servlet:javax.servlet-api:4.0.1
283282
+--- velocity:velocity:1.4 -> org.apache.velocity:velocity-engine-core:2.3 (*)
284283
+--- woodstox:wstx-asl:2.9.3 -> org.codehaus.woodstox:woodstox-core-asl:4.4.1 (*)
284+
+--- com.google.collections:google-collections:1.0 -> com.google.guava:guava:33.0.0-jre (*)
285285
+--- com.sun.activation:jakarta.activation:2.0.1
286286
+--- org.bouncycastle:bc-fips-debug:1.0.2.3 -> org.bouncycastle:bcprov-jdk12:130
287287
+--- org.bouncycastle:bc-fips:1.0.2.3 -> org.bouncycastle:bcprov-jdk12:130

0 commit comments

Comments
 (0)