From c98eb4dc6b0c3e71c5dcf2ec9db1d5cabfb533b0 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 15 Feb 2023 11:28:23 +0100 Subject: [PATCH] [MPLUGINTESTING-76] Upgrade plexus-archiver from 4.3.0 to 4.6.1 --- maven-plugin-testing-harness/pom.xml | 2 +- .../maven/plugin/testing/ArtifactStubFactory.java | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/maven-plugin-testing-harness/pom.xml b/maven-plugin-testing-harness/pom.xml index cb222af..7df5ae7 100644 --- a/maven-plugin-testing-harness/pom.xml +++ b/maven-plugin-testing-harness/pom.xml @@ -83,7 +83,7 @@ under the License. org.codehaus.plexus plexus-archiver - 4.3.0 + 4.6.1 diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ArtifactStubFactory.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ArtifactStubFactory.java index c490845..d510314 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ArtifactStubFactory.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/ArtifactStubFactory.java @@ -273,17 +273,9 @@ public void createUnpackableFile(Artifact artifact, File destFile) archiver.setDestFile(destFile); archiver.addFile(srcFile, getUnpackableFileName(artifact)); - try { - setVariableValueToObject(archiver, "logger", new SilentLog()); - } catch (IllegalAccessException e) { - System.out.println("Unable to override logger with silent log."); - e.printStackTrace(); - } if (archiver instanceof WarArchiver) { WarArchiver war = (WarArchiver) archiver; - // the use of this is counter-intuitive: - // http://jira.codehaus.org/browse/PLX-286 - war.setIgnoreWebxml(false); + war.setExpectWebXml(false); } archiver.createArchive(); }