From 832110779563fad36e1beb968737d4dae181bc8a Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Wed, 24 Nov 2021 15:11:32 +0100 Subject: [PATCH] ci: Update pipelines to verify compilation on Java 17 Signed-off-by: Marc Nuri --- .github/workflows/build.yml | 2 +- .github/workflows/sonar.yml | 4 ++-- .github/workflows/windows-build.yml | 2 +- .../io/fabric8/kubernetes/client/utils/SerializationTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da2bec87701..e62ccef52cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8,11] + java: [8,17] steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 5b23d19c333..0a82b68565c 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -46,10 +46,10 @@ jobs: with: # Shallow clones should be disabled for a better relevancy of analysis fetch-depth: 0 - - name: Setup Java 11 # Move Sonar analysis to Java 11 + - name: Setup Java 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' - name: Maven Sonar run: ./mvnw ${MAVEN_ARGS} clean install sonar:sonar -Psonar diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 3bdada14a31..b0503e0cd16 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -36,7 +36,7 @@ jobs: runs-on: windows-latest strategy: matrix: - java: [11] + java: [17] steps: - name: Checkout uses: actions/checkout@v3 diff --git a/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/utils/SerializationTest.java b/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/utils/SerializationTest.java index 91514d9a6ed..8e5bcd90ee7 100644 --- a/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/utils/SerializationTest.java +++ b/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/utils/SerializationTest.java @@ -164,7 +164,7 @@ void testSerializeYamlWithAlias() { .isNotNull() .hasFieldOrPropertyWithValue("metadata.name", "test-pod-with-alias") .hasFieldOrPropertyWithValue("spec.nodeSelector.workload", "build") - .hasFieldOrPropertyWithValue("spec.tolerations.size", 1) + .returns(1, p -> p.getSpec().getTolerations().size()) .hasFieldOrPropertyWithValue("spec.securityContext.runAsGroup", 1000L) .hasFieldOrPropertyWithValue("spec.securityContext.runAsUser", 1000L) .extracting(Pod::getSpec).extracting(PodSpec::getContainers).asList()