Skip to content

Commit a05d89d

Browse files
theqeeqezjgrandja
theqeeqez
authored and
jgrandja
committed
Update to Gradle 8.6
Closes spring-projectsgh-1535
1 parent 2004ba1 commit a05d89d

14 files changed

+234
-163
lines changed

Diff for: ‎buildSrc/build.gradle

+7-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ plugins {
44
id "groovy"
55
}
66

7-
sourceCompatibility = JavaVersion.VERSION_17
7+
java {
8+
sourceCompatibility = JavaVersion.VERSION_17
9+
}
810

911
repositories {
1012
gradlePluginPortal()
@@ -14,14 +16,14 @@ repositories {
1416

1517
dependencies {
1618
implementation "com.github.ben-manes:gradle-versions-plugin:0.38.0"
17-
implementation "io.github.gradle-nexus:publish-plugin:1.1.0"
18-
implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.31"
19-
implementation "io.spring.nohttp:nohttp-gradle:0.0.10"
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"
21+
implementation "io.spring.nohttp:nohttp-gradle:0.0.11"
2022
implementation "org.asciidoctor:asciidoctor-gradle-jvm:3.3.2"
2123
implementation "org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.3.2"
2224
implementation "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
2325
implementation "org.hidetake:gradle-ssh-plugin:2.10.1"
24-
implementation "org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0"
26+
implementation "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0"
2527
implementation "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"
2628
implementation "org.springframework:spring-core:6.0.11"
2729
}

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

+2-2
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";

Diff for: ‎buildSrc/src/main/java/org/springframework/gradle/maven/SpringArtifactoryPlugin.java

+14-17
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,22 @@ public void apply(Project project) {
3636
// Apply artifactory repository configuration
3737
boolean isSnapshot = ProjectUtils.isSnapshot(project);
3838
boolean isMilestone = ProjectUtils.isMilestone(project);
39+
String artifactoryUsername = (String) project.findProperty("artifactoryUsername");
40+
String artifactoryPassword = (String) project.findProperty("artifactoryPassword");
3941

40-
@SuppressWarnings("deprecation")
41-
ArtifactoryPluginConvention artifactoryExtension = project.getConvention().getPlugin(ArtifactoryPluginConvention.class);
42-
artifactoryExtension.artifactory((artifactory) -> {
43-
artifactory.setContextUrl("https://repo.spring.io");
44-
artifactory.publish((publish) -> {
45-
publish.repository((repository) -> {
46-
String repoKey = isSnapshot ? "libs-snapshot-local" : isMilestone ? "libs-milestone-local" : "libs-release-local";
47-
repository.setRepoKey(repoKey);
48-
if (project.hasProperty("artifactoryUsername")) {
49-
repository.setUsername(project.findProperty("artifactoryUsername"));
50-
repository.setPassword(project.findProperty("artifactoryPassword"));
51-
}
52-
});
53-
// Would fail if maven publish is not applied, i.e. in root project (SpringRootProjectPlugin)
54-
project.getPlugins().withType(MavenPublishPlugin.class, mavenPublish -> {
55-
publish.defaults((defaults) -> defaults.publications("mavenJava"));
56-
});
42+
ArtifactoryPluginConvention artifactoryExtension = project.getExtensions().getByType(ArtifactoryPluginConvention.class);
43+
artifactoryExtension.publish((publish) -> {
44+
publish.setContextUrl("https://repo.spring.io");
45+
publish.repository((repository) -> {
46+
String repoKey = isSnapshot ? "libs-snapshot-local" : isMilestone ? "libs-milestone-local" : "libs-release-local";
47+
repository.setRepoKey(repoKey);
48+
if (project.hasProperty("artifactoryUsername")) {
49+
repository.setUsername(artifactoryUsername);
50+
repository.setPassword(artifactoryPassword);
51+
}
5752
});
53+
// Would fail if maven publish is not applied, i.e. in root project (SpringRootProjectPlugin)
54+
project.getPlugins().withType(MavenPublishPlugin.class, mavenPublish -> publish.defaults((defaults) -> defaults.publications("mavenJava")));
5855
});
5956
}
6057
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void apply(Project project) {
3333
PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
3434
publishing.getRepositories().maven((maven) -> {
3535
maven.setName("local");
36-
maven.setUrl(new File(project.getRootProject().getBuildDir(), "publications/repos"));
36+
maven.setUrl(new File(project.getRootProject().getLayout().getBuildDirectory().getAsFile().get(), "publications/repos"));
3737
});
3838
});
3939
}

Diff for: ‎docs/spring-authorization-server-docs.gradle

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ plugins {
77

88
group = project.rootProject.group
99
version = project.rootProject.version
10-
sourceCompatibility = "17"
10+
11+
java {
12+
sourceCompatibility = JavaVersion.VERSION_17
13+
}
1114

1215
antora {
1316
playbook = "cached-antora-playbook.yml"

Diff for: ‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ org.gradle.parallel=true
44
org.gradle.caching=true
55
springFrameworkVersion=6.1.3
66
springSecurityVersion=6.3.0-M1
7-
springJavaformatVersion=0.0.38
7+
springJavaformatVersion=0.0.41
88
springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2
99
checkstyleToolVersion=8.34
1010
nohttpCheckstyleVersion=0.0.11

Diff for: ‎gradle/wrapper/gradle-wrapper.jar

-14.9 KB
Binary file not shown.

Diff for: ‎gradle/wrapper/gradle-wrapper.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)