From 87b2fd72b888ed71690711bba6fce1bc64fa9c39 Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <oliver.drotbohm@broadcom.com>
Date: Tue, 13 Aug 2024 12:40:44 +0200
Subject: [PATCH] GH-760 - Fix integration builds.

Update integration versions and reference to commercial repositories.
---
 .github/workflows/integration.yaml | 14 +++++++++-----
 pom.xml                            | 20 --------------------
 settings.xml                       | 26 ++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 5b420203..da904b82 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -10,11 +10,15 @@ jobs:
     strategy:
       matrix:
         version:
+        - '3.0.16'
+        - '3.0.17-SNAPSHOT'
         - '3.1.12'
         - '3.1.13-SNAPSHOT'
-        - '3.2.6'
-        - '3.2.7-SNAPSHOT'
-        - '3.3.1-SNAPSHOT'
+        - '3.2.8'
+        - '3.2.9-SNAPSHOT'
+        - '3.3.2'
+        - '3.3.3-SNAPSHOT'
+        - '3.4.0-SNAPSHOT'
     name: Build against Boot ${{ matrix.version }}
     runs-on: ubuntu-latest
 
@@ -37,5 +41,5 @@ jobs:
         DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
       run: |
         cd spring-modulith-examples
-        ../mvnw -B versions:update-parent -s ../settings.xml -Pwith-preview-repos,with-commercial-repos -DskipResolution=true -DparentVersion=${{ matrix.version }}
-        ../mvnw -B clean verify -s ../settings.xml -Pwith-preview-repos,with-commercial-repos -Dspring-boot.version=${{ matrix.version }}
+        ../mvnw -B versions:update-parent -s ../settings.xml -Pspring-enterprise,with-preview-repos -DskipResolution=true -DparentVersion=${{ matrix.version }}
+        ../mvnw -B clean verify -s ../settings.xml -Pspring-enterprise,with-preview-repos -Dspring-boot.version=${{ matrix.version }}
diff --git a/pom.xml b/pom.xml
index dcaf11b4..16e2d85b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,26 +122,6 @@ limitations under the License.
 			</repositories>
 		</profile>
 
-		<profile>
-			<id>with-commercial-repos</id>
-			<repositories>
-				<repository>
-					<id>spring-commercial-releases</id>
-					<url>https://repo.spring.vmware.com/artifactory/spring-commercial-release-local</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-					<id>spring-commercial-snapshots</id>
-					<url>https://repo.spring.vmware.com/artifactory/spring-commercial-snapshot-local</url>
-					<releases>
-						<enabled>false</enabled>
-					</releases>
-				</repository>
-			</repositories>
-		</profile>
-
 		<profile>
 
 			<id>prepare-release</id>
diff --git a/settings.xml b/settings.xml
index fc63e6b2..7bafc99b 100644
--- a/settings.xml
+++ b/settings.xml
@@ -9,4 +9,30 @@
 			<password>${env.SONATYPE_PASSWORD}</password>
 		</server>
 	</servers>
+
+	<profiles>
+		<profile>
+			<id>spring-enterprise</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>spring-enterprise-snapshot</id>
+					<url>https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-dev-local</url>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+				</repository>
+				<repository>
+					<id>spring-enterprise-release</id>
+					<url>https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-prod-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+		</profile>
+	</profiles>
+
 </settings>