Skip to content

Commit 31b3e77

Browse files
jgrandjajgrandja
committed
Merge branch '1.2.x' into 1.3.x
2 parents 1003a3b + 5949f53 commit 31b3e77

File tree

8 files changed

+105
-86
lines changed

8 files changed

+105
-86
lines changed

‎buildSrc/build.gradle‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@ repositories {
1515
}
1616

1717
dependencies {
18-
implementation "com.github.ben-manes:gradle-versions-plugin:0.38.0"
19-
implementation "io.github.gradle-nexus:publish-plugin:1.1.0"
20-
implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.41"
21-
implementation "io.spring.nohttp:nohttp-gradle:0.0.11"
22-
implementation "org.asciidoctor:asciidoctor-gradle-jvm:3.3.2"
23-
implementation "org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.3.2"
24-
implementation "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
25-
implementation "org.hidetake:gradle-ssh-plugin:2.10.1"
26-
implementation "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0"
27-
implementation "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"
28-
implementation "org.springframework:spring-core:6.1.9"
18+
implementation libs.com.github.ben.manes.gradle.versions.plugin
19+
implementation libs.io.github.gradle.nexus.publish.plugin
20+
implementation libs.io.spring.javaformat.spring.javaformat.gradle.plugin
21+
implementation libs.io.spring.nohttp.nohttp.gradle
22+
implementation libs.org.asciidoctor.asciidoctor.gradle.jvm.plugin
23+
implementation libs.org.asciidoctor.asciidoctor.gradle.jvm.pdf.plugin
24+
implementation libs.org.jetbrains.kotlin.kotlin.gradle.plugin
25+
implementation libs.org.hidetake.gradle.ssh.plugin
26+
implementation libs.org.jfrog.buildinfo.build.info.extractor.gradle
27+
implementation libs.org.sonarsource.scanner.gradle.sonarqube.gradle.plugin
2928
}

‎buildSrc/settings.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
dependencyResolutionManagement {
2+
versionCatalogs {
3+
libs {
4+
from(files("../gradle/libs.versions.toml"))
5+
}
6+
}
7+
}

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

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717
package org.springframework.gradle.checkstyle;
1818

1919
import java.io.File;
20-
import java.util.Objects;
2120

2221
import javax.annotation.Nullable;
2322

2423
import io.spring.javaformat.gradle.tasks.CheckFormat;
2524
import org.gradle.api.Plugin;
2625
import org.gradle.api.Project;
26+
import org.gradle.api.artifacts.VersionCatalog;
27+
import org.gradle.api.artifacts.VersionCatalogsExtension;
2728
import org.gradle.api.plugins.JavaPlugin;
2829
import org.gradle.api.plugins.quality.CheckstyleExtension;
2930
import org.gradle.api.plugins.quality.CheckstylePlugin;
@@ -36,12 +37,6 @@
3637
*/
3738
public class SpringJavaCheckstylePlugin implements Plugin<Project> {
3839
private static final String CHECKSTYLE_DIR = "etc/checkstyle";
39-
private static final String SPRING_JAVAFORMAT_VERSION_PROPERTY = "springJavaformatVersion";
40-
private static final String DEFAULT_SPRING_JAVAFORMAT_VERSION = "0.0.41";
41-
private static final String NOHTTP_CHECKSTYLE_VERSION_PROPERTY = "nohttpCheckstyleVersion";
42-
private static final String DEFAULT_NOHTTP_CHECKSTYLE_VERSION = "0.0.11";
43-
private static final String CHECKSTYLE_TOOL_VERSION_PROPERTY = "checkstyleToolVersion";
44-
private static final String DEFAULT_CHECKSTYLE_TOOL_VERSION = "8.34";
4540
private static final String SPRING_JAVAFORMAT_EXCLUDE_PACKAGES_PROPERTY = "springJavaformatExcludePackages";
4641

4742
@Override
@@ -51,15 +46,14 @@ public void apply(Project project) {
5146
if (checkstyleDir.exists() && checkstyleDir.isDirectory()) {
5247
project.getPluginManager().apply(CheckstylePlugin.class);
5348

54-
// NOTE: See gradle.properties#springJavaformatVersion for actual version number
55-
project.getDependencies().add("checkstyle", "io.spring.javaformat:spring-javaformat-checkstyle:" + getSpringJavaformatVersion(project));
56-
// NOTE: See gradle.properties#nohttpCheckstyleVersion for actual version number
57-
project.getDependencies().add("checkstyle", "io.spring.nohttp:nohttp-checkstyle:" + getNohttpCheckstyleVersion(project));
49+
VersionCatalog versionCatalog = project.getRootProject().getExtensions().getByType(VersionCatalogsExtension.class).named("libs");
50+
51+
project.getDependencies().add("checkstyle", versionCatalog.findLibrary("io-spring-javaformat-spring-javaformat-checkstyle").get());
52+
project.getDependencies().add("checkstyle", versionCatalog.findLibrary("io-spring-nohttp-nohttp-checkstyle").get());
5853

5954
CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
6055
checkstyle.getConfigDirectory().set(checkstyleDir);
61-
// NOTE: See gradle.properties#checkstyleToolVersion for actual version number
62-
checkstyle.setToolVersion(getCheckstyleToolVersion(project));
56+
checkstyle.setToolVersion("8.34");
6357
}
6458

6559
// Configure checkFormat task
@@ -73,30 +67,6 @@ public void apply(Project project) {
7367
});
7468
}
7569

