From 9ff352cc5680fe4e672dd99d0ff9160fc51a1317 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Mon, 10 Jan 2022 02:07:33 +0100
Subject: [PATCH] [MPLUGIN-387] Bump plexus-archiver to 4.2.5

---
 maven-plugin-tools-annotations/pom.xml                        | 1 +
 maven-script/maven-script-ant/pom.xml                         | 1 +
 .../main/java/org/apache/maven/script/ant/AntMojoWrapper.java | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml
index 426e7ea7b..73b343d89 100644
--- a/maven-plugin-tools-annotations/pom.xml
+++ b/maven-plugin-tools-annotations/pom.xml
@@ -74,6 +74,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
+        <version>4.2.5</version><!-- Java 7 -->
     </dependency>
         
     <dependency>
diff --git a/maven-script/maven-script-ant/pom.xml b/maven-script/maven-script-ant/pom.xml
index f52bc85f0..ce96282e9 100644
--- a/maven-script/maven-script-ant/pom.xml
+++ b/maven-script/maven-script-ant/pom.xml
@@ -60,6 +60,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
+        <version>4.2.5</version><!-- Java 7 -->
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java b/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java
index 56eba0807..90f33d085 100644
--- a/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java
+++ b/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java
@@ -34,7 +34,6 @@
 import org.apache.tools.ant.PropertyHelper;
 import org.apache.tools.ant.types.Path;
 import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
 import org.codehaus.plexus.component.MapOrientedComponent;
 import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
@@ -204,7 +203,8 @@ private void unpackFileBasedResources()
 
         try
         {
-            UnArchiver ua = new ZipUnArchiver( pluginJar );
+            ZipUnArchiver ua = new ZipUnArchiver( pluginJar );
+            ua.enableLogging( logger );
 
             ua.extract( resourcesPath, outputDirectory );
         }