From e8dd4105e295e9853fb4a00048d01d167af43d24 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 12 Sep 2024 18:25:08 +0000 Subject: [PATCH 1/5] Bumping versions --- .../KubernetesClientConfigMapPropertySourceTests.java | 3 ++- ...ernetesClientEventBasedConfigMapChangeDetectorTests.java | 5 +++-- .../configserver/KubernetesEnvironmentRepositoryTests.java | 3 ++- .../discovery/Fabric8KubernetesDiscoveryClientTest.java | 6 ++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceTests.java index 911f705d..51916d24 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceTests.java @@ -71,7 +71,8 @@ class KubernetesClientConfigMapPropertySourceTests { .withNamespace("default") .withResourceVersion("1") .build()) - .addToData(Constants.APPLICATION_YAML, "dummy:\n property:\n string2: \"a\"\n int2: 1\n bool2: true\n") + .addToData(Constants.APPLICATION_YAML, + "dummy:\n property:\n string2: \"a\"\n int2: 1\n bool2: true\n") .build()); private static WireMockServer wireMockServer; diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetectorTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetectorTests.java index 04a75cb1..8ce97376 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetectorTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetectorTests.java @@ -103,8 +103,9 @@ class KubernetesClientEventBasedConfigMapChangeDetectorTests { data.put(Constants.APPLICATION_PROPERTIES, "spring.cloud.kubernetes.configuration.watcher.refreshDelay=0\n" + "logging.level.org.springframework.cloud.kubernetes=TRACE"); Map updateData = new HashMap<>(); - updateData.put(Constants.APPLICATION_PROPERTIES, "spring.cloud.kubernetes.configuration.watcher.refreshDelay=1\n" - + "logging.level.org.springframework.cloud.kubernetes=TRACE"); + updateData.put(Constants.APPLICATION_PROPERTIES, + "spring.cloud.kubernetes.configuration.watcher.refreshDelay=1\n" + + "logging.level.org.springframework.cloud.kubernetes=TRACE"); V1ConfigMap applicationConfig = new V1ConfigMap().kind("ConfigMap") .metadata(new V1ObjectMeta().namespace("default").name("bar1")) .data(data); diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryTests.java index 5a7ab641..f34aed50 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryTests.java @@ -91,7 +91,8 @@ class KubernetesEnvironmentRepositoryTests { .addItemsItem(new V1ConfigMapBuilder() .withMetadata( new V1ObjectMetaBuilder().withName("stores").withNamespace("dev").withResourceVersion("1").build()) - .addToData(Constants.APPLICATION_YAML, "dummy:\n property:\n string2: \"dev\"\n int2: 1\n bool2: true\n") + .addToData(Constants.APPLICATION_YAML, + "dummy:\n property:\n string2: \"dev\"\n int2: 1\n bool2: true\n") .build()); private static final V1SecretList SECRET_LIST = new V1SecretListBuilder() diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTest.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTest.java index 4c22ce8e..1c6cdf14 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTest.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTest.java @@ -298,10 +298,8 @@ class Fabric8KubernetesDiscoveryClientTest { List result_endpoints = discoveryClient.getEndPointsList("endpoint"); assertThat(result_endpoints).hasSize(2); - assertThat(result_endpoints.stream() - .map(Endpoints::getMetadata) - .map(ObjectMeta::getNamespace) - .toList()).containsOnly(namespace1, namespace3); + assertThat(result_endpoints.stream().map(Endpoints::getMetadata).map(ObjectMeta::getNamespace).toList()) + .containsOnly(namespace1, namespace3); } @Test From fc74b8cd938c335212f5a9399c54cbfedeeb2c7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:46:25 -0400 Subject: [PATCH 2/5] Bump org.awaitility:awaitility from 4.0.3 to 4.1.0 (#1724) Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.0.3 to 4.1.0. - [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt) - [Commits](https://github.com/awaitility/awaitility/commits/awaitility-4.1.0) --- updated-dependencies: - dependency-name: org.awaitility:awaitility dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring-cloud-kubernetes-test-support/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml index 9cc332f2..2b695a95 100644 --- a/spring-cloud-kubernetes-test-support/pom.xml +++ b/spring-cloud-kubernetes-test-support/pom.xml @@ -12,7 +12,7 @@ spring-cloud-kubernetes-test-support - 4.0.3 + 4.1.0 1.18.3 From d0405fb88ac975d8281ffe4278d87f8652b2123d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:10:54 -0400 Subject: [PATCH 3/5] Bump org.awaitility:awaitility from 4.1.0 to 4.1.1 (#1741) Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.1.0 to 4.1.1. - [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt) - [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.1.0...awaitility-4.1.1) --- updated-dependencies: - dependency-name: org.awaitility:awaitility dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring-cloud-kubernetes-test-support/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml index 2b695a95..8d00f8b0 100644 --- a/spring-cloud-kubernetes-test-support/pom.xml +++ b/spring-cloud-kubernetes-test-support/pom.xml @@ -12,7 +12,7 @@ spring-cloud-kubernetes-test-support - 4.1.0 + 4.1.1 1.18.3 From 53cbe7a359b67160f494642aecc78b271200a46a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:12:28 -0400 Subject: [PATCH 4/5] Bump @springio/asciidoctor-extensions in /docs (#1739) Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.10 to 1.0.0-alpha.14. - [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.10...v1.0.0-alpha.14) --- updated-dependencies: - dependency-name: "@springio/asciidoctor-extensions" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index be7a0c4a..f067320c 100644 --- a/docs/package.json +++ b/docs/package.json @@ -5,6 +5,6 @@ "@antora/collector-extension": "1.0.0-alpha.3", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.11.1", - "@springio/asciidoctor-extensions": "1.0.0-alpha.10" + "@springio/asciidoctor-extensions": "1.0.0-alpha.14" } } From 99dd670a1185318b61624f3af243fa2508e3c95e Mon Sep 17 00:00:00 2001 From: erabii Date: Tue, 1 Oct 2024 15:35:31 +0300 Subject: [PATCH 5/5] Restore common images by key (pipeline bug) (#1749) --- .../workflows/composites/restore-docker-images/action.yaml | 4 ++-- .github/workflows/maven.yaml | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/composites/restore-docker-images/action.yaml b/.github/workflows/composites/restore-docker-images/action.yaml index f6d77c5c..615f632d 100644 --- a/.github/workflows/composites/restore-docker-images/action.yaml +++ b/.github/workflows/composites/restore-docker-images/action.yaml @@ -29,8 +29,8 @@ runs: uses: actions/cache/save@v4 if: steps.images-cache.outputs.cache-hit != 'true' with: - path: | - /tmp/docker/images + path: /tmp/docker/images + key: docker-images-github-cache-${{ hashFiles('**/current-images.txt') }} - name: print images shell: bash diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 71962821..8c6e6afc 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -48,9 +48,7 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, }) - for (const cache of caches.data.actions_caches) { - console.log(cache) - } + console.log(caches.data) - name: maven build with dry-run for tests uses: ./.github/workflows/composites/maven-build-with-dry-run-for-tests