From 8a0d80d1570c7e38b247e7d70d3a8dc1c1fb971d Mon Sep 17 00:00:00 2001
From: thomas <zimmi@users.noreply.github.com>
Date: Wed, 14 Apr 2021 23:50:17 +0200
Subject: [PATCH] Add module-info.java, fixes #2

- Bump test dependency + plugin versions
- Set project.build.sourceEncoding to fix build warning
- Fix FileListTest when run as a module
- Bump Travis JDK version to oraclejdk9
- Set scm.url without property reference so it works on search.maven.org
---
 .travis.yml                                   |  2 +-
 pom.xml                                       | 34 +++++++++--------
 src/main/java/module-info.java                |  6 +++
 .../rzymek/opczip/reader/FileListTest.java    | 37 ++++++++-----------
 4 files changed, 40 insertions(+), 39 deletions(-)
 create mode 100644 src/main/java/module-info.java

diff --git a/.travis.yml b/.travis.yml
index c0f28cf..3b60663 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +1,2 @@
 language: java
-jdk: oraclejdk8
+jdk: oraclejdk9
diff --git a/pom.xml b/pom.xml
index e33a3eb..03e7b4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <url>https://github.com/rzymek/opczip</url>
 
     <scm>
-        <url>${project.url}</url>
+        <url>https://github.com/rzymek/opczip</url>
     </scm>
 
     <licenses>
@@ -32,15 +32,15 @@
     </developers>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.release>9</maven.compiler.release>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.6.0</version>
+            <version>5.7.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -52,13 +52,13 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.15.0</version>
+            <version>3.19.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.7.0-M1</version>
+            <version>5.7.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>1.23</version>
+            <version>1.29</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -78,16 +78,18 @@
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>3.0.0-M5</version>
+                <configuration>
+                    <argLine>
+                        --add-opens com.github.rzymek.opczip/com.github.rzymek.opczip=ALL-UNNAMED
+                        --add-opens com.github.rzymek.opczip/com.github.rzymek.opczip.reader=ALL-UNNAMED
+                    </argLine>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
-                <configuration>
-                    <source>9</source>
-                    <target>9</target>
-                </configuration>
+                <version>3.8.1</version>
             </plugin>
         </plugins>
     </build>
@@ -100,7 +102,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.2.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -113,7 +115,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.2.0</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -140,7 +142,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.7</version>
+                        <version>1.6.8</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..c84b15d
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module com.github.rzymek.opczip {
+    exports com.github.rzymek.opczip;
+    exports com.github.rzymek.opczip.reader;
+    exports com.github.rzymek.opczip.reader.ordered;
+    exports com.github.rzymek.opczip.reader.skipping;
+}
diff --git a/src/test/java/com/github/rzymek/opczip/reader/FileListTest.java b/src/test/java/com/github/rzymek/opczip/reader/FileListTest.java
index 952b5fd..675f1fd 100644
--- a/src/test/java/com/github/rzymek/opczip/reader/FileListTest.java
+++ b/src/test/java/com/github/rzymek/opczip/reader/FileListTest.java
@@ -9,10 +9,13 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.*;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -66,25 +69,15 @@ private InputStream open(String filename) {
 
     @Override
     public Stream<? extends Arguments> provideArguments(ExtensionContext extensionContext) {
-        InputStream resource = FileListTest.class.getResourceAsStream(XLSX_DIR);
-        Scanner scanner = new Scanner(resource);
-        return StreamSupport.stream(
-                Spliterators.spliteratorUnknownSize(new Iterator<>() {
-                    @Override
-                    public boolean hasNext() {
-                        boolean hasNext = scanner.hasNext();
-                        if (!hasNext) {
-                            scanner.close();
-                        }
-                        return hasNext;
-                    }
-
-                    @Override
-                    public Arguments next() {
-                        return Arguments.of(scanner.nextLine());
-                    }
-                }, Spliterator.ORDERED),
-                false
-        );
+        try {
+            URI resource = FileListTest.class.getResource(XLSX_DIR).toURI();
+            Path path = Paths.get(resource);
+            return Files.list(path)
+                    .map(Path::getFileName)
+                    .map(Path::toString)
+                    .map(Arguments::of);
+        } catch (URISyntaxException | IOException ex) {
+            throw new IllegalStateException(ex);
+        }
     }
 }