Skip to content

Commit d8f6f4d

Browse files
committed
Upgrade to Gradle 9.2.0
* Bring back the optional Groovy operator for XSD files collection in the `schemaZip` Gradle task * Move classpath gathering from Java modules for aggregated Javadoc task to the `doFirst` * Fix `ConsumerConnectionRecoveryTests` for the deprecation warning on the `RabbitMQContainer` class
1 parent f0eae28 commit d8f6f4d

File tree

5 files changed

+8
-16
lines changed

5 files changed

+8
-16
lines changed

build.gradle

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,9 @@ javadoc {
545545
}
546546

547547
destinationDir = file('build/api')
548-
classpath = files().from { files(javaProjects.collect { it.sourceSets.main.compileClasspath }) }
548+
doFirst {
549+
classpath += files(javaProjects.collect { it.sourceSets.main.compileClasspath })
550+
}
549551
}
550552

551553
tasks.register('api') {
@@ -569,18 +571,9 @@ tasks.register('schemaZip', Zip) {
569571
shortName = 'rabbit'
570572
}
571573

572-
/* TODO until Gradle 9.1.1 or 9.2
573574
subproject.sourceSets.main.resources.find {
574575
it.path.endsWith("META-INF${File.separator}spring.schemas")
575-
}?.withInputStream { schemas.load(it) }*/
576-
577-
File schemasFile = subproject.sourceSets.main.resources.find {
578-
it.path.endsWith("META-INF${File.separator}spring.schemas")
579-
}
580-
581-
if (schemasFile) {
582-
schemasFile.withInputStream { schemas.load(it) }
583-
}
576+
}?.withInputStream { schemas.load(it) }
584577

585578
for (def key : schemas.keySet()) {
586579
File xsdFile = subproject.sourceSets.main.resources.find {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xms512m -Xmx4g -Dfile.encoding=UTF-8
33
org.gradle.daemon=true
44
org.gradle.caching=true
55
org.gradle.parallel=true
6-
#org.gradle.configuration-cache=true
6+
org.gradle.configuration-cache=false
77
kotlin.stdlib.default.dependency=false

gradle/wrapper/gradle-wrapper.jar

176 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
3+
distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/ConsumerConnectionRecoveryTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import java.util.concurrent.TimeUnit;
2222

2323
import org.junit.jupiter.api.Test;
24-
import org.testcontainers.containers.RabbitMQContainer;
2524
import org.testcontainers.junit.jupiter.Container;
2625
import org.testcontainers.junit.jupiter.Testcontainers;
26+
import org.testcontainers.rabbitmq.RabbitMQContainer;
2727
import org.testcontainers.utility.DockerImageName;
2828

2929
import org.springframework.amqp.rabbit.annotation.EnableRabbit;
@@ -40,7 +40,6 @@
4040

4141
import static org.assertj.core.api.Assertions.assertThat;
4242

43-
4443
/**
4544
* @author Artem Bilan
4645
*

0 commit comments

Comments
 (0)