Skip to content

Commit c526b3b

Browse files
theqeeqezsjohnr
theqeeqez
authored and
sjohnr
committed
Update to Gradle 8.6
* Bump gradle wrapper from 8.3 to 8.6 * Replace deprecated method call * New versions don't use deprecated gradle features * Bump build-info-extractor-gradle from 5.1.10 to 5.1.14 * Use default junit initialization method Otherwise, gradle shows deprecation message * Set versions for properties according to gradle build
1 parent 016be71 commit c526b3b

File tree

13 files changed

+52
-52
lines changed

13 files changed

+52
-52
lines changed

‎api/github/github-api.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ dependencies {
77
api "com.fasterxml.jackson.core:jackson-databind"
88
api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
99

10-
testImplementation "org.junit.jupiter:junit-jupiter-api"
11-
testImplementation "org.junit.jupiter:junit-jupiter-params"
12-
testImplementation "org.junit.jupiter:junit-jupiter-engine"
10+
testImplementation "org.junit.jupiter:junit-jupiter"
11+
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
12+
1313
testImplementation "org.assertj:assertj-core"
1414
testImplementation "org.mockito:mockito-core"
1515
testImplementation "com.squareup.okhttp3:mockwebserver"

‎api/sagan/sagan-api.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ dependencies {
77
api "com.fasterxml.jackson.core:jackson-databind"
88
api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
99

10-
testImplementation "org.junit.jupiter:junit-jupiter-api"
11-
testImplementation "org.junit.jupiter:junit-jupiter-params"
12-
testImplementation "org.junit.jupiter:junit-jupiter-engine"
10+
testImplementation "org.junit.jupiter:junit-jupiter"
11+
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
12+
1313
testImplementation "org.assertj:assertj-core"
1414
testImplementation "org.mockito:mockito-core"
1515
testImplementation "com.squareup.okhttp3:mockwebserver"

‎buildSrc/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ repositories {
1616
}
1717

1818
dependencies {
19-
implementation "io.github.gradle-nexus:publish-plugin:1.3.0"
20-
implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.39"
19+
implementation "io.github.gradle-nexus:publish-plugin:2.0.0-rc-2"
20+
implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.41"
2121
implementation "io.spring.nohttp:nohttp-gradle:0.0.11"
22-
implementation "org.jfrog.buildinfo:build-info-extractor-gradle:5.1.10"
22+
implementation "org.jfrog.buildinfo:build-info-extractor-gradle:5.1.14"
2323
}

‎buildSrc/src/main/java/org/springframework/gradle/checkstyle/SpringJavaCheckstylePlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
public class SpringJavaCheckstylePlugin implements Plugin<Project> {
3838
private static final String CHECKSTYLE_DIR = "etc/checkstyle";
3939
private static final String SPRING_JAVAFORMAT_VERSION_PROPERTY = "springJavaformatVersion";
40-
private static final String DEFAULT_SPRING_JAVAFORMAT_VERSION = "0.0.31";
40+
private static final String DEFAULT_SPRING_JAVAFORMAT_VERSION = "0.0.41";
4141
private static final String NOHTTP_CHECKSTYLE_VERSION_PROPERTY = "nohttpCheckstyleVersion";
42-
private static final String DEFAULT_NOHTTP_CHECKSTYLE_VERSION = "0.0.10";
42+
private static final String DEFAULT_NOHTTP_CHECKSTYLE_VERSION = "0.0.11";
4343
private static final String CHECKSTYLE_TOOL_VERSION_PROPERTY = "checkstyleToolVersion";
4444
private static final String DEFAULT_CHECKSTYLE_TOOL_VERSION = "8.34";
4545
private static final String SPRING_JAVAFORMAT_EXCLUDE_PACKAGES_PROPERTY = "springJavaformatExcludePackages";

‎buildSrc/src/main/java/org/springframework/gradle/maven/SpringPublishLocalPlugin.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
* @author Steve Riesenberg
2828
*/
2929
public class SpringPublishLocalPlugin implements Plugin<Project> {
30-
@Override
31-
public void apply(Project project) {
32-
project.getPlugins().withType(MavenPublishPlugin.class, (mavenPublish) -> {
33-
PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
34-
publishing.getRepositories().maven((maven) -> {
35-
maven.setName("local");
36-
maven.setUrl(new File(project.getRootProject().getBuildDir(), "publications/repos"));
37-
});
38-
});
39-
}
30+
@Override
31+
public void apply(Project project) {
32+
project.getPlugins().withType(MavenPublishPlugin.class, (mavenPublish) -> {
33+
PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
34+
publishing.getRepositories().maven((maven) -> {
35+
maven.setName("local");
36+
maven.setUrl(new File(project.getRootProject().getLayout().getBuildDirectory().getAsFile().get(), "publications/repos"));
37+
});
38+
});
39+
}
4040
}

‎core/spring-security-release-tools-core.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ dependencies {
1212
compileOnly project(":github-api")
1313
compileOnly project(":sagan-api")
1414

15-
testImplementation "org.junit.jupiter:junit-jupiter-api"
16-
testImplementation "org.junit.jupiter:junit-jupiter-params"
17-
testImplementation "org.junit.jupiter:junit-jupiter-engine"
15+
testImplementation "org.junit.jupiter:junit-jupiter"
16+
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
17+
1818
testImplementation "org.assertj:assertj-core"
1919
testImplementation "org.mockito:mockito-core"
2020
}

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ version=1.0.3-SNAPSHOT
22
org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
33
org.gradle.parallel=true
44
org.gradle.caching=true
5-
springJavaformatVersion=0.0.31
5+
springJavaformatVersion=0.0.41
66
springJavaformatExcludePackages=io/spring
77
checkstyleToolVersion=8.34
8-
nohttpCheckstyleVersion=0.0.10
8+
nohttpCheckstyleVersion=0.0.11
99
jacocoToolVersion=0.8.7

‎gradle/wrapper/gradle-wrapper.jar

-19.8 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145145
case $MAX_FD in #(
146146
max*)
147147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
149149
MAX_FD=$( ulimit -H -n ) ||
150150
warn "Could not query maximum file descriptor limit"
151151
esac
152152
case $MAX_FD in #(
153153
'' | soft) :;; #(
154154
*)
155155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
157157
ulimit -n "$MAX_FD" ||
158158
warn "Could not set maximum file descriptor limit to $MAX_FD"
159159
esac
@@ -202,11 +202,11 @@ fi
202202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204204

205-
# Collect all arguments for the java command;
206-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207-
# shell script including quotes and variable substitutions, so put them in
208-
# double quotes to make sure that they get re-expanded; and
209-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
210210

211211
set -- \
212212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)