From 0b9bf0200a73638a149ec625d502d891ff878b58 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 1 Jul 2025 22:14:15 +0300 Subject: [PATCH 1/7] test Signed-off-by: wind57 --- .settings.xml | 4 ++++ .../kubernetes-leader-election-example/pom.xml | 11 +---------- spring-cloud-kubernetes-examples/pom.xml | 6 ++++++ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.settings.xml b/.settings.xml index c8add61d78..4e199c5c3a 100644 --- a/.settings.xml +++ b/.settings.xml @@ -46,6 +46,10 @@ + + central + https://repo1.maven.org/maven2/ + spring-snapshots Spring Snapshots diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml index 6268864c01..2a83490e9a 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml @@ -11,8 +11,7 @@ kubernetes-leader-election-example Spring Cloud Kubernetes :: Examples :: Leader Election - Leader election demonstration with Spring Integration and ConfigMap - + Leader election demonstration with Spring Integration and ConfigMap @@ -73,14 +72,6 @@ true - - maven-surefire-plugin - 3.1.2 - - - maven-failsafe-plugin - 3.1.2 - diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml index 91a1274c64..970c2a2747 100644 --- a/spring-cloud-kubernetes-examples/pom.xml +++ b/spring-cloud-kubernetes-examples/pom.xml @@ -26,6 +26,12 @@ 3.1.7-SNAPSHOT + + + 3.5.3 + 3.5.3 + + spring-cloud-kubernetes-examples pom From c3cd4c8df42f3a14c1bc7b0bf977016568d0e0ad Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 2 Jul 2025 07:25:43 +0300 Subject: [PATCH 2/7] test Signed-off-by: wind57 --- .../run-and-save-test-times-when-cache-missing/action.yaml | 1 + .../run-and-save-test-times-when-cache-present/action.yaml | 1 + 2 files changed, 2 insertions(+) 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 index 8366aa3252..f0c5d08cfb 100644 --- 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 @@ -46,6 +46,7 @@ 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 \ -Dspring-boot.build-image.skip=true 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 index 9cfbcaefd3..11692d320e 100644 --- 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 @@ -155,6 +155,7 @@ 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 \ -Dspring-boot.build-image.skip=true From e9eb6893d7c65110dfc13a5a2a4d2a91db90e40c Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 2 Jul 2025 07:51:48 +0300 Subject: [PATCH 3/7] test Signed-off-by: wind57 --- .../run-and-save-test-times-when-cache-missing/action.yaml | 1 + .../run-and-save-test-times-when-cache-present/action.yaml | 1 + 2 files changed, 2 insertions(+) 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 index f0c5d08cfb..0adeff92d7 100644 --- 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 @@ -48,6 +48,7 @@ runs: -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 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 index 11692d320e..a2f91d3cde 100644 --- 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 @@ -157,6 +157,7 @@ runs: -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 From 1ed32900dcc21385cbc45e74062cdef9ca111220 Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 2 Jul 2025 08:15:06 +0300 Subject: [PATCH 4/7] test Signed-off-by: wind57 From 669d000c98635456455138e05d8b19f45d6f4ace Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 2 Jul 2025 11:12:31 +0300 Subject: [PATCH 5/7] disable man-db Signed-off-by: wind57 --- .github/workflows/composites/clean-space/action.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml index f115de3a20..0c9546e9c5 100644 --- a/.github/workflows/composites/clean-space/action.yaml +++ b/.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: From 1a5990f6342aeb00898ad5dc8258d5c871131551 Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 2 Jul 2025 11:14:23 +0300 Subject: [PATCH 6/7] drop explicit java version Signed-off-by: wind57 --- spring-cloud-kubernetes-commons/pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml index 6a6ee7919a..4b22ccd36d 100644 --- a/spring-cloud-kubernetes-commons/pom.xml +++ b/spring-cloud-kubernetes-commons/pom.xml @@ -11,18 +11,6 @@ spring-cloud-kubernetes-commons ${project.artifactId} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 17 - 17 - - - - From 218b4ac754dda31ff6d7daf81c57d46f2a6b5732 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 15 Jul 2025 10:30:10 +0300 Subject: [PATCH 7/7] fix comments Signed-off-by: wind57 --- spring-cloud-kubernetes-examples/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml index 970c2a2747..91a1274c64 100644 --- a/spring-cloud-kubernetes-examples/pom.xml +++ b/spring-cloud-kubernetes-examples/pom.xml @@ -26,12 +26,6 @@ 3.1.7-SNAPSHOT - - - 3.5.3 - 3.5.3 - - spring-cloud-kubernetes-examples pom