76-
private static String getSpringJavaformatVersion(Project project) {
77-
String springJavaformatVersion = DEFAULT_SPRING_JAVAFORMAT_VERSION;
78-
if (project.hasProperty(SPRING_JAVAFORMAT_VERSION_PROPERTY)) {
79-
springJavaformatVersion = Objects.requireNonNull(project.findProperty(SPRING_JAVAFORMAT_VERSION_PROPERTY)).toString();
80-
}
81-
return springJavaformatVersion;
82-
}
83-
84-
private static String getNohttpCheckstyleVersion(Project project) {
85-
String nohttpCheckstyleVersion = DEFAULT_NOHTTP_CHECKSTYLE_VERSION;
86-
if (project.hasProperty(NOHTTP_CHECKSTYLE_VERSION_PROPERTY)) {
87-
nohttpCheckstyleVersion = Objects.requireNonNull(project.findProperty(NOHTTP_CHECKSTYLE_VERSION_PROPERTY)).toString();
88-
}
89-
return nohttpCheckstyleVersion;
90-
}
91-
92-
private static String getCheckstyleToolVersion(Project project) {
93-
String checkstyleToolVersion = DEFAULT_CHECKSTYLE_TOOL_VERSION;
94-
if (project.hasProperty(CHECKSTYLE_TOOL_VERSION_PROPERTY)) {
95-
checkstyleToolVersion = Objects.requireNonNull(project.findProperty(CHECKSTYLE_TOOL_VERSION_PROPERTY)).toString();
96-
}
97-
return checkstyleToolVersion;
98-
}
99-
10070
@Nullable
10171
private String[] getSpringJavaformatExcludePackages(Project project) {
10272
String springJavaformatExcludePackages = (String) project.findProperty(SPRING_JAVAFORMAT_EXCLUDE_PACKAGES_PROPERTY);

‎buildSrc/src/main/java/org/springframework/gradle/classpath/SpringCheckClasspathForProhibitedDependenciesPlugin.java‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,8 +25,6 @@
2525
import org.gradle.api.tasks.TaskProvider;
2626
import org.gradle.language.base.plugins.LifecycleBasePlugin;
2727

28-
import org.springframework.util.StringUtils;
29-
3028
/**
3129
* @author Andy Wilkinson
3230
* @author Rob Winch
@@ -55,7 +53,7 @@ private void createProhibitedDependenciesChecks(Project project, String... confi
5553
}
5654

5755
private void createProhibitedDependenciesCheck(Configuration classpath, Project project) {
58-
String taskName = "check" + StringUtils.capitalize(classpath.getName() + "ForProhibitedDependencies");
56+
String taskName = "check" + capitalize(classpath.getName() + "ForProhibitedDependencies");
5957
TaskProvider<CheckClasspathForProhibitedDependencies> checkClasspathTask = project.getTasks().register(taskName,
6058
CheckClasspathForProhibitedDependencies.class, (checkClasspath) -> {
6159
checkClasspath.setGroup(LifecycleBasePlugin.CHECK_TASK_NAME);
@@ -64,4 +62,25 @@ private void createProhibitedDependenciesCheck(Configuration classpath, Project
6462
});
6563
project.getTasks().named(SpringCheckProhibitedDependenciesLifecyclePlugin.CHECK_PROHIBITED_DEPENDENCIES_TASK_NAME, (checkProhibitedTask) -> checkProhibitedTask.dependsOn(checkClasspathTask));
6664
}
65+
66+
private static String capitalize(String str) {
67+
if (!hasLength(str)) {
68+
return str;
69+
} else {
70+
char baseChar = str.charAt(0);
71+
char updatedChar = Character.toUpperCase(baseChar);
72+
if (baseChar == updatedChar) {
73+
return str;
74+
} else {
75+
char[] chars = str.toCharArray();
76+
chars[0] = updatedChar;
77+
return new String(chars);
78+
}
79+
}
80+
}
81+
82+
private static boolean hasLength(String str) {
83+
return str != null && !str.isEmpty();
84+
}
85+
6786
}

‎buildSrc/src/main/java/org/springframework/gradle/jacoco/SpringJacocoPlugin.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
1616

1717
package org.springframework.gradle.jacoco;
1818

19-
import java.util.Objects;
20-
2119
import org.gradle.api.Plugin;
2220
import org.gradle.api.Project;
2321
import org.gradle.api.plugins.JavaPlugin;
@@ -31,8 +29,6 @@
3129
* @author Steve Riesenberg
3230
*/
3331
public class SpringJacocoPlugin implements Plugin<Project> {
34-
private static final String JACOCO_TOOL_VERSION_PROPERTY = "jacocoToolVersion";
35-
private static final String DEFAULT_JACOCO_TOOL_VERSION = "0.8.7";
3632

3733
@Override
3834
public void apply(Project project) {
@@ -41,16 +37,8 @@ public void apply(Project project) {
4137
project.getTasks().getByName("check").dependsOn(project.getTasks().getByName("jacocoTestReport"));
4238

4339
JacocoPluginExtension jacoco = project.getExtensions().getByType(JacocoPluginExtension.class);
44-
// NOTE: See gradle.properties#jacocoToolVersion for actual version number
45-
jacoco.setToolVersion(getJacocoToolVersion(project));
40+
jacoco.setToolVersion("0.8.7");
4641
});
4742
}
4843

49-
private static String getJacocoToolVersion(Project project) {
50-
String jacocoToolVersion = DEFAULT_JACOCO_TOOL_VERSION;
51-
if (project.hasProperty(JACOCO_TOOL_VERSION_PROPERTY)) {
52-
jacocoToolVersion = Objects.requireNonNull(project.findProperty(JACOCO_TOOL_VERSION_PROPERTY)).toString();
53-
}
54-
return jacocoToolVersion;
55-
}
5644
}

