Run CI with Java 17 and 21

fabric8io · Apr 11, 2024 · 125e2d8 · 125e2d8
1 parent a741e4b
commit 125e2d8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8,11]
+        java: [8,11,17,21]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/behavior/UploadTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/behavior/UploadTest.java
@@ -302,6 +302,7 @@ void bigNumbersSupported(@TempDir Path tempDir) throws Exception {
           // When
           final Path toUploadWithModifiedDate = Files.copy(toUpload, tempDir.resolve("upload-sample.txt"));
           assertTrue(toUploadWithModifiedDate.toFile().setLastModified(9999999999999L)); // Would trigger IllegalArgumentException: last modification time '9999999999' is too big ( > 8589934591 ).
+          assertTrue(toUploadWithModifiedDate.toFile().setLastModified(123456L)); // To have a stable, within ranges, value to compare with
           client.pods().inNamespace("default").withName("success-pod").file("/target-dir/file-name.txt")
               .upload(toUploadWithModifiedDate);
           // Then
@@ -312,7 +313,7 @@ void bigNumbersSupported(@TempDir Path tempDir) throws Exception {
           final TarArchiveInputStream tar = new TarArchiveInputStream(new ByteArrayInputStream(tarBytes));
           assertThat(tar.getNextEntry())
               .hasFieldOrPropertyWithValue("name", "file-name.txt")
-              .hasFieldOrPropertyWithValue("lastModifiedTime", FileTime.fromMillis(9999999999999L));
+              .hasFieldOrPropertyWithValue("lastModifiedTime", FileTime.fromMillis(123456L));
         }
       }
     }

diff --git a/platforms/karaf/pom.xml b/platforms/karaf/pom.xml
@@ -36,7 +36,8 @@
   <properties>
     <karaf.version>4.4.5</karaf.version>
     <osgi.version>6.0.0</osgi.version>
-    <pax.exam.version>4.13.5</pax.exam.version>
+    <!--  NOT Updated because of: https://github.com/ops4j/org.ops4j.pax.exam2/issues/1020#issuecomment-1011133020 causing instability in CI -->
+    <pax.exam.version>4.13.3</pax.exam.version>
   </properties>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -113,7 +113,8 @@
     <awaitility.version>4.2.1</awaitility.version>
     <approvaltests.version>23.0.1</approvaltests.version>
     <mockito.version>4.11.0</mockito.version>
-    <spock.version>2.3-groovy-4.0</spock.version>
+    <mockito-inline.version>4.11.0</mockito-inline.version>
+    <spock.version>2.4-M4-groovy-4.0</spock.version>
 
     <conscrypt-openjdk-uber.bundle.version>1.4.2_1</conscrypt-openjdk-uber.bundle.version>
     <generex.version>1.0.2</generex.version>
@@ -164,8 +165,7 @@
     <maven.plugin.plugin.version>3.12.0</maven.plugin.plugin.version>
     <gmavenplus-plugin.version>3.0.2</gmavenplus-plugin.version>
     <gradle-api-maven-plugin.version>0.0.5</gradle-api-maven-plugin.version>
-    <jandex.plugin.version>1.2.3</jandex.plugin.version>
-    <jandex.version>2.4.4.Final</jandex.version>
+    <jandex.plugin.version>3.1.7</jandex.plugin.version>
     <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
     <jkube.version>1.16.2</jkube.version>
     <sonar-maven-plugin.version>3.11.0.3922</sonar-maven-plugin.version>
@@ -903,7 +903,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-inline</artifactId>
-        <version>${mockito.version}</version>
+        <version>${mockito-inline.version}</version>
         <scope>test</scope>
       </dependency>
 
@@ -1095,7 +1095,7 @@
           <version>${maven.invoker.plugin.version}</version>
         </plugin>
         <plugin>
-          <groupId>org.jboss.jandex</groupId>
+          <groupId>io.smallrye</groupId>
           <artifactId>jandex-maven-plugin</artifactId>
           <version>${jandex.plugin.version}</version>
           <executions>
@@ -1107,13 +1107,6 @@
               <inherited>true</inherited>
             </execution>
           </executions>
-          <dependencies>
-            <dependency>
-              <groupId>org.jboss</groupId>
-              <artifactId>jandex</artifactId>
-              <version>${jandex.version}</version>
-            </dependency>
-          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.jacoco</groupId>
@@ -1172,7 +1165,7 @@
       </plugin>
       <!-- Create jandex index for faster performance in environments that use it -->
       <plugin>
-        <groupId>org.jboss.jandex</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
       </plugin>
       <plugin>
@@ -1581,6 +1574,17 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>java-17</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <properties>
+        <mockito.version>5.11.0</mockito.version>
+        <mockito-inline.version>5.2.0</mockito-inline.version>
+        <karaf.itest.skip>true</karaf.itest.skip>
+      </properties>
+    </profile>
     <profile>
       <id>javadoc-test</id>
       <build>