From 090efb686537e888901559d95496aced85d79aec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 03:17:27 +0000 Subject: [PATCH 1/9] Bump org.springframework:spring-framework-bom from 6.1.5 to 6.1.11 Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 6.1.5 to 6.1.11. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.5...v6.1.11) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2abc575..8738f82 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ org-springframework-boot = "3.2.6" [libraries] -org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.1.5" +org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.1.11" org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:6.2.4" org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2023.1.6" org-springframework-security-spring-security-oauth2-authorization-server = "org.springframework.security:spring-security-oauth2-authorization-server:1.2.4" From 02fcec3938fc86cb7c178c5bd3efac0ed0c6fb10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 03:17:18 +0000 Subject: [PATCH 2/9] Bump org.springframework.data:spring-data-bom from 2023.1.6 to 2023.1.8 Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2023.1.6 to 2023.1.8. - [Release notes](https://github.com/spring-projects/spring-data-bom/releases) - [Commits](https://github.com/spring-projects/spring-data-bom/compare/2023.1.6...2023.1.8) --- updated-dependencies: - dependency-name: org.springframework.data:spring-data-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8738f82..82bb5bf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ org-springframework-boot = "3.2.6" [libraries] org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.1.11" org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:6.2.4" -org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2023.1.6" +org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2023.1.8" org-springframework-security-spring-security-oauth2-authorization-server = "org.springframework.security:spring-security-oauth2-authorization-server:1.2.4" [plugins] From cc01d2c1b60ef5226512ed87c378d080b3585327 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 03:17:11 +0000 Subject: [PATCH 3/9] Bump io.spring.dependency-management from 1.1.4 to 1.1.6 Bumps [io.spring.dependency-management](https://github.com/spring-gradle-plugins/dependency-management-plugin) from 1.1.4 to 1.1.6. - [Release notes](https://github.com/spring-gradle-plugins/dependency-management-plugin/releases) - [Commits](https://github.com/spring-gradle-plugins/dependency-management-plugin/compare/v1.1.4...v1.1.6) --- updated-dependencies: - dependency-name: io.spring.dependency-management dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 82bb5bf..eb60290 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,5 +8,5 @@ org-springframework-data-spring-data-bom = "org.springframework.data:spring-data org-springframework-security-spring-security-oauth2-authorization-server = "org.springframework.security:spring-security-oauth2-authorization-server:1.2.4" [plugins] -io-spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.4" } +io-spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.6" } org-springframework-boot = { id = "org.springframework.boot", version.ref = "org-springframework-boot" } From 3a7b5b5001db012ecf6191900d169c03171fa59e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 03:24:58 +0000 Subject: [PATCH 4/9] Bump io.spring.javaformat from 0.0.41 to 0.0.42 Bumps [io.spring.javaformat](https://github.com/spring-io/spring-javaformat) from 0.0.41 to 0.0.42. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.41...v0.0.42) --- updated-dependencies: - dependency-name: io.spring.javaformat dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9efbe4e..d82326b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "checkstyle" - id "io.spring.javaformat" version "0.0.41" + id "io.spring.javaformat" version "0.0.42" id 'io.spring.nohttp' version '0.0.11' } From a6ddf256d44bf01225d49e0e075242a19c620289 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 03:24:54 +0000 Subject: [PATCH 5/9] Bump io.spring.javaformat:spring-javaformat-checkstyle Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.41 to 0.0.42. - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.41...v0.0.42) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d82326b..1453548 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ allprojects { apply plugin: 'io.spring.javaformat' dependencies { - checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:0.0.41" + checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:0.0.42" } // Ensure every test task has at least a single test From a5a7e9341661680508bebd2c30c0ddb0c47e3cb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 03:47:33 +0000 Subject: [PATCH 6/9] Bump org.springframework.boot from 3.2.6 to 3.2.8 Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.2.6 to 3.2.8. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.6...v3.2.8) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index eb60290..f98c205 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -org-springframework-boot = "3.2.6" +org-springframework-boot = "3.2.8" [libraries] org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.1.11" From e98af627769e973b45a95a46c5c55e803bb7ad9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 03:47:28 +0000 Subject: [PATCH 7/9] Bump org.springframework.security:spring-security-bom Bumps [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security) from 6.2.4 to 6.2.5. - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/6.2.4...6.2.5) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f98c205..759d745 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ org-springframework-boot = "3.2.8" [libraries] org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.1.11" -org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:6.2.4" +org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:6.2.5" org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2023.1.8" org-springframework-security-spring-security-oauth2-authorization-server = "org.springframework.security:spring-security-oauth2-authorization-server:1.2.4" From 0d011de91ec1a664e1df0e625204a8370685be83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 03:47:20 +0000 Subject: [PATCH 8/9] Bump org.springframework.security:spring-security-oauth2-authorization-server Bumps [org.springframework.security:spring-security-oauth2-authorization-server](https://github.com/spring-projects/spring-authorization-server) from 1.2.4 to 1.2.5. - [Release notes](https://github.com/spring-projects/spring-authorization-server/releases) - [Commits](https://github.com/spring-projects/spring-authorization-server/compare/1.2.4...1.2.5) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-oauth2-authorization-server dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 759d745..2394e0e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ org-springframework-boot = "3.2.8" org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.1.11" org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:6.2.5" org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2023.1.8" -org-springframework-security-spring-security-oauth2-authorization-server = "org.springframework.security:spring-security-oauth2-authorization-server:1.2.4" +org-springframework-security-spring-security-oauth2-authorization-server = "org.springframework.security:spring-security-oauth2-authorization-server:1.2.5" [plugins] io-spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.6" } From b4bf4fb5d8f80e2e540e21658a429b6ae8d2a688 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Mon, 16 Sep 2024 15:48:48 -0600 Subject: [PATCH 9/9] Separate OSS and Commercial Init Scripts Closes gh-323 --- spring-security-ci.gradle | 24 --------- spring-security-commercial-ci.gradle | 78 ++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 spring-security-commercial-ci.gradle diff --git a/spring-security-ci.gradle b/spring-security-ci.gradle index 24467cd..c4c6be4 100644 --- a/spring-security-ci.gradle +++ b/spring-security-ci.gradle @@ -55,29 +55,5 @@ allprojects { includeVersion "org.springframework.security", "spring-security-web", "$springSecurityVersion" } } - def hasArtifactoryUsername = project.hasProperty('artifactoryUsername') - maven { - name = 'artifactory-snapshot' - if (hasArtifactoryUsername) { - credentials { - username project.artifactoryUsername - password project.artifactoryPassword - } - } - url = 'https://repo.spring.vmware.com/artifactory/spring-commercial-snapshot-local/' - } - maven { - name = 'artifactory-release' - if (hasArtifactoryUsername) { - credentials { - username project.artifactoryUsername - password project.artifactoryPassword - } - } - content { - excludeGroup('net.minidev') - } - url = 'https://repo.spring.vmware.com/artifactory/spring-commercial-release-local/' - } } } diff --git a/spring-security-commercial-ci.gradle b/spring-security-commercial-ci.gradle new file mode 100644 index 0000000..030595c --- /dev/null +++ b/spring-security-commercial-ci.gradle @@ -0,0 +1,78 @@ +allprojects { + configurations.all { + resolutionStrategy { + force "org.springframework.security:spring-security-acl:$springSecurityVersion" + force "org.springframework.security:spring-security-aspects:$springSecurityVersion" + force "org.springframework.security:spring-security-bom:$springSecurityVersion" + force "org.springframework.security:spring-security-cas:$springSecurityVersion" + force "org.springframework.security:spring-security-config:$springSecurityVersion" + force "org.springframework.security:spring-security-core:$springSecurityVersion" + force "org.springframework.security:spring-security-crypto:$springSecurityVersion" + force "org.springframework.security:spring-security-data:$springSecurityVersion" + force "org.springframework.security:spring-security-ldap:$springSecurityVersion" + force "org.springframework.security:spring-security-messaging:$springSecurityVersion" + force "org.springframework.security:spring-security-oauth2-client:$springSecurityVersion" + force "org.springframework.security:spring-security-oauth2-core:$springSecurityVersion" + force "org.springframework.security:spring-security-oauth2-jose:$springSecurityVersion" + force "org.springframework.security:spring-security-oauth2-resource-server:$springSecurityVersion" + force "org.springframework.security:spring-security-openid:$springSecurityVersion" + force "org.springframework.security:spring-security-remoting:$springSecurityVersion" + force "org.springframework.security:spring-security-rsocket:$springSecurityVersion" + force "org.springframework.security:spring-security-saml2-service-provider:$springSecurityVersion" + force "org.springframework.security:spring-security-taglibs:$springSecurityVersion" + force "org.springframework.security:spring-security-test:$springSecurityVersion" + force "org.springframework.security:spring-security-web:$springSecurityVersion" + } + } + repositories { + exclusiveContent { + forRepository { + maven { + url "file://$localRepositoryPath" + } + } + filter { + includeVersion "org.springframework.security", "spring-security-acl", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-aspects", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-bom", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-cas", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-config", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-core", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-crypto", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-data", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-ldap", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-messaging", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-oauth2-client", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-oauth2-core", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-oauth2-jose", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-oauth2-resource-server", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-openid", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-remoting", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-rsocket", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-saml2-service-provider", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-taglibs", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-test", "$springSecurityVersion" + includeVersion "org.springframework.security", "spring-security-web", "$springSecurityVersion" + } + } + maven { + name = 'artifactory-snapshot' + credentials { + username project.artifactoryUsername + password project.artifactoryPassword + } + url = 'https://usw1.packages.broadcom.com/spring-enterprise-maven-dev-local' + } + maven { + name = 'artifactory-release' + credentials { + username project.artifactoryUsername + password project.artifactoryPassword + } + content { + excludeGroup('net.minidev') + } + url = 'https://usw1.packages.broadcom.com/spring-enterprise-maven-prod-local' + } + } +}