‎dependencies/spring-authorization-server-dependencies.gradle‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ javaPlatform {
77
}
88

99
dependencies {
10-
api platform("org.springframework:spring-framework-bom:$springFrameworkVersion")
11-
api platform("org.springframework.security:spring-security-bom:$springSecurityVersion")
12-
api platform("com.fasterxml.jackson:jackson-bom:2.17.2")
10+
api platform(libs.org.springframework.spring.framework.bom)
11+
api platform(libs.org.springframework.security.spring.security.bom)
12+
api platform(libs.com.fasterxml.jackson.jackson.bom)
1313
constraints {
14-
api "com.nimbusds:nimbus-jose-jwt:9.39.3"
15-
api "jakarta.servlet:jakarta.servlet-api:6.0.0"
16-
api "org.bouncycastle:bcpkix-jdk18on:1.78.1"
17-
api "org.bouncycastle:bcprov-jdk18on:1.78.1"
18-
api "org.junit.jupiter:junit-jupiter:5.10.3"
19-
api "org.assertj:assertj-core:3.25.3"
20-
api "org.mockito:mockito-core:4.11.0"
21-
api "com.squareup.okhttp3:mockwebserver:4.12.0"
22-
api "com.squareup.okhttp3:okhttp:4.12.0"
23-
api "com.jayway.jsonpath:json-path:2.9.0"
24-
api "org.hsqldb:hsqldb:2.7.3"
14+
api libs.com.nimbusds.nimbus.jose.jwt
15+
api libs.jakarta.servlet.jakarta.servlet.api
16+
api libs.org.bouncycastle.bcpkix.jdk18on
17+
api libs.org.bouncycastle.bcprov.jdk18on
18+
api libs.org.junit.jupiter.junit.jupiter
19+
api libs.org.assertj.assertj.core
20+
api libs.org.mockito.mockito.core
21+
api libs.com.squareup.okhttp3.mockwebserver
22+
api libs.com.squareup.okhttp3.okhttp
23+
api libs.com.jayway.jsonpath.json.path
24+
api libs.org.hsqldb.hsqldb
2525
}
2626
}

