Skip to content

Commit c6841d8

Browse files
marcusdacoregiomarcusdacoregio
committed
Merge branch '5.8.x' into 6.0.x
2 parents 1a0b8b7 + e29ea47 commit c6841d8

File tree

9 files changed

+234
-99
lines changed

9 files changed

+234
-99
lines changed

‎.github/workflows/continuous-integration-workflow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
8484
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
8585
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
86-
./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion='20+' -PspringDataVersion='Neumann-BUILD-SNAPSHOT' -PrsocketVersion=1.1.0-SNAPSHOT -PspringBootVersion=2.4.0-SNAPSHOT -PlocksDisabled --stacktrace
86+
./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PspringVersion='5.+' -PreactorVersion='20+' -PspringDataVersion='Neumann-BUILD-SNAPSHOT' -PrsocketVersion=1.1.0-SNAPSHOT -PspringBootVersion=2.4.0-SNAPSHOT -PlocksDisabled --stacktrace
8787
check_samples:
8888
name: Check Samples project
8989
needs: [prerequisites]

‎build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import trang.RncToXsd
33

44
buildscript {
55
dependencies {
6-
classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$springJavaformatVersion"
7-
classpath 'io.spring.nohttp:nohttp-gradle:0.0.11'
8-
classpath "io.freefair.gradle:aspectj-plugin:6.6-rc1"
9-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
10-
classpath "com.netflix.nebula:nebula-project-plugin:8.2.0"
6+
classpath libs.io.spring.javaformat.spring.javaformat.gradle.plugin
7+
classpath libs.io.spring.nohttp.nohttp.gradle
8+
classpath libs.io.freefair.gradle.aspectj.plugin
9+
classpath libs.org.jetbrains.kotlin.kotlin.gradle.plugin
10+
classpath libs.com.netflix.nebula.nebula.project.plugin
1111
}
1212
repositories {
1313
maven { url 'https://plugins.gradle.org/m2/' }
@@ -142,7 +142,7 @@ allprojects {
142142
pluginManager.withPlugin("io.spring.convention.checkstyle", { plugin ->
143143
configure(plugin) {
144144
dependencies {
145-
checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:$springJavaformatVersion"
145+
checkstyle libs.io.spring.javaformat.spring.javaformat.checkstyle
146146
}
147147
checkstyle {
148148
toolVersion = '8.34'

‎buildSrc/build.gradle

+25-23
Original file line numberDiff line numberDiff line change
@@ -79,37 +79,39 @@ configurations {
7979
}
8080

8181
dependencies {
82-
implementation 'com.google.code.gson:gson:2.8.6'
83-
implementation 'com.thaiopensource:trang:20091111'
84-
implementation 'net.sourceforge.saxon:saxon:9.1.0.8'
85-
implementation 'org.yaml:snakeyaml:1.30'
82+
implementation platform(libs.io.projectreactor.reactor.bom)
83+
84+
implementation libs.com.google.code.gson.gson
85+
implementation libs.com.thaiopensource.trag
86+
implementation libs.net.sourceforge.saxon.saxon
87+
implementation libs.org.yaml.snakeyaml
8688
implementation localGroovy()
8789

88-
implementation 'io.github.gradle-nexus:publish-plugin:1.1.0'
89-
implementation 'io.projectreactor:reactor-core:3.5.9'
90-
implementation 'org.gretty:gretty:3.0.9'
91-
implementation 'com.apollographql.apollo:apollo-runtime:2.4.5'
92-
implementation 'com.github.ben-manes:gradle-versions-plugin:0.38.0'
93-
implementation 'com.github.spullara.mustache.java:compiler:0.9.4'
94-
implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15'
95-
implementation 'io.spring.nohttp:nohttp-gradle:0.0.11'
96-
implementation 'net.sourceforge.htmlunit:htmlunit:2.37.0'
97-
implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
98-
implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0'
99-
implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
90+
implementation libs.io.github.gradle.nexus.publish.plugin
91+
implementation 'io.projectreactor:reactor-core'
92+
implementation libs.org.gretty.gretty
93+
implementation libs.com.apollographql.apollo.apollo.runtime
94+
implementation libs.com.github.ben.manes.gradle.versions.plugin
95+
implementation libs.com.github.spullara.mustache.java.compiler
96+
implementation libs.io.spring.javaformat.spring.javaformat.gradle.plugin
97+
implementation libs.io.spring.nohttp.nohttp.gradle
98+
implementation libs.net.sourceforge.htmlunit
99+
implementation libs.org.hidetake.gradle.ssh.plugin
100+
implementation libs.org.jfrog.buildinfo.build.info.extractor.gradle
101+
implementation libs.org.sonarsource.scanner.gradle.sonarqube.gradle.plugin
100102

101-
testImplementation platform('org.junit:junit-bom:5.9.3')
103+
testImplementation platform(libs.org.junit.junit.bom)
104+
testImplementation platform(libs.org.mockito.mockito.bom)
102105
testImplementation "org.junit.jupiter:junit-jupiter-api"
103106
testImplementation "org.junit.jupiter:junit-jupiter-params"
104107
testImplementation "org.junit.jupiter:junit-jupiter-engine"
105-
testImplementation 'org.apache.commons:commons-io:1.3.2'
106-
testImplementation 'org.assertj:assertj-core:3.13.2'
107-
testImplementation 'org.mockito:mockito-core:3.12.4'
108-
testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'
109-
testImplementation "com.squareup.okhttp3:mockwebserver:3.14.9"
108+
testImplementation libs.org.apache.commons.commons.io
109+
testImplementation libs.org.assertj.assertj.core
110+
testImplementation 'org.mockito:mockito-core'
111+
testImplementation 'org.mockito:mockito-junit-jupiter'
112+
testImplementation libs.com.squareup.okhttp3.mockwebserver
110113
}
111114

112-
113115
tasks.named('test', Test).configure {
114116
onlyIf { !project.hasProperty("buildSrc.skipTests") }
115117
useJUnitPlatform()

‎buildSrc/settings.gradle

+7
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/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy

+5-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package io.spring.gradle.convention
1818

1919
import org.gradle.api.Plugin
2020
import org.gradle.api.Project
21+
import org.gradle.api.artifacts.VersionCatalogsExtension
2122
import org.gradle.api.plugins.JavaPlugin
2223

2324
/**
@@ -31,12 +32,14 @@ class CheckstylePlugin implements Plugin<Project> {
3132

3233
@Override
3334
void apply(Project project) {
35+
def versionCatalog = project.rootProject.extensions.getByType(VersionCatalogsExtension.class)
36+
.named("libs")
3437
project.plugins.withType(JavaPlugin) {
3538
def checkstyleDir = project.rootProject.file(CHECKSTYLE_DIR)
3639
if (checkstyleDir.exists() && checkstyleDir.directory) {
3740
project.getPluginManager().apply('checkstyle')
38-
project.dependencies.add('checkstyle', 'io.spring.javaformat:spring-javaformat-checkstyle:0.0.15')
39-
project.dependencies.add('checkstyle', 'io.spring.nohttp:nohttp-checkstyle:0.0.11')
41+
project.dependencies.add('checkstyle', versionCatalog.findLibrary('io-spring-javaformat-spring-javaformat-checkstyle').get())
42+
project.dependencies.add('checkstyle', versionCatalog.findLibrary('io-spring-nohttp-nohttp-checkstyle').get())
4043

4144
project.checkstyle {
4245
configDirectory = checkstyleDir

‎buildSrc/src/main/java/org/springframework/gradle/sagan/SaganCreateReleaseTask.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import java.util.regex.Matcher;
2020
import java.util.regex.Pattern;
2121

22-
import org.eclipse.core.runtime.Assert;
2322
import org.gradle.api.DefaultTask;
2423
import org.gradle.api.tasks.Input;
2524
import org.gradle.api.tasks.TaskAction;
2625

2726
import org.springframework.gradle.github.user.GitHubUserApi;
2827
import org.springframework.gradle.github.user.User;
28+
import org.springframework.util.Assert;
2929

3030
public class SaganCreateReleaseTask extends DefaultTask {
3131

‎dependencies/spring-security-dependencies.gradle

+72-66
Original file line numberDiff line numberDiff line change
@@ -7,72 +7,78 @@ javaPlatform {
77
}
88

99
dependencies {
10-
api platform("org.springframework:spring-framework-bom:$springFrameworkVersion")
11-
api platform("io.projectreactor:reactor-bom:$reactorVersion")
12-
api platform("io.rsocket:rsocket-bom:1.1.4")
13-
api platform("org.junit:junit-bom:5.9.3")
14-
api platform("org.mockito:mockito-bom:4.8.1")
15-
api platform("org.springframework.data:spring-data-bom:2022.0.9")
16-
api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion")
17-
api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4")
18-
api platform("com.fasterxml.jackson:jackson-bom:2.14.3")
10+
if (project.hasProperty("isOverrideVersionCatalog")) {
11+
def springFrameworkVersion = project.property("springFrameworkVersion")
12+
def reactorVersion = project.property("reactorVersion")
13+
def springDataVersion = project.property("springDataVersion")
14+
api platform("org.springframework:spring-framework-bom:$springFrameworkVersion")
15+
api platform("io.projectreactor:reactor-bom:$reactorVersion")
16+
api platform("org.springframework.data:spring-data-bom:$springDataVersion")
17+
} else {
18+
api platform(libs.org.springframework.spring.framework.bom)
19+
api platform(libs.io.projectreactor.reactor.bom)
20+
api platform(libs.org.springframework.data.spring.data.bom)
21+
}
22+
api platform(libs.io.rsocket.rsocket.bom)
23+
api platform(libs.org.junit.junit.bom)
24+
api platform(libs.org.mockito.mockito.bom)
25+
api platform(libs.org.jetbrains.kotlin.kotlin.bom)
26+
api platform(libs.org.jetbrains.kotlinx.kotlinx.coroutines.bom)
27+
api platform(libs.com.fasterxml.jackson.jackson.bom)
1928
constraints {
20-
api "ch.qos.logback:logback-classic:1.4.11"
21-
api "com.google.inject:guice:3.0"
22-
api "com.nimbusds:nimbus-jose-jwt:9.24.4"
23-
api "com.nimbusds:oauth2-oidc-sdk:9.43.3"
24-
api "com.squareup.okhttp3:mockwebserver:3.14.9"
25-
api "com.squareup.okhttp3:okhttp:3.14.9"
26-
api "com.unboundid:unboundid-ldapsdk:6.0.9"
27-
api "commons-collections:commons-collections:3.2.2"
28-
api "io.mockk:mockk:1.13.7"
29-
api "io.micrometer:micrometer-observation:$micrometerVersion"
30-
api "jakarta.annotation:jakarta.annotation-api:2.1.1"
31-
api "jakarta.inject:jakarta.inject-api:2.0.1"
32-
api "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0"
33-
api "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.1"
34-
api "jakarta.servlet:jakarta.servlet-api:6.0.0"
35-
api "jakarta.xml.bind:jakarta.xml.bind-api:4.0.0"
36-
api "jakarta.persistence:jakarta.persistence-api:3.1.0"
37-
api "jakarta.websocket:jakarta.websocket-api:2.1.1"
38-
api "jakarta.websocket:jakarta.websocket-client-api:2.1.1"
39-
api "ldapsdk:ldapsdk:4.1"
40-
api "net.sourceforge.htmlunit:htmlunit:2.66.0"
41-
api "org.apache.directory.server:apacheds-core-entry:1.5.5"
42-
api "org.apache.directory.server:apacheds-core:1.5.5"
43-
api "org.apache.directory.server:apacheds-protocol-ldap:1.5.5"
44-
api "org.apache.directory.server:apacheds-protocol-shared:1.5.5"
45-
api "org.apache.directory.server:apacheds-server-jndi:1.5.5"
46-
api "org.apache.directory.shared:shared-ldap:0.9.15"
47-
api "org.apache.httpcomponents:httpclient:4.5.14"
48-
api "org.aspectj:aspectjrt:$aspectjVersion"
49-
api "org.aspectj:aspectjweaver:$aspectjVersion"
50-
api "org.assertj:assertj-core:3.24.2"
51-
api "org.bouncycastle:bcpkix-jdk15on:1.70"
52-
api "org.bouncycastle:bcprov-jdk15on:1.70"
53-
api "org.eclipse.jetty:jetty-server:11.0.15"
54-
api "org.eclipse.jetty:jetty-servlet:11.0.15"
55-
api "jakarta.persistence:jakarta.persistence-api:3.1.0"
56-
api "org.hamcrest:hamcrest:2.2"
57-
api "org.hibernate.orm:hibernate-core:6.1.7.Final"
58-
api "org.hsqldb:hsqldb:2.7.2"
59-
api "org.jasig.cas.client:cas-client-core:3.6.4"
60-
api "org.opensaml:opensaml-core:$openSamlVersion"
61-
api "org.opensaml:opensaml-saml-api:$openSamlVersion"
62-
api "org.opensaml:opensaml-saml-impl:$openSamlVersion"
63-
api "org.python:jython:2.5.3"
64-
api "org.seleniumhq.selenium:htmlunit-driver:2.66.0"
65-
api "org.seleniumhq.selenium:selenium-java:3.141.59"
66-
api "org.seleniumhq.selenium:selenium-support:3.141.59"
67-
api "org.skyscreamer:jsonassert:1.5.1"
68-
api "org.slf4j:log4j-over-slf4j:1.7.36"
69-
api "org.slf4j:slf4j-api:2.0.7"
70-
api "org.springframework.ldap:spring-ldap-core:3.0.5"
71-
api "org.synchronoss.cloud:nio-multipart-parser:1.1.0"
72-
api 'org.apache.maven.resolver:maven-resolver-connector-basic:1.8.2'
73-
api 'org.apache.maven.resolver:maven-resolver-impl:1.8.2'
74-
api 'org.apache.maven.resolver:maven-resolver-transport-http:1.8.2'
75-
api 'org.apache.maven:maven-resolver-provider:3.8.8'
29+
api libs.ch.qos.logback.logback.classic
30+
api libs.com.google.inject.guice
31+
api libs.com.nimbusds.nimbus.jose.jwt
32+
api libs.com.nimbusds.oauth2.oidc.sdk
33+
api libs.com.squareup.okhttp3.mockwebserver
34+
api libs.com.squareup.okhttp3.okhttp
35+
api libs.com.unboundid.unboundid.ldapsdk
36+
api libs.commons.collections
37+
api libs.io.mockk
38+
api libs.io.micrometer.micrometer.observation
39+
api libs.jakarta.annotation.jakarta.annotation.api
40+
api libs.jakarta.inject.jakarta.inject.api
41+
api libs.jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl.api
42+
api libs.jakarta.servlet.jsp.jakarta.servlet.jsp.api
43+
api libs.jakarta.servlet.jakarta.servlet.api
44+
api libs.jakarta.xml.bind.jakarta.xml.bind.api
45+
api libs.jakarta.persistence.jakarta.persistence.api
46+
api libs.jakarta.websocket.jakarta.websocket.api
47+
api libs.jakarta.websocket.jakarta.websocket.client.api
48+
api libs.ldapsdk
49+
api libs.net.sourceforge.htmlunit
50+
api libs.org.apache.directory.server.apacheds.entry
51+
api libs.org.apache.directory.server.apacheds.core
52+
api libs.org.apache.directory.server.apacheds.protocol.ldap
53+
api libs.org.apache.directory.server.apacheds.protocol.shared
54+
api libs.org.apache.directory.server.apacheds.server.jndi
55+
api libs.org.apache.directory.shared.shared.ldap
56+
api libs.org.apache.httpcomponents.httpclient
57+
api libs.org.aspectj.aspectjrt
58+
api libs.org.aspectj.aspectjweaver
59+
api libs.org.assertj.assertj.core
60+
api libs.org.bouncycastle.bcpkix.jdk15on
61+
api libs.org.bouncycastle.bcprov.jdk15on
62+
api libs.org.eclipse.jetty.jetty.server
63+
api libs.org.eclipse.jetty.jetty.servlet
64+
api libs.org.hamcrest
65+
api libs.org.hibernate.orm.hibernate.core
66+
api libs.org.hsqldb
67+
api libs.org.opensaml.opensaml.core
68+
api libs.org.opensaml.opensaml.saml.api
69+
api libs.org.opensaml.opensaml.saml.impl
70+
api libs.org.python.jython
71+
api libs.org.seleniumhq.selenium.htmlunit.driver
72+
api libs.org.seleniumhq.selenium.selenium.java
73+
api libs.org.seleniumhq.selenium.selenium.support
74+
api libs.org.skyscreamer.jsonassert
75+
api libs.org.slf4j.log4j.over.slf4j
76+
api libs.org.slf4j.slf4j.api
77+
api libs.org.springframework.ldap.spring.ldap.core
78+
api libs.org.synchronoss.cloud.nio.multipart.parser
79+
api libs.org.apache.maven.resolver.maven.resolver.connector.basic
80+
api libs.org.apache.maven.resolver.maven.resolver.impl
81+
api libs.org.apache.maven.resolver.maven.resolver.transport.http
82+
api libs.org.apache.maven.maven.resolver.provider
7683
}
7784
}
78-

‎docs/spring-security-docs.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ dependencies {
3131
}
3232

3333
def generateAttributes() {
34+
def springFrameworkVersion = libs.org.springframework.spring.framework.bom.get().versionConstraint.displayName
35+
springFrameworkVersion = springFrameworkVersion.contains("-")
36+
? springFrameworkVersion.substring(0, springFrameworkVersion.indexOf("-"))
37+
: springFrameworkVersion
38+
def springBootVersion = project.property("springBootVersion")
39+
def samplesBranch = project.property("samplesBranch")
40+
3441
def docsTag = snapshotBuild ? 'current' : project.version
3542
def ghTag = snapshotBuild ? 'main' : project.version
3643
def ghUrl = "https://github.com/spring-projects/spring-security/tree/$ghTag"

0 commit comments

Comments
 (0)