From 8cfb64e0b9e1c2b51a169c0de6808c67b95e981b Mon Sep 17 00:00:00 2001 From: Marcus Hert Da Coregio Date: Mon, 27 Nov 2023 10:55:15 -0300 Subject: [PATCH] Use Version Catalog for Spring dependencies Issue gh-138 --- gradle/libs.versions.toml | 11 ++++++++++ reactive/rsocket/hello-security/build.gradle | 4 ++-- .../webflux-fn/hello-security/build.gradle | 4 ++-- reactive/webflux-fn/hello/build.gradle | 4 ++-- .../username-password/form/build.gradle | 4 ++-- .../java/authentication/x509/build.gradle | 4 ++-- .../java/hello-security-explicit/build.gradle | 4 ++-- .../webflux/java/hello-security/build.gradle | 4 ++-- reactive/webflux/java/hello/build.gradle | 4 ++-- reactive/webflux/java/method/build.gradle | 4 ++-- .../webflux/java/oauth2/login/build.gradle | 4 ++-- .../java/oauth2/resource-server/build.gradle | 4 ++-- .../java/oauth2/webclient/build.gradle | 4 ++-- .../java-configuration/aspectj/build.gradle | 8 ++++---- .../authentication/preauth/build.gradle | 4 ++-- .../authentication/remember-me/build.gradle | 4 ++-- .../username-password/form/build.gradle | 4 ++-- .../username-password/in-memory/build.gradle | 4 ++-- .../username-password/jdbc/build.gradle | 4 ++-- .../username-password/ldap/build.gradle | 4 ++-- .../authentication/x509/build.gradle | 4 ++-- servlet/java-configuration/data/build.gradle | 20 ++++++++++++++----- .../hello-mvc-security/build.gradle | 4 ++-- .../hello-security-explicit/build.gradle | 4 ++-- .../hello-security/build.gradle | 4 ++-- .../max-sessions/build.gradle | 4 ++-- .../saml2/login/build.gradle | 4 ++-- .../username-password/mfa/build.gradle | 4 ++-- .../custom-user/build.gradle | 4 ++-- .../spring-boot/java/cas/login/build.gradle | 12 ++++------- .../java/hello-security-explicit/build.gradle | 4 ++-- .../java/hello-security/build.gradle | 4 ++-- servlet/spring-boot/java/hello/build.gradle | 4 ++-- .../spring-boot/java/jwt/login/build.gradle | 4 ++-- servlet/spring-boot/java/ldap/build.gradle | 4 ++-- .../oauth2/authorization-server/build.gradle | 4 ++-- .../java/oauth2/login/build.gradle | 4 ++-- .../hello-security/build.gradle | 4 ++-- .../oauth2/resource-server/jwe/build.gradle | 4 ++-- .../multi-tenancy/build.gradle | 4 ++-- .../resource-server/opaque/build.gradle | 4 ++-- .../resource-server/static/build.gradle | 4 ++-- .../java/oauth2/webclient/build.gradle | 4 ++-- .../java/saml2/custom-urls/build.gradle | 4 ++-- .../saml2/login-single-tenant/build.gradle | 4 ++-- .../spring-boot/java/saml2/login/build.gradle | 4 ++-- .../saml2/refreshable-metadata/build.gradle | 4 ++-- .../saml-extension-federation/build.gradle | 4 ++-- .../build.gradle | 4 ++-- .../maximum-sessions/build.gradle | 4 ++-- servlet/xml/java/contacts/build.gradle | 4 ++-- servlet/xml/java/dms/build.gradle | 4 ++-- servlet/xml/java/helloworld/build.gradle | 2 +- servlet/xml/java/preauth/build.gradle | 2 +- .../xml/java/saml2/login-logout/build.gradle | 4 ++-- 55 files changed, 134 insertions(+), 117 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..83917d4 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,11 @@ +[versions] +org-springframework-boot = "3.2.0" + +[libraries] +org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.1.1" +org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:6.2.0" +org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2023.1.0" + +[plugins] +io-spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.4" } +org-springframework-boot = { id = "org.springframework.boot", version.ref = "org-springframework-boot" } diff --git a/reactive/rsocket/hello-security/build.gradle b/reactive/rsocket/hello-security/build.gradle index 0dab97d..663a5ba 100644 --- a/reactive/rsocket/hello-security/build.gradle +++ b/reactive/rsocket/hello-security/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux-fn/hello-security/build.gradle b/reactive/webflux-fn/hello-security/build.gradle index 8251360..9db602a 100644 --- a/reactive/webflux-fn/hello-security/build.gradle +++ b/reactive/webflux-fn/hello-security/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux-fn/hello/build.gradle b/reactive/webflux-fn/hello/build.gradle index 27730ab..d535ee9 100644 --- a/reactive/webflux-fn/hello/build.gradle +++ b/reactive/webflux-fn/hello/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/authentication/username-password/form/build.gradle b/reactive/webflux/java/authentication/username-password/form/build.gradle index 35f9edb..5c0ac19 100644 --- a/reactive/webflux/java/authentication/username-password/form/build.gradle +++ b/reactive/webflux/java/authentication/username-password/form/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/authentication/x509/build.gradle b/reactive/webflux/java/authentication/x509/build.gradle index b481e1e..022cee5 100644 --- a/reactive/webflux/java/authentication/x509/build.gradle +++ b/reactive/webflux/java/authentication/x509/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/hello-security-explicit/build.gradle b/reactive/webflux/java/hello-security-explicit/build.gradle index 06593e5..561f2a5 100644 --- a/reactive/webflux/java/hello-security-explicit/build.gradle +++ b/reactive/webflux/java/hello-security-explicit/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/hello-security/build.gradle b/reactive/webflux/java/hello-security/build.gradle index 1fdbf73..6fb22fd 100644 --- a/reactive/webflux/java/hello-security/build.gradle +++ b/reactive/webflux/java/hello-security/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/hello/build.gradle b/reactive/webflux/java/hello/build.gradle index 27730ab..d535ee9 100644 --- a/reactive/webflux/java/hello/build.gradle +++ b/reactive/webflux/java/hello/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/method/build.gradle b/reactive/webflux/java/method/build.gradle index 5af53d0..68ffca1 100644 --- a/reactive/webflux/java/method/build.gradle +++ b/reactive/webflux/java/method/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/oauth2/login/build.gradle b/reactive/webflux/java/oauth2/login/build.gradle index e2c3d37..860f6c5 100644 --- a/reactive/webflux/java/oauth2/login/build.gradle +++ b/reactive/webflux/java/oauth2/login/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/oauth2/resource-server/build.gradle b/reactive/webflux/java/oauth2/resource-server/build.gradle index 184ed32..f145f45 100644 --- a/reactive/webflux/java/oauth2/resource-server/build.gradle +++ b/reactive/webflux/java/oauth2/resource-server/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/oauth2/webclient/build.gradle b/reactive/webflux/java/oauth2/webclient/build.gradle index 34f5d6e..0f0316a 100644 --- a/reactive/webflux/java/oauth2/webclient/build.gradle +++ b/reactive/webflux/java/oauth2/webclient/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/java-configuration/aspectj/build.gradle b/servlet/java-configuration/aspectj/build.gradle index 3659efe..abdff3a 100644 --- a/servlet/java-configuration/aspectj/build.gradle +++ b/servlet/java-configuration/aspectj/build.gradle @@ -20,12 +20,12 @@ compileTestJava { } dependencies { - aspect platform("org.springframework:spring-framework-bom:6.0.7") - aspect platform("org.springframework.security:spring-security-bom:6.0.2") + aspect platform(libs.org.springframework.spring.framework.bom) + aspect platform(libs.org.springframework.security.spring.security.bom) aspect "org.springframework.security:spring-security-aspects" - implementation platform("org.springframework:spring-framework-bom:6.0.7") - implementation platform("org.springframework.security:spring-security-bom:6.0.2") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/authentication/preauth/build.gradle b/servlet/java-configuration/authentication/preauth/build.gradle index 974aa36..71cec23 100644 --- a/servlet/java-configuration/authentication/preauth/build.gradle +++ b/servlet/java-configuration/authentication/preauth/build.gradle @@ -16,8 +16,8 @@ repositories { ext["micrometer.version"] = "1.10.0-SNAPSHOT" dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/authentication/remember-me/build.gradle b/servlet/java-configuration/authentication/remember-me/build.gradle index 69ff3cc..0767349 100644 --- a/servlet/java-configuration/authentication/remember-me/build.gradle +++ b/servlet/java-configuration/authentication/remember-me/build.gradle @@ -16,8 +16,8 @@ repositories { ext["micrometer.version"] = "1.10.0-SNAPSHOT" dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.7") - implementation platform("org.springframework.security:spring-security-bom:6.0.2") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/authentication/username-password/form/build.gradle b/servlet/java-configuration/authentication/username-password/form/build.gradle index 59c498f..eb6696a 100644 --- a/servlet/java-configuration/authentication/username-password/form/build.gradle +++ b/servlet/java-configuration/authentication/username-password/form/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/authentication/username-password/in-memory/build.gradle b/servlet/java-configuration/authentication/username-password/in-memory/build.gradle index d15da6b..0b1f2cd 100644 --- a/servlet/java-configuration/authentication/username-password/in-memory/build.gradle +++ b/servlet/java-configuration/authentication/username-password/in-memory/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.7") - implementation platform("org.springframework.security:spring-security-bom:6.0.2") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/authentication/username-password/jdbc/build.gradle b/servlet/java-configuration/authentication/username-password/jdbc/build.gradle index aabdbfd..50e6dcd 100644 --- a/servlet/java-configuration/authentication/username-password/jdbc/build.gradle +++ b/servlet/java-configuration/authentication/username-password/jdbc/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.7") - implementation platform("org.springframework.security:spring-security-bom:6.0.2") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.hsqldb:hsqldb:2.5.1" diff --git a/servlet/java-configuration/authentication/username-password/ldap/build.gradle b/servlet/java-configuration/authentication/username-password/ldap/build.gradle index 295ce71..a610b18 100644 --- a/servlet/java-configuration/authentication/username-password/ldap/build.gradle +++ b/servlet/java-configuration/authentication/username-password/ldap/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.7") - implementation platform("org.springframework.security:spring-security-bom:6.0.2") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/authentication/x509/build.gradle b/servlet/java-configuration/authentication/x509/build.gradle index eb11955..66403b0 100644 --- a/servlet/java-configuration/authentication/x509/build.gradle +++ b/servlet/java-configuration/authentication/x509/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.7") - implementation platform("org.springframework.security:spring-security-bom:6.0.2") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/data/build.gradle b/servlet/java-configuration/data/build.gradle index efaecf8..105b089 100644 --- a/servlet/java-configuration/data/build.gradle +++ b/servlet/java-configuration/data/build.gradle @@ -1,6 +1,8 @@ plugins { id "java" id "nebula.integtest" version "8.2.0" + alias(libs.plugins.io.spring.dependency.management) + alias(libs.plugins.org.springframework.boot) apply(false) } repositories { @@ -9,20 +11,28 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } +dependencyManagement { + imports { + mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES + } +} + dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) + implementation platform(libs.org.springframework.data.spring.data.bom) + implementation "org.springframework.boot:spring-boot-starter-validation" implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" implementation "org.springframework.security:spring-security-data" implementation "org.springframework.security:spring-security-web" - implementation 'jakarta.validation:jakarta.validation-api:2.0.2' + implementation 'jakarta.validation:jakarta.validation-api:3.0.2' implementation 'jakarta.persistence:jakarta.persistence-api:3.0.0' implementation 'org.hibernate.orm:hibernate-core:6.1.1.Final' - implementation 'org.hibernate.validator:hibernate-validator:7.0.1.Final' + implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final' implementation 'org.hsqldb:hsqldb:2.5.1' - implementation 'org.springframework.data:spring-data-jpa:3.0.0-SNAPSHOT' + implementation 'org.springframework.data:spring-data-jpa' testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" diff --git a/servlet/java-configuration/hello-mvc-security/build.gradle b/servlet/java-configuration/hello-mvc-security/build.gradle index 59c498f..eb6696a 100644 --- a/servlet/java-configuration/hello-mvc-security/build.gradle +++ b/servlet/java-configuration/hello-mvc-security/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/hello-security-explicit/build.gradle b/servlet/java-configuration/hello-security-explicit/build.gradle index 47df0b7..9c86783 100644 --- a/servlet/java-configuration/hello-security-explicit/build.gradle +++ b/servlet/java-configuration/hello-security-explicit/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/hello-security/build.gradle b/servlet/java-configuration/hello-security/build.gradle index 47df0b7..9c86783 100644 --- a/servlet/java-configuration/hello-security/build.gradle +++ b/servlet/java-configuration/hello-security/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/max-sessions/build.gradle b/servlet/java-configuration/max-sessions/build.gradle index 00b1aff..053361c 100644 --- a/servlet/java-configuration/max-sessions/build.gradle +++ b/servlet/java-configuration/max-sessions/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:6.0.7") - implementation platform("org.springframework.security:spring-security-bom:6.0.2") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/saml2/login/build.gradle b/servlet/java-configuration/saml2/login/build.gradle index 73003b2..4cb15e3 100644 --- a/servlet/java-configuration/saml2/login/build.gradle +++ b/servlet/java-configuration/saml2/login/build.gradle @@ -36,8 +36,8 @@ dependencies { implementation "org.opensaml:opensaml-saml-api:4.1.1" implementation "org.opensaml:opensaml-saml-impl:4.1.1" } - implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle b/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle index 6b4eff1..32d5bd0 100644 --- a/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle +++ b/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'io.spring.dependency-management' version '1.0.11.RELEASE' - id 'org.springframework.boot' version '3.1.6' + alias(libs.plugins.io.spring.dependency.management) + alias(libs.plugins.org.springframework.boot) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle index 14e08db..853acfd 100644 --- a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle +++ b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'io.spring.dependency-management' version '1.0.11.RELEASE' - id 'org.springframework.boot' version '3.1.6' + alias(libs.plugins.io.spring.dependency.management) + alias(libs.plugins.org.springframework.boot) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/cas/login/build.gradle b/servlet/spring-boot/java/cas/login/build.gradle index 61f7a5a..15ff3eb 100644 --- a/servlet/spring-boot/java/cas/login/build.gradle +++ b/servlet/spring-boot/java/cas/login/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } @@ -11,10 +11,6 @@ repositories { maven { url "https://repo.spring.io/snapshot" } } -ext { - set('testcontainersVersion', '1.17.6') -} - dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' @@ -25,8 +21,8 @@ dependencies { testImplementation 'net.sourceforge.htmlunit:htmlunit' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' - testImplementation "org.testcontainers:junit-jupiter:$testcontainersVersion" - testImplementation 'com.codeborne:selenide:6.12.4' + testImplementation "org.testcontainers:junit-jupiter" + testImplementation 'com.codeborne:selenide:7.0.2' testImplementation 'org.seleniumhq.selenium:selenium-chrome-driver' testImplementation 'org.seleniumhq.selenium:selenium-java' testImplementation 'io.github.bonigarcia:webdrivermanager:5.5.2' diff --git a/servlet/spring-boot/java/hello-security-explicit/build.gradle b/servlet/spring-boot/java/hello-security-explicit/build.gradle index a123726..a63e7f9 100644 --- a/servlet/spring-boot/java/hello-security-explicit/build.gradle +++ b/servlet/spring-boot/java/hello-security-explicit/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/hello-security/build.gradle b/servlet/spring-boot/java/hello-security/build.gradle index 4a331fb..11c6462 100644 --- a/servlet/spring-boot/java/hello-security/build.gradle +++ b/servlet/spring-boot/java/hello-security/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/hello/build.gradle b/servlet/spring-boot/java/hello/build.gradle index 124e5fa..25f9e12 100644 --- a/servlet/spring-boot/java/hello/build.gradle +++ b/servlet/spring-boot/java/hello/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/jwt/login/build.gradle b/servlet/spring-boot/java/jwt/login/build.gradle index b5e0ac0..db6d86f 100644 --- a/servlet/spring-boot/java/jwt/login/build.gradle +++ b/servlet/spring-boot/java/jwt/login/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id 'java' } diff --git a/servlet/spring-boot/java/ldap/build.gradle b/servlet/spring-boot/java/ldap/build.gradle index a81cc60..8fc73e2 100644 --- a/servlet/spring-boot/java/ldap/build.gradle +++ b/servlet/spring-boot/java/ldap/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id 'java' } diff --git a/servlet/spring-boot/java/oauth2/authorization-server/build.gradle b/servlet/spring-boot/java/oauth2/authorization-server/build.gradle index ec02d65..4887a63 100644 --- a/servlet/spring-boot/java/oauth2/authorization-server/build.gradle +++ b/servlet/spring-boot/java/oauth2/authorization-server/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/oauth2/login/build.gradle b/servlet/spring-boot/java/oauth2/login/build.gradle index 37ea391..0748ff7 100644 --- a/servlet/spring-boot/java/oauth2/login/build.gradle +++ b/servlet/spring-boot/java/oauth2/login/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle index cf4553d..6db14ff 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle index 7d3ea80..e0bedea 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle @@ -15,8 +15,8 @@ */ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle index 2ca41eb..148afc0 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle @@ -15,8 +15,8 @@ */ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle index 2ca41eb..148afc0 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle @@ -15,8 +15,8 @@ */ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle index 7d3ea80..e0bedea 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle @@ -15,8 +15,8 @@ */ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/oauth2/webclient/build.gradle b/servlet/spring-boot/java/oauth2/webclient/build.gradle index d397c51..4734853 100644 --- a/servlet/spring-boot/java/oauth2/webclient/build.gradle +++ b/servlet/spring-boot/java/oauth2/webclient/build.gradle @@ -15,8 +15,8 @@ */ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/saml2/custom-urls/build.gradle b/servlet/spring-boot/java/saml2/custom-urls/build.gradle index 0601d05..cc1f577 100644 --- a/servlet/spring-boot/java/saml2/custom-urls/build.gradle +++ b/servlet/spring-boot/java/saml2/custom-urls/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle b/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle index 1e16386..b546fa7 100644 --- a/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle +++ b/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/saml2/login/build.gradle b/servlet/spring-boot/java/saml2/login/build.gradle index 7390e3b..36263ee 100644 --- a/servlet/spring-boot/java/saml2/login/build.gradle +++ b/servlet/spring-boot/java/saml2/login/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle b/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle index 1e16386..b546fa7 100644 --- a/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle +++ b/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/saml2/saml-extension-federation/build.gradle b/servlet/spring-boot/java/saml2/saml-extension-federation/build.gradle index 0601d05..cc1f577 100644 --- a/servlet/spring-boot/java/saml2/saml-extension-federation/build.gradle +++ b/servlet/spring-boot/java/saml2/saml-extension-federation/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/session-management/maximum-sessions-prevent-login/build.gradle b/servlet/spring-boot/java/session-management/maximum-sessions-prevent-login/build.gradle index 4ddf095..2165905 100644 --- a/servlet/spring-boot/java/session-management/maximum-sessions-prevent-login/build.gradle +++ b/servlet/spring-boot/java/session-management/maximum-sessions-prevent-login/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" } diff --git a/servlet/spring-boot/java/session-management/maximum-sessions/build.gradle b/servlet/spring-boot/java/session-management/maximum-sessions/build.gradle index 4ddf095..2165905 100644 --- a/servlet/spring-boot/java/session-management/maximum-sessions/build.gradle +++ b/servlet/spring-boot/java/session-management/maximum-sessions/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.1.6' - id 'io.spring.dependency-management' version '1.0.15.RELEASE' + alias(libs.plugins.org.springframework.boot) + alias(libs.plugins.io.spring.dependency.management) id "nebula.integtest" version "8.2.0" } diff --git a/servlet/xml/java/contacts/build.gradle b/servlet/xml/java/contacts/build.gradle index d2b597b..c8116a2 100644 --- a/servlet/xml/java/contacts/build.gradle +++ b/servlet/xml/java/contacts/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - implementation platform("org.springframework.security:spring-security-bom:6.2.0-SNAPSHOT") - implementation platform("org.springframework:spring-framework-bom:6.1.0-M2") + implementation platform(libs.org.springframework.security.spring.security.bom) + implementation platform(libs.org.springframework.spring.framework.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/xml/java/dms/build.gradle b/servlet/xml/java/dms/build.gradle index 635bcdc..5100c19 100644 --- a/servlet/xml/java/dms/build.gradle +++ b/servlet/xml/java/dms/build.gradle @@ -10,8 +10,8 @@ repositories { } dependencies { - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") - implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") + implementation platform(libs.org.springframework.security.spring.security.bom) + implementation platform(libs.org.springframework.spring.framework.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation 'org.springframework:spring-beans' diff --git a/servlet/xml/java/helloworld/build.gradle b/servlet/xml/java/helloworld/build.gradle index 6f10c58..368d4bb 100644 --- a/servlet/xml/java/helloworld/build.gradle +++ b/servlet/xml/java/helloworld/build.gradle @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/xml/java/preauth/build.gradle b/servlet/xml/java/preauth/build.gradle index 5977630..f422ec5 100644 --- a/servlet/xml/java/preauth/build.gradle +++ b/servlet/xml/java/preauth/build.gradle @@ -10,7 +10,7 @@ repositories { } dependencies { - implementation platform("org.springframework.security:spring-security-bom:6.0.2") + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/xml/java/saml2/login-logout/build.gradle b/servlet/xml/java/saml2/login-logout/build.gradle index 16d4069..1de40ec 100644 --- a/servlet/xml/java/saml2/login-logout/build.gradle +++ b/servlet/xml/java/saml2/login-logout/build.gradle @@ -21,8 +21,8 @@ dependencies { implementation "org.opensaml:opensaml-saml-api:4.1.1" implementation "org.opensaml:opensaml-saml-impl:4.1.1" } - implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") + implementation platform(libs.org.springframework.spring.framework.bom) + implementation platform(libs.org.springframework.security.spring.security.bom) implementation platform("org.junit:junit-bom:5.10.0") implementation "org.springframework.security:spring-security-config"