From 5cf398e5e8812619b9362d3d9faac1a42d397321 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Tue, 30 Jul 2024 09:42:56 +0200
Subject: [PATCH] Update release tooling for enterprise releases.

Closes #92
---
 Jenkinsfile                                        |  1 +
 smoke-tests/pom.xml                                |  9 +++++----
 smoke-tests/settings.xml                           | 14 ++++++++++++--
 .../data/release/build/UpdateInformation.java      |  5 ++---
 src/main/resources/application.properties          | 10 +++++-----
 .../release/build/UpdateInformationUnitTests.java  |  4 ++++
 6 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b9fc430..be66654 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,6 +55,7 @@ pipeline {
 				GITHUB_TOKEN = credentials('7b3ebbea-7001-479b-8578-b8c464dab973')
 				REPO_SPRING_IO = credentials('repo_spring_io-jenkins-release-token')
 				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				COMMERCIAL = credentials('usw1_packages_broadcom_com-jenkins-token')
 				STAGING_PROFILE_ID = credentials('spring-data-release-deployment-maven-central-staging-profile-id')
 				MAVEN_SIGNING_KEY = credentials('spring-gpg-private-key')
 				MAVEN_SIGNING_KEY_PASSWORD = credentials('spring-gpg-passphrase')
diff --git a/smoke-tests/pom.xml b/smoke-tests/pom.xml
index e70e70b..390b73a 100644
--- a/smoke-tests/pom.xml
+++ b/smoke-tests/pom.xml
@@ -97,16 +97,17 @@
 			<id>commercial</id>
 
 			<repositories>
+
 				<repository>
-					<id>spring-commercial-release</id>
+					<id>spring-enterprise-stage</id>
 					<url>
-						https://repo.spring.vmware.com/artifactory/spring-commercial/
+						https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-stage-local/
 					</url>
 				</repository>
 				<repository>
-					<id>spring-commercial-staging</id>
+					<id>spring-enterprise-release</id>
 					<url>
-						https://repo.spring.vmware.com/artifactory/spring-commercial-staging-local/
+						https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-prod-local/
 					</url>
 				</repository>
 			</repositories>
diff --git a/smoke-tests/settings.xml b/smoke-tests/settings.xml
index 355a5af..d788021 100644
--- a/smoke-tests/settings.xml
+++ b/smoke-tests/settings.xml
@@ -16,8 +16,18 @@
 		</server>
 		<server>
 			<id>spring-libs-milestone</id>
-			<username>${ARTIFACTORY_USR}</username>
-			<password>${ARTIFACTORY_PSW}</password>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+		<server>
+			<id>spring-enterprise-stage</id>
+			<username>${env.COMMERCIAL_USR}</username>
+			<password>${env.COMMERCIAL_PSW}</password>
+		</server>
+		<server>
+			<id>spring-enterprise-release</id>
+			<username>${env.COMMERCIAL_USR}</username>
+			<password>${env.COMMERCIAL_PSW}</password>
 		</server>
 	</servers>
 
diff --git a/src/main/java/org/springframework/data/release/build/UpdateInformation.java b/src/main/java/org/springframework/data/release/build/UpdateInformation.java
index 57fd4c9..e3651f0 100644
--- a/src/main/java/org/springframework/data/release/build/UpdateInformation.java
+++ b/src/main/java/org/springframework/data/release/build/UpdateInformation.java
@@ -102,12 +102,11 @@ public class UpdateInformation {
 
 		if (phase == Phase.CLEANUP || phase == Phase.MAINTENANCE) {
 
-			return train.isCommercial()
-					? Arrays.asList(Repository.COMMERCIAL_SNAPSHOT, Repository.COMMERCIAL_RELEASE)
+			return train.isCommercial() ? Arrays.asList(Repository.COMMERCIAL_SNAPSHOT, Repository.COMMERCIAL_RELEASE)
 					: Arrays.asList(Repository.SNAPSHOT, Repository.MILESTONE);
 		}
 
-		return train.isCommercial() ? Arrays.asList(Repository.COMMERCIAL_RELEASE) : Collections.emptyList();
+		return Collections.emptyList();
 	}
 
 	/**
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 7d58448..f066720 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -29,11 +29,11 @@ deployment.opensource.distribution-repository=temp-private-local
 # deployment.commercial.api-key <- local, for promotion
 
 # Prod
-deployment.commercial.server.uri=https://repo.spring.vmware.com
-deployment.commercial.server.verification-resource=spring-commercial-staging-local
-deployment.commercial.staging-repository=spring-commercial-staging-local
-deployment.commercial.target-repository=spring-commercial-release-local
-deployment.commercial.distribution-repository=spring-commercial-release-local
+deployment.commercial.server.uri=https://usw1.packages.broadcom.com
+deployment.commercial.server.verification-resource=spring-enterprise-maven-stage-local
+deployment.commercial.staging-repository=spring-enterprise-maven-stage-local
+deployment.commercial.target-repository=spring-enterprise-maven-prod-local
+deployment.commercial.distribution-repository=spring-enterprise-maven-prod-local
 deployment.commercial.project=spring
 # deployment.commercial.distribution-repository=
 # deployment.commercial.username <- local, for build
diff --git a/src/test/java/org/springframework/data/release/build/UpdateInformationUnitTests.java b/src/test/java/org/springframework/data/release/build/UpdateInformationUnitTests.java
index f018986..14863bd 100644
--- a/src/test/java/org/springframework/data/release/build/UpdateInformationUnitTests.java
+++ b/src/test/java/org/springframework/data/release/build/UpdateInformationUnitTests.java
@@ -70,6 +70,10 @@ class UpdateInformationUnitTests {
 				Phase.PREPARE);
 
 		assertThat(updateInformation.getRepositories()).isEmpty();
+
+		updateInformation = UpdateInformation.of(new TrainIteration(ReleaseTrains.TURING, Iteration.GA), Phase.PREPARE);
+
+		assertThat(updateInformation.getRepositories()).isEmpty();
 	}
 
 	@Test