Upgrade to Java 11 and parent version 2.0, and removed deprecated methods

Author: robtimus

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17, 21]
+        java: [11, 17, 21]
       fail-fast: false
     steps:
       - uses: actions/checkout@v5
@@ -43,18 +43,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v5
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'temurin'
           cache: 'maven'
       - name: Build with Maven
         run: mvn compile --file pom.xml -B --no-transfer-progress
       - name: Test with Maven
         run: mvn test --file pom.xml -B --no-transfer-progress -Pmin-versions
 
-  native-module:
+  site:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
@@ -65,17 +65,4 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
       - name: Build with Maven
-        run: mvn package --file pom.xml -B --no-transfer-progress -Pnative-module
-
-  site:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - name: Set up JDK 8
-        uses: actions/setup-java@v5
-        with:
-          java-version: '8'
-          distribution: 'temurin'
-          cache: 'maven'
-      - name: Build with Maven
-        run: mvn site --file pom.xml -B --no-transfer-progress
+        run: mvn package site --file pom.xml -B --no-transfer-progress -DskipTests

.github/workflows/release-site.yml

@@ -26,15 +26,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v5
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'temurin'
           cache: 'maven'
       - name: Build site
         run: |
-          mvn site --file pom.xml -B --no-transfer-progress
+          mvn package site --file pom.xml -B --no-transfer-progress -DskipTests
           for i in `grep '<module>.*</module>' pom.xml`; do
               module=`echo $i | sed 's~<module>\(.*\)</module>~\1~g'`
               echo "Moving site for module $module to target/site"

pom.xml

@@ -22,12 +22,12 @@
   <parent>
     <groupId>com.github.robtimus</groupId>
     <artifactId>robtimus-parent</artifactId>
-    <version>1.18</version>
+    <version>2.0</version>
     <relativePath />
   </parent>
 
   <artifactId>ftp-fs</artifactId>
-  <version>3.4-SNAPSHOT</version>
+  <version>4.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ftp-fs</name>
@@ -74,10 +74,12 @@
   </issueManagement>
 
   <properties>
+    <version.java>11</version.java>
+
     <version.awaitility>4.3.0</version.awaitility>
     <version.commons-net>3.11.1</version.commons-net>
     <version.fs-core>2.3</version.fs-core>
-    <version.junit-support>2.2</version.junit-support>
+    <version.junit-support>3.1</version.junit-support>
     <version.MockFtpServer>3.2.0</version.MockFtpServer>
     <version.simple-pool>1.0</version.simple-pool>
     <version.slf4j>2.0.17</version.slf4j>
@@ -166,13 +168,8 @@
             <sourcepath>${project.basedir}/src/main/java</sourcepath>
             <links>
               <link>https://robtimus.github.io/fs-core/apidocs/</link>
+              <link>https://commons.apache.org/proper/commons-net/apidocs/</link>
             </links>
-            <offlineLinks>
-              <offlineLink>
-                <url>https://commons.apache.org/proper/commons-net/apidocs/</url>
-                <location>${project.basedir}/src/main/apidocs/commons-net/commons-net</location>
-              </offlineLink>
-            </offlineLinks>
           </configuration>
         </plugin>
       </plugins>
@@ -187,6 +184,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>properties</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
       <plugin>
@@ -235,11 +239,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
-
       <plugin>
         <groupId>com.github.robtimus</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -264,6 +263,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{argLine}
+            -javaagent:${org.mockito:mockito-core:jar}
+            <!-- Allow JUnit to fully access the test classes -->
+            --add-opens com.github.robtimus.filesystems.ftp/com.github.robtimus.filesystems.ftp=ALL-UNNAMED
+            --add-reads com.github.robtimus.filesystems.ftp=org.slf4j
+          </argLine>
+        </configuration>
       </plugin>
 
       <plugin>
@@ -310,54 +318,5 @@
         <version.commons-net>3.11.0</version.commons-net>
       </properties>
     </profile>
-
-    <profile>
-      <id>native-module</id>
-      <properties>
-        <version.java>11</version.java>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <!-- Allow JUnit to fully access the test classes -->
-              <argLine>
-                @{argLine}
-                --add-opens com.github.robtimus.filesystems.ftp/com.github.robtimus.filesystems.ftp=ALL-UNNAMED
-                --add-reads com.github.robtimus.filesystems.ftp=org.slf4j
-              </argLine>
-            </configuration>
-          </plugin>
-
-          <plugin>
-            <groupId>org.moditect</groupId>
-            <artifactId>moditect-maven-plugin</artifactId>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-          </plugin>
-
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>${project.basedir}/src/moditect</source>
-                  </sources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>

src/main/apidocs/commons-net/commons-net/package-list

@@ -18,7 +18,6 @@
 package com.github.robtimus.filesystems.ftp;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
@@ -35,6 +34,7 @@
 import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.spi.FileSystemProvider;
 import java.time.Duration;
@@ -371,19 +371,6 @@ public FTPEnvironment withStrictMultilineParsing(boolean strictMultilineParsing)
 
     // FTPClient
 
