From aac1e2e2fc661b7faf5798d248d4fcebf84acf49 Mon Sep 17 00:00:00 2001 From: Josh Cummings <3627351+jzheaux@users.noreply.github.com> Date: Wed, 8 Jul 2026 17:01:53 -0600 Subject: [PATCH] Configure Build for Commercial Repositories Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com> --- build.gradle | 13 ++++------- buildSrc/build.gradle | 11 ++++++++- commercial-settings.gradle | 27 ++++++++++++++++++++++ scripts/release/release-notes-sections.yml | 3 ++- settings.gradle | 4 ++-- 5 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 commercial-settings.gradle diff --git a/build.gradle b/build.gradle index 227fc50f9c..5679f24984 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,7 @@ apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'org.springframework.security.versions.verify-dependencies-versions' apply plugin: 'org.springframework.security.check-expected-branch-version' apply plugin: 'io.spring.security.release' +apply from: 'commercial-settings.gradle' group = 'org.springframework.security' description = 'Spring Security' @@ -39,10 +40,12 @@ repositories { } springRelease { + repositoryOwner = "spring-projects" + repositoryName = "spring-security-commercial" weekOfMonth = 3 dayOfWeek = 1 - referenceDocUrl = "https://docs.spring.io/spring-security/reference/{version}/index.html" - apiDocUrl = "https://docs.spring.io/spring-security/reference/{version}/api/java/index.html" + referenceDocUrl = "https://docs.spring.vmware.com/spring-security/reference/{version}/index.html" + apiDocUrl = "https://docs.spring.vmware.com/spring-security/reference/{version}/api/java/index.html" replaceSnapshotVersionInReferenceDocUrl = true } @@ -70,12 +73,6 @@ allprojects { } } -develocity { - buildScan { - termsOfUseUrl = 'https://gradle.com/help/legal-terms-of-use' - termsOfUseAgree = 'yes' - } -} nohttp { source.exclude "buildSrc/build/**", "javascript/.gradle/**", "javascript/package-lock.json", "javascript/node_modules/**", "javascript/build/**", "javascript/dist/**" diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index ab6ceab1d0..54ed96bb5d 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -12,7 +12,16 @@ java { repositories { gradlePluginPortal() mavenCentral() - maven { url = 'https://repo.spring.io/snapshot' } + if (project.hasProperty("artifactoryUsername") && project.hasProperty("artifactoryPassword")) { + maven { + name "spring-commercial-release" + url "https://usw1.packages.broadcom.com/spring-enterprise-maven-prod-local" + credentials { + username project.artifactoryUsername + password project.artifactoryPassword + } + } + } if (System.getenv("RELEASE_TRAIN_MAVEN_REPOSITORY_URL") != null) { maven { name = "Release Train" diff --git a/commercial-settings.gradle b/commercial-settings.gradle new file mode 100644 index 0000000000..1dcbab43a8 --- /dev/null +++ b/commercial-settings.gradle @@ -0,0 +1,27 @@ +subprojects { + repositories { + mavenCentral() + def repoUsername = project.findProperty("artifactoryUsername") ?: System.getenv("COMMERCIAL_REPO_USERNAME") + def repoPassword = project.findProperty("artifactoryPassword") ?: System.getenv("COMMERCIAL_REPO_PASSWORD") + if (repoUsername && repoPassword) { + maven { + name "spring-commercial-release" + url "https://usw1.packages.broadcom.com/spring-enterprise-maven-prod-local" + credentials { + username repoUsername + password repoPassword + } + } + if ("$version".endsWith("-SNAPSHOT")) { + maven { + name "spring-commercial-snapshot" + url "https://usw1.packages.broadcom.com/spring-enterprise-maven-dev-local" + credentials { + username repoUsername + password repoPassword + } + } + } + } + } +} diff --git a/scripts/release/release-notes-sections.yml b/scripts/release/release-notes-sections.yml index 971b9c184f..03600d31f4 100644 --- a/scripts/release/release-notes-sections.yml +++ b/scripts/release/release-notes-sections.yml @@ -1,5 +1,5 @@ changelog: - repository: spring-projects/spring-security + repository: spring-projects/spring-security-commercial sections: - title: ":rewind: Breaking Changes" labels: ["type: breaks-passivity"] @@ -17,5 +17,6 @@ changelog: labels: ["type: task", "in: build"] sort: "title" issues: + generate_links: false exclude: labels: ["status: duplicate"] diff --git a/settings.gradle b/settings.gradle index 1f6fadd68d..dfda0e62d3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,12 +15,12 @@ dependencyResolutionManagement { } } -rootProject.name = 'spring-security' +rootProject.name = 'spring-security-commercial' FileTree buildFiles = fileTree(rootDir) { List excludes = gradle.startParameter.projectProperties.get("excludeProjects")?.split(",") include '**/*.gradle', '**/*.gradle.kts' - exclude 'build', '**/gradle', 'settings.gradle', 'buildSrc', '/build.gradle', '.*', 'out' + exclude 'build', '**/gradle', 'settings.gradle', 'commercial-settings.gradle', 'buildSrc', '/build.gradle', '.*', 'out' exclude '**/grails3' if(excludes) { exclude excludes