You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/01/10 02:45:44 UTC

[maven-plugin-tools] 01/05: [MPLUGIN-387] Bump plexus-archiver to 4.2.5

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MPLUGIN-387
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git

commit 6c97d5f4f3ab44d744d23c7865cef8c2fca3ce5f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Jan 10 02:07:33 2022 +0100

    [MPLUGIN-387] Bump plexus-archiver to 4.2.5
---
 maven-plugin-tools-annotations/pom.xml                                | 1 +
 maven-script/maven-script-ant/pom.xml                                 | 1 +
 .../src/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 426e7ea..73b343d 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 f52bc85..ce96282 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 56eba08..90f33d0 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.Project;
 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 @@ public class AntMojoWrapper
 
         try
         {
-            UnArchiver ua = new ZipUnArchiver( pluginJar );
+            ZipUnArchiver ua = new ZipUnArchiver( pluginJar );
+            ua.enableLogging( logger );
 
             ua.extract( resourcesPath, outputDirectory );
         }