Merge branch '3.2.x'

spring-cloud · Jan 31, 2025 · de4dc29 · de4dc29
2 parents 54563eb + 9253f47
commit de4dc29
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 17 deletions.
diff --git a/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml b/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml
@@ -8,7 +8,7 @@ runs:
       shell: bash
       run: |
         ./mvnw install -B  \
-              -Dskip.build.image=true \
+              -Dspring-boot.build-image.skip=true \
               -DskipTests -DskipITs \
               -T 1C -U -q
 

diff --git a/.github/workflows/composites/pre-test-actions/action.yaml b/.github/workflows/composites/pre-test-actions/action.yaml
@@ -24,7 +24,7 @@ runs:
     - name: build project
       shell: bash
       run: |
-        ./mvnw clean install -Dskip.build.image=true -DskipITs -DskipTests -T1C -U -B -q  
+        ./mvnw clean install -Dspring-boot.build-image.skip=true -DskipITs -DskipTests -T1C -U -B -q  
 
     - name: build controllers project
       uses: ./.github/workflows/composites/build-controllers-project

diff --git a/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml b/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml
@@ -47,7 +47,7 @@ runs:
             -Dmaven.wagon.http.pool=false \
             -Dmaven.wagon.http.retryHandler.class=standard \
             -Dmaven.wagon.http.retryHandler.count=3 \
-            -Dskip.build.image=true          
+            -Dspring-boot.build-image.skip=true          
         
         touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt
         

diff --git a/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml b/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml
@@ -156,7 +156,7 @@ runs:
               -Dmaven.wagon.http.pool=false \
               -Dmaven.wagon.http.retryHandler.class=standard \
               -Dmaven.wagon.http.retryHandler.count=3 \
-              -Dskip.build.image=true
+              -Dspring-boot.build-image.skip=true
 
         touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt
 

diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml
@@ -33,9 +33,6 @@
 				<executions>
 					<execution>
 						<id>build-image</id>
-						<configuration>
-							<skip>${skip.build.image}</skip>
-						</configuration>
 						<phase>package</phase>
 						<goals>
 							<goal>build-image-no-fork</goal>

diff --git a/spring-cloud-kubernetes-integration-tests/README b/spring-cloud-kubernetes-integration-tests/README
@@ -13,9 +13,6 @@ you must name the image with the same name as the module. For example:
 	<executions>
 		<execution>
            <id>build-image</id>
-           <configuration>
-              <skip>${skip.build.image}</skip>
-           </configuration>
            <phase>package</phase>
            <goals>
               <goal>build-image-no-fork</goal>
@@ -36,7 +33,3 @@ Notice this line:
     <imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
 
 You must follow the same convention.
-
-One more important part in this configuration is : "<skip>${skip.build.image}</skip>".
-We use this setting in the build pipeline where in some stages we skip the image build,
-only to have it build in some latter ones.
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -38,9 +38,6 @@
 				<executions>
 					<execution>
 						<id>build-image</id>
-						<configuration>
-							<skip>${skip.build.image}</skip>
-						</configuration>
 						<phase>package</phase>
 						<goals>
 							<goal>build-image-no-fork</goal>