From 4caec0fcfac93d83f956f818f440133de483ccd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:14:18 -0400 Subject: [PATCH 1/3] Bump org.testcontainers:k3s from 1.18.0 to 1.18.3 (#1708) Bumps [org.testcontainers:k3s](https://github.com/testcontainers/testcontainers-java) from 1.18.0 to 1.18.3. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.18.0...1.18.3) --- updated-dependencies: - dependency-name: org.testcontainers:k3s dependency-type: direct:development 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-integration-tests/pom.xml | 2 +- spring-cloud-kubernetes-test-support/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index 4f3e9ef3..d2133c78 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -18,7 +18,7 @@ 17 3.2.13 - 1.18.0 + 1.18.3 diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml index 50f25d47..19649969 100644 --- a/spring-cloud-kubernetes-test-support/pom.xml +++ b/spring-cloud-kubernetes-test-support/pom.xml @@ -13,7 +13,7 @@ 4.0.3 - 1.19.0 + 1.18.3 From 8f761a43ed06a1a996163a515516cadc8fc02f3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:15:12 -0400 Subject: [PATCH 2/3] Bump org.codehaus.mojo:exec-maven-plugin from 3.1.0 to 3.1.1 (#1707) Bumps [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/exec-maven-plugin-3.1.0...3.1.1) --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin 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 19649969..9cc332f2 100644 --- a/spring-cloud-kubernetes-test-support/pom.xml +++ b/spring-cloud-kubernetes-test-support/pom.xml @@ -61,7 +61,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.0 + 3.1.1 From fbfa78e4d4cf17a0ba1f416a40662f95e74c42ff Mon Sep 17 00:00:00 2001 From: erabii Date: Wed, 4 Sep 2024 21:00:02 +0300 Subject: [PATCH 3/3] fix (#1710) --- .github/workflows/maven.yaml | 10 +++++----- .../EventBasedConfigurationChangeDetectorTests.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index a68e5d45..71962821 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -2,9 +2,9 @@ name: github-workflow on: push: - branches: [ main, 3.0.x ] + branches: [ main, 3.0.x, 3.1.x ] pull_request: - branches: [ main, 3.0.x ] + branches: [ main, 3.0.x, 3.1.x ] jobs: build: @@ -35,7 +35,7 @@ jobs: - name: setup project jdk-17 id: jdk_17 uses: ./.github/workflows/composites/setup-jdk17 - if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' + if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x' - name: cache local maven repository uses: ./.github/workflows/composites/cache @@ -115,7 +115,7 @@ jobs: - name: setup project jdk-17 uses: ./.github/workflows/composites/setup-jdk17 - if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' + if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x' - name: pre-test-actions uses: ./.github/workflows/composites/pre-test-actions @@ -159,7 +159,7 @@ jobs: - name: setup project jdk-17 uses: ./.github/workflows/composites/setup-jdk17 - if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' + if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x' - name: pre-test-actions uses: ./.github/workflows/composites/pre-test-actions diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/EventBasedConfigurationChangeDetectorTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/EventBasedConfigurationChangeDetectorTests.java index df9534e1..8c08f844 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/EventBasedConfigurationChangeDetectorTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/EventBasedConfigurationChangeDetectorTests.java @@ -45,7 +45,7 @@ import static org.mockito.Mockito.when; */ class EventBasedConfigurationChangeDetectorTests { - @SuppressWarnings({ "unchecked", "raw" }) + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test void verifyConfigChangesAccountsForBootstrapPropertySources() { MockEnvironment env = new MockEnvironment();