-    /**
-     * Stores the timeout in milliseconds to use when reading from data connections.
-     *
-     * @param timeout The timeout in milliseconds that is used when opening data connection sockets.
-     * @return This object.
-     * @deprecated Use {@link #withDataTimeout(Duration)} instead.
-     */
-    @Deprecated
-    public FTPEnvironment withDataTimeout(int timeout) {
-        put(DATA_TIMEOUT, timeout);
-        return this;
-    }
-
     /**
      * Stores the timeout to use when reading from data connections.
      *
@@ -578,19 +565,6 @@ public FTPEnvironment withUseEPSVwithIPv4(boolean selected) {
         return this;
     }
 
-    /**
-     * Stores the time to wait between sending control connection keep-alive messages when processing file upload or download.
-     *
-     * @param timeout The keep-alive timeout to use, in milliseconds.
-     * @return This object.
-     * @deprecated Use {@link #withControlKeepAliveTimeout(Duration)} instead.
-     */
-    @Deprecated
-    public FTPEnvironment withControlKeepAliveTimeout(long timeout) {
-        put(CONTROL_KEEP_ALIVE_TIMEOUT, timeout);
-        return this;
-    }
-
     /**
      * Stores the time to wait between sending control connection keep-alive messages when processing file upload or download.
      *
@@ -604,19 +578,6 @@ public FTPEnvironment withControlKeepAliveTimeout(Duration timeout) {
         return this;
     }
 
-    /**
-     * Stores how long to wait for control keep-alive message replies.
-     *
-     * @param timeout The keep-alive reply timeout to use, in milliseconds.
-     * @return This object.
-     * @deprecated Use {@link #withControlKeepAliveReplyTimeout(Duration)} instead.
-     */
-    @Deprecated
-    public FTPEnvironment withControlKeepAliveReplyTimeout(int timeout) {
-        put(CONTROL_KEEP_ALIVE_REPLY_TIMEOUT, timeout);
-        return this;
-    }
-
     /**
      * Stores how long to wait for control keep-alive message replies.
      *
@@ -1040,12 +1001,7 @@ private void configureStrictMultilineParsing(FTPClient client) {
 
     private void configureDataTimeout(FTPClient client) {
         if (containsKey(DATA_TIMEOUT)) {
-            Duration timeout;
-            try {
-                timeout = FileSystemProviderSupport.getValue(this, DATA_TIMEOUT, Duration.class);
-            } catch (@SuppressWarnings("unused") IllegalArgumentException e) {
-                timeout = Duration.ofMillis(FileSystemProviderSupport.getIntValue(this, DATA_TIMEOUT));
-            }
+            Duration timeout = FileSystemProviderSupport.getValue(this, DATA_TIMEOUT, Duration.class);
             client.setDataTimeout(timeout);
         }
     }
@@ -1118,25 +1074,14 @@ private void configureUseEPSVwithIPv4(FTPClient client) {
 
     private void configureControlKeepAliveTimeout(FTPClient client) {
         if (containsKey(CONTROL_KEEP_ALIVE_TIMEOUT)) {
-            Duration controlIdle;
-            try {
-                controlIdle = FileSystemProviderSupport.getValue(this, CONTROL_KEEP_ALIVE_TIMEOUT, Duration.class);
-            } catch (@SuppressWarnings("unused") IllegalArgumentException e) {
-                // the value is stored as ms
-                controlIdle = Duration.ofMillis(FileSystemProviderSupport.getLongValue(this, CONTROL_KEEP_ALIVE_TIMEOUT));
-            }
+            Duration controlIdle = FileSystemProviderSupport.getValue(this, CONTROL_KEEP_ALIVE_TIMEOUT, Duration.class);
             client.setControlKeepAliveTimeout(controlIdle);
         }
     }
 
     private void configureControlKeepAliveReplyTimeout(FTPClient client) {
         if (containsKey(CONTROL_KEEP_ALIVE_REPLY_TIMEOUT)) {
-            Duration timeout;
-            try {
-                timeout = FileSystemProviderSupport.getValue(this, CONTROL_KEEP_ALIVE_REPLY_TIMEOUT, Duration.class);
-            } catch (@SuppressWarnings("unused") IllegalArgumentException e) {
-                timeout = Duration.ofMillis(FileSystemProviderSupport.getIntValue(this, CONTROL_KEEP_ALIVE_REPLY_TIMEOUT));
-            }
+            Duration timeout = FileSystemProviderSupport.getValue(this, CONTROL_KEEP_ALIVE_REPLY_TIMEOUT, Duration.class);
             client.setControlKeepAliveReplyTimeout(timeout);
         }
     }
@@ -1450,11 +1395,7 @@ void processQueryParam(String name, String value) throws IOException {
         }
 
         private String decode(String value) {
-            try {
-                return URLDecoder.decode(value, "UTF-8"); //$NON-NLS-1$
-            } catch (UnsupportedEncodingException e) {
-                throw new IllegalStateException(e);
-            }
+            return URLDecoder.decode(value, StandardCharsets.UTF_8);
         }
 
         private FTPPoolConfig.Builder poolConfigBuilder() {