GH-659 - Run integration builds against commercial repositories.

spring-projects · Jun 17, 2024 · 3d32b20 · 3d32b20
1 parent 830cb6f
commit 3d32b20
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 2 deletions.
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -32,10 +32,12 @@ jobs:
 
     - name: Build with Maven
       env:
+        COMMERCIAL_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }}
+        COMMERCIAL_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }}
         GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
         GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
       run: |
         cd spring-modulith-examples
-        ../mvnw -B versions:update-parent -DskipResolution=true -DparentVersion=${{ matrix.version }}
-        ../mvnw -B clean verify -Pwith-preview-repos -Dspring-boot.version=${{ matrix.version }}
+        ../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 }}
diff --git a/pom.xml b/pom.xml
@@ -123,6 +123,26 @@ 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/spring-modulith-examples/pom.xml b/spring-modulith-examples/pom.xml
@@ -29,6 +29,49 @@
 		<spring-boot.version>3.3.0</spring-boot.version>
 	</properties>
 
+	<profiles>
+		<profile>
+			<id>with-preview-repos</id>
+			<repositories>
+				<repository>
+					<id>spring-milestone</id>
+					<url>https://repo.spring.io/milestone</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-snapshot</id>
+					<url>https://repo.spring.io/snapshot</url>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+				</repository>
+			</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>
+
+	</profiles>
+
 	<build>
 		<defaultGoal>verify</defaultGoal>
 
@@ -143,4 +186,5 @@
 			</releases>
 		</pluginRepository>
 	</pluginRepositories>
+
 </project>