Skip to content

Commit fbfa78e

Browse files
authored
fix (#1710)
1 parent 8f761a4 commit fbfa78e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/maven.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: github-workflow
22

33
on:
44
push:
5-
branches: [ main, 3.0.x ]
5+
branches: [ main, 3.0.x, 3.1.x ]
66
pull_request:
7-
branches: [ main, 3.0.x ]
7+
branches: [ main, 3.0.x, 3.1.x ]
88

99
jobs:
1010
build:
@@ -35,7 +35,7 @@ jobs:
3535
- name: setup project jdk-17
3636
id: jdk_17
3737
uses: ./.github/workflows/composites/setup-jdk17
38-
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x'
38+
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x'
3939

4040
- name: cache local maven repository
4141
uses: ./.github/workflows/composites/cache
@@ -115,7 +115,7 @@ jobs:
115115

116116
- name: setup project jdk-17
117117
uses: ./.github/workflows/composites/setup-jdk17
118-
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x'
118+
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x'
119119

120120
- name: pre-test-actions
121121
uses: ./.github/workflows/composites/pre-test-actions
@@ -159,7 +159,7 @@ jobs:
159159

160160
- name: setup project jdk-17
161161
uses: ./.github/workflows/composites/setup-jdk17
162-
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x'
162+
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x'
163163

164164
- name: pre-test-actions
165165
uses: ./.github/workflows/composites/pre-test-actions

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/EventBasedConfigurationChangeDetectorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*/
4646
class EventBasedConfigurationChangeDetectorTests {
4747

48-
@SuppressWarnings({ "unchecked", "raw" })
48+
@SuppressWarnings({ "unchecked", "rawtypes" })
4949
@Test
5050
void verifyConfigChangesAccountsForBootstrapPropertySources() {
5151
MockEnvironment env = new MockEnvironment();

0 commit comments

Comments
 (0)