diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 4ea215eb4..929b1bc4d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,7 +25,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest,windows-latest, macOS-latest]
-        java: [8, 11, 14, 15-ea]
+        java: [8, 11, 14, 15, 16, 17-ea]
+        jdk: [adopt, zulu]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -44,8 +45,9 @@ jobs:
             maven-${{ matrix.os }}-
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: ${{ matrix.jdk }}
           java-version: ${{ matrix.java }}
 
       - name: Build with Maven
diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
index 5cdecfa8c..9de82a720 100755
--- a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
@@ -75,7 +75,7 @@ public abstract class AbstractArchiver
      * of {@link ArchiveEntry} by {@link #getResources()}.
      * </ul>
      */
-    private final List<Object> resources = new ArrayList<Object>();
+    private final List<Object> resources = new ArrayList<>();
 
     private boolean includeEmptyDirs = true;
 
@@ -98,7 +98,7 @@ public abstract class AbstractArchiver
     // On lunix-like systems, we replace windows backslashes with forward slashes
     private final boolean replacePathSlashesToJavaPaths = File.separatorChar == '/';
 
-    private final List<Closeable> closeables = new ArrayList<Closeable>();
+    private final List<Closeable> closeables = new ArrayList<>();
 
     /**
      * since 2.2 is on by default
@@ -113,27 +113,27 @@ public abstract class AbstractArchiver
     private Date lastModifiedDate;
 
     /**
-     * @sine 4.2.0
+     * @since 4.2.0
      */
     private Comparator<String> filenameComparator;
 
     /**
-     * @sine 4.2.0
+     * @since 4.2.0
      */
     private int overrideUid = -1;
 
     /**
-     * @sine 4.2.0
+     * @since 4.2.0
      */
     private String overrideUserName;
 
     /**
-     * @sine 4.2.0
+     * @since 4.2.0
      */
     private int overrideGid = -1;
 
     /**
-     * @sine 4.2.0
+     * @since 4.2.0
      */
     private String overrideGroupName;
 
@@ -695,7 +695,7 @@ public Map<String, ArchiveEntry> getFiles()
     {
         try
         {
-            final Map<String, ArchiveEntry> map = new HashMap<String, ArchiveEntry>();
+            final Map<String, ArchiveEntry> map = new HashMap<>();
             for ( final ResourceIterator iter = getResources(); iter.hasNext(); )
             {
                 final ArchiveEntry entry = iter.next();
diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
index cc493c740..0f2861b69 100644
--- a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
@@ -22,8 +22,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -57,7 +55,7 @@ public abstract class AbstractUnArchiver
 
     private FileMapper[] fileMappers;
 
-    private List finalizers;
+    private List<ArchiveFinalizer> finalizers;
 
     private FileSelector[] fileSelectors;
 
@@ -166,14 +164,14 @@ public void addArchiveFinalizer( final ArchiveFinalizer finalizer )
     {
         if ( finalizers == null )
         {
-            finalizers = new ArrayList();
+            finalizers = new ArrayList<>();
         }
 
         finalizers.add( finalizer );
     }
 
     @Override
-    public void setArchiveFinalizers( final List archiveFinalizers )
+    public void setArchiveFinalizers( final List<ArchiveFinalizer> archiveFinalizers )
     {
         finalizers = archiveFinalizers;
     }
@@ -183,10 +181,8 @@ private void runArchiveFinalizers()
     {
         if ( finalizers != null )
         {
-            for ( Object finalizer1 : finalizers )
+            for ( ArchiveFinalizer finalizer : finalizers )
             {
-                final ArchiveFinalizer finalizer = (ArchiveFinalizer) finalizer1;
-
                 finalizer.finalizeArchiveExtraction( this );
             }
         }