‎gradle.properties‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,3 @@ version=1.3.3-SNAPSHOT
22
org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
33
org.gradle.parallel=true
44
org.gradle.caching=true
5-
springFrameworkVersion=6.1.12
6-
springSecurityVersion=6.3.2
7-
springJavaformatVersion=0.0.41
8-
checkstyleToolVersion=8.34
9-
nohttpCheckstyleVersion=0.0.11
10-
jacocoToolVersion=0.8.7

‎gradle/libs.versions.toml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
[versions]
2+
org-springframework = "6.1.12"
3+
org-springframework-security = "6.3.2"
4+
com-fasterxml-jackson = "2.17.2"
5+
nimbus-jose-jwt = "9.39.3"
6+
org-bouncycastle = "1.78.1"
7+
com-squareup-okhttp3 = "4.12.0"
8+
io-spring-javaformat = "0.0.41"
9+
io-spring-nohttp = "0.0.11"
10+
11+
[libraries]
12+
org-springframework-spring-framework-bom = { module = "org.springframework:spring-framework-bom", version.ref = "org-springframework" }
13+
org-springframework-security-spring-security-bom = { module = "org.springframework.security:spring-security-bom", version.ref = "org-springframework-security" }
14+
com-fasterxml-jackson-jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "com-fasterxml-jackson" }
15+
com-nimbusds-nimbus-jose-jwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus-jose-jwt" }
16+
jakarta-servlet-jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:6.0.0"
17+
org-bouncycastle-bcpkix-jdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "org-bouncycastle" }
18+
org-bouncycastle-bcprov-jdk18on = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "org-bouncycastle" }
19+
org-junit-jupiter-junit-jupiter = "org.junit.jupiter:junit-jupiter:5.10.3"
20+
org-assertj-assertj-core = "org.assertj:assertj-core:3.25.3"
21+
org-mockito-mockito-core = "org.mockito:mockito-core:4.11.0"
22+
com-squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "com-squareup-okhttp3" }
23+
com-squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "com-squareup-okhttp3" }
24+
com-jayway-jsonpath-json-path = "com.jayway.jsonpath:json-path:2.9.0"
25+
org-hsqldb-hsqldb = "org.hsqldb:hsqldb:2.7.3"
26+
27+
# buildSrc dependencies
28+
com-github-ben-manes-gradle-versions-plugin = "com.github.ben-manes:gradle-versions-plugin:0.38.0"
29+
io-github-gradle-nexus-publish-plugin = "io.github.gradle-nexus:publish-plugin:1.1.0"
30+
io-spring-javaformat-spring-javaformat-checkstyle = { module = "io.spring.javaformat:spring-javaformat-checkstyle", version.ref = "io-spring-javaformat" }
31+
io-spring-javaformat-spring-javaformat-gradle-plugin = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version.ref = "io-spring-javaformat" }
32+
io-spring-nohttp-nohttp-checkstyle = { module = "io.spring.nohttp:nohttp-checkstyle", version.ref = "io-spring-nohttp" }
33+
io-spring-nohttp-nohttp-gradle = { module = "io.spring.nohttp:nohttp-gradle", version.ref = "io-spring-nohttp" }
34+
org-asciidoctor-asciidoctor-gradle-jvm-plugin = "org.asciidoctor:asciidoctor-gradle-jvm:3.3.2"
35+
org-asciidoctor-asciidoctor-gradle-jvm-pdf-plugin = "org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.3.2"
36+
org-jetbrains-kotlin-kotlin-gradle-plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
37+
org-hidetake-gradle-ssh-plugin = "org.hidetake:gradle-ssh-plugin:2.10.1"
38+
org-jfrog-buildinfo-build-info-extractor-gradle = "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0"
39+
org-sonarsource-scanner-gradle-sonarqube-gradle-plugin = "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"
40+
41+
[plugins]
42+
org-gradle-wrapper-upgrade = "org.gradle.wrapper-upgrade:0.11.4"

0 commit comments

Comments
 (0)