Merge branch 'main' into fix-1715-drop-profiles-support

Author: wind57

.github/dependabot.yml

@@ -15,17 +15,17 @@ updates:
     schedule:
       interval: daily
     target-branch: main
-    ignore:
-      # only upgrade by minor or patch
-      - dependency-name: "*"
-        update-types:
-          - version-update:semver-major
-          - version-update:semver-minor
+#    ignore:
+#      # only upgrade by minor or patch
+#      - dependency-name: "*"
+#        update-types:
+#          - version-update:semver-major
+#          - version-update:semver-minor
   - package-ecosystem: maven
     directory: /
     schedule:
       interval: daily
-    target-branch: 3.1.x
+    target-branch: 3.2.x
     ignore:
       # only upgrade by minor or patch
       - dependency-name: "*"
@@ -36,13 +36,14 @@ updates:
     directory: /
     schedule:
       interval: daily
-    target-branch: 3.2.x
+    target-branch: 3.3.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: /
@@ -54,12 +55,12 @@ updates:
     schedule:
       interval: weekly
   - package-ecosystem: npm
-    target-branch: 3.1.x
+    target-branch: 3.2.x
     directory: /docs
     schedule:
       interval: weekly
   - package-ecosystem: npm
-    target-branch: 3.2.x
+    target-branch: 3.3.x
     directory: /docs
     schedule:
       interval: weekly

.github/workflows/composites/clean-space/action.yaml

@@ -4,6 +4,12 @@ runs:
   using: "composite"
   steps:
 
+    - name: Disable man-db to make package install and removal faster
+      shell: bash
+      run: |
+        echo 'set man-db/auto-update false' | sudo debconf-communicate >/dev/null
+        sudo dpkg-reconfigure man-db 
+
     - name: Free Disk Space
       uses: jlumbroso/free-disk-space@main
       with:

.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml

@@ -15,7 +15,9 @@ runs:
     - name: find all classpath entries
       shell: bash
       run: |
-        ./mvnw -q exec:exec -Dexec.classpathScope="test" -Dexec.executable="echo" -Dexec.args="%classpath" | tr : "\n" > /tmp/deps.txt
+        # skip 'spring-cloud-kubernetes-controllers' project since we do not want to run tests from it.
+        # we already do that in the 'build-controllers-project/action.yaml', that happens before this step
+        ./mvnw -q exec:exec -Dexec.classpathScope="test" -Dexec.executable="echo" -Dexec.args="%classpath" | tr : "\n" | grep -v spring-cloud-kubernetes-controllers > /tmp/deps.txt
 
     - name: find all tests
       shell: bash

.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml

@@ -46,7 +46,9 @@ runs:
             -Dhttp.keepAlive=false \
             -Dmaven.wagon.http.pool=false \
             -Dmaven.wagon.http.retryHandler.class=standard \
+            -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
             -Dmaven.wagon.http.retryHandler.count=3 \
+            -Dmaven.resolver.transport=wagon \
             -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

@@ -155,7 +155,9 @@ runs:
               -Dhttp.keepAlive=false \
               -Dmaven.wagon.http.pool=false \
               -Dmaven.wagon.http.retryHandler.class=standard \
+              -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
               -Dmaven.wagon.http.retryHandler.count=3 \
+              -Dmaven.resolver.transport=wagon \
               -Dspring-boot.build-image.skip=true
 
         touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt

.github/workflows/deploy-docs.yml

@@ -16,7 +16,7 @@ jobs:
     # if: github.repository_owner == 'spring-cloud'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: docs-build
           fetch-depth: 1

.github/workflows/maven.yaml

@@ -2,9 +2,9 @@ name: github-workflow
 
 on:
   push:
-    branches: [ main, 3.0.x, 3.1.x, 3.2.x ]
+    branches: [ main, 3.2.x, 3.3.x ]
   pull_request:
-    branches: [ main, 3.0.x, 3.1.x, 3.2.x ]
+    branches: [ main, 3.2.x, 3.3.x ]
 
 jobs:
   build:
@@ -27,7 +27,7 @@ jobs:
     steps:
 
       - name: checkout project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: set env variables
         uses: ./.github/workflows/composites/env-variables
@@ -103,7 +103,7 @@ jobs:
     steps:
 
       - name: checkout project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: clean space
         uses: ./.github/workflows/composites/clean-space
@@ -147,7 +147,7 @@ jobs:
     steps:
 
       - name: checkout project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: clean space
         uses: ./.github/workflows/composites/clean-space
@@ -184,7 +184,7 @@ jobs:
     steps:
 
       - name: checkout project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: compute and save running time of tests
         uses: ./.github/workflows/composites/test-times
@@ -196,7 +196,7 @@ jobs:
     steps:
 
       - name: checkout project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: compute and save running time of tests
         uses: ./.github/workflows/composites/test-times

.settings.xml

@@ -46,6 +46,10 @@
 				</repository>
 			</repositories>
 			<pluginRepositories>
+				<pluginRepository>
+					<id>central</id>
+					<url>https://repo1.maven.org/maven2/</url>
+				</pluginRepository>
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>

docs/modules/ROOT/pages/discovery-client.adoc

@@ -48,7 +48,7 @@ HTTP Based `DiscoveryClient`
 ====
 
 NOTE: `spring-cloud-starter-kubernetes-discoveryclient` is designed to be used with the
-<<spring-cloud-kubernetes-discoveryserver, Spring Cloud Kubernetes DiscoveryServer>>.
+xref:spring-cloud-kubernetes-discoveryserver.adoc[Spring Cloud Kubernetes DiscoveryServer].
 
 To enable loading of the `DiscoveryClient`, add `@EnableDiscoveryClient` to the according configuration or application class, as the following example shows:
 

docs/modules/ROOT/pages/getting-started.adoc

@@ -32,7 +32,7 @@ use and use the starters for that library only.
     <artifactId>spring-cloud-starter-kubernetes-client</artifactId>
 </dependency>
 ----
-| <<DiscoveryClient for Kubernetes,Discovery Client>> implementation that
+| xref:discovery-client.adoc[Discovery Client] implementation that
 resolves service names to Kubernetes Services.
 
 | [source,xml]