Merge branch 'main' of https://github.com/spring-cloud/spring-cloud-kubernetes

Author: wind57

.github/dependabot.yml

@@ -20,6 +20,7 @@ updates:
       - dependency-name: "*"
         update-types:
           - version-update:semver-major
+          - version-update:semver-minor
   - package-ecosystem: maven
     directory: /
     schedule:
@@ -31,6 +32,17 @@ updates:
         update-types:
           - version-update:semver-major
           - version-update:semver-minor
+  - package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: daily
+    target-branch: 3.2.x
+    ignore:
+      # only upgrade by minor or patch
+      - dependency-name: "*"
+        update-types:
+          - version-update:semver-major
+          - version-update:semver-minor
   - package-ecosystem: npm
     target-branch: docs-build
     directory: /
@@ -46,3 +58,8 @@ updates:
     directory: /docs
     schedule:
       interval: weekly
+  - package-ecosystem: npm
+    target-branch: 3.2.x
+    directory: /docs
+    schedule:
+      interval: weekly

.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
 

.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

.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
         

.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
 

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>

spring-cloud-kubernetes-dependencies/pom.xml

@@ -32,9 +32,9 @@
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>
 	<properties>
-		<kubernetes-fabric8-client.version>6.13.4</kubernetes-fabric8-client.version>
+		<kubernetes-fabric8-client.version>6.13.5</kubernetes-fabric8-client.version>
 		<kubernetes-native-client.version>19.0.2</kubernetes-native-client.version>
-		<wiremock.version>3.4.2</wiremock.version>
+		<wiremock.version>3.9.1</wiremock.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java

@@ -37,7 +37,7 @@ class Fabric8UserAgentDefaultConfigurationTests {
 	@Test
 	void testUserAgent() {
 		String userAgent = client.getConfiguration().getUserAgent();
-		assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.13.4");
+		assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.13.5");
 	}
 
 }

spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderInitiatorTest.java

@@ -60,6 +60,7 @@ void beforeEach() {
 	@AfterEach
 	void afterEach() {
 		leaderInitiator.stop();
+		Mockito.reset(mockFabric8LeadershipController, mockFabric8LeaderRecordWatcher, mockFabric8PodReadinessWatcher);
 	}
 
 	@Test

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.