build: Add JDK17 to the build matrix (#761)

* chore: make `InstallProviderTest.useZipProviderPathNotExists` work with jdk 8, 11, 17 * feat(jdk17): Add support for JDK 17 TLS * chore(docs): Update documentation about supported JDKs * build: Remove jdk8 from the build matrix. --------- Co-authored-by: guicamest <[email protected]>
carlspring · Sep 28, 2023 · 13c4629 · 13c4629
1 parent 3239ec7
commit 13c4629
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -54,7 +54,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-        java: [ 8, 11 ]
+        java: [ 11, 17 ]
         #os: [ ubuntu-latest ]
         #java: [ 11 ]
     steps:

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 # S3FS NIO
 
 [![Master Build Status](https://github.com/carlspring/s3fs-nio/workflows/Build%20and%20test/badge.svg)](https://github.com/carlspring/s3fs-nio/actions?query=branch%3Amaster)
-![JDK support badge](https://img.shields.io/badge/JDK-8%20and%2011-blue)
+![JDK support badge](https://img.shields.io/badge/JDK-8%20,%2011%20,%2017-blue)
 [![Maven Release Version](https://img.shields.io/maven-central/v/org.carlspring.cloud.aws/s3fs-nio)](https://repo.maven.apache.org/maven2/org/carlspring/cloud/aws/s3fs-nio/)
 [![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](https://s3fs-nio.carlspring.org) 
 [![License](https://img.shields.io/badge/License-Apache%202.0-brightgreen.svg)](https://github.com/carlspring/s3fs-nio/blob/master/LICENSE.Apache-2.0.md) 
@@ -33,7 +33,7 @@ This project provides a complete API implementation, for managing files and fold
 
 ## Compatibility
 
-We support both JDK 8 and 11.
+We support JDK 8, 11 and 17.
 
 ## Documentation
 

diff --git a/docs/content/contributing/developer-guide/index.md b/docs/content/contributing/developer-guide/index.md
@@ -10,7 +10,7 @@ Before you start writing code, please read:
 ## System requirements
 
 1. Gradle 8.1, or higher
-2. `JDK8` or `JDK11`
+2. `JDK8`, `JDK11` or `JDK17`
 
 ## Finding issues to work on
 

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/spike/InstallProviderTest.java b/src/test/java/org/carlspring/cloud/storage/s3fs/spike/InstallProviderTest.java
@@ -10,6 +10,7 @@
 import java.nio.file.FileSystemNotFoundException;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
@@ -21,6 +22,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.regions.Region;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchException;
 import static org.carlspring.cloud.storage.s3fs.S3Factory.REGION;
 import static org.carlspring.cloud.storage.s3fs.util.S3EndpointConstant.S3_GLOBAL_URI_TEST;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -76,10 +80,8 @@ void useZipProviderPathNotExists()
         final ClassLoader classLoader = this.getClass().getClassLoader();
 
         // We're expecting an exception here to be thrown
-        Exception exception = assertThrows(FileSystemNotFoundException.class,
-                                           () -> FileSystems.newFileSystem(uri, envMap, classLoader));
-
-        assertNotNull(exception);
+        Exception thrownBy = catchException(() -> FileSystems.newFileSystem(uri, envMap, classLoader));
+        assertThat(thrownBy).isNotNull().isInstanceOfAny(FileSystemNotFoundException.class, NoSuchFileException.class);
     }
 
     @Test