From fbfa78e4d4cf17a0ba1f416a40662f95e74c42ff Mon Sep 17 00:00:00 2001 From: erabii Date: Wed, 4 Sep 2024 21:00:02 +0300 Subject: [PATCH] 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();