SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Ryan Baxter
2024-09-04 14:01:55 -04:00
parent d7c3acbc9d fbfa78e4d4
commit 59f9628e91
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/maven.yaml vendored
View File

@@ -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

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

@@ -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();

2
spring-cloud-kubernetes-integration-tests/pom.xml
View File

@@ -18,7 +18,7 @@
<properties>
<java.version>17</java.version>
<docker-java.version>3.2.13</docker-java.version>
<testcontainers.version>1.18.0</testcontainers.version>
<testcontainers.version>1.18.3</testcontainers.version>
</properties>
<build>

4
spring-cloud-kubernetes-test-support/pom.xml
View File

@@ -13,7 +13,7 @@
<properties>
<awaitility.version>4.0.3</awaitility.version>
<testcontainers.version>1.19.0</testcontainers.version>
<testcontainers.version>1.18.3</testcontainers.version>
</properties>
<dependencies>
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
<executions>
<execution>
<goals>