From a873cd534000059778ed5d9ca1ebaec3253e00ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Aug 2021 00:24:04 +0000
Subject: [PATCH 1/2] Bump plexus-archiver from 3.4 to 4.2.5

Bumps [plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 3.4 to 4.2.5.
- [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases)
- [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md)
- [Commits](https://github.com/codehaus-plexus/plexus-archiver/compare/plexus-archiver-3.4...plexus-archiver-4.2.5)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-archiver
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index afa24ddb..00a58a4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-archiver</artifactId>
-        <version>3.4</version>
+        <version>4.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>

From 1be0214dc4b4df89682c5d51a511a1e520362101 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 17 Aug 2021 14:18:02 +1000
Subject: [PATCH 2/2] fix upgrade

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 .../mojo/mrm/impl/maven/MockArtifactStoreTest.java     | 10 +++-------
 pom.xml                                                |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/mrm-servlet/src/test/java/org/codehaus/mojo/mrm/impl/maven/MockArtifactStoreTest.java b/mrm-servlet/src/test/java/org/codehaus/mojo/mrm/impl/maven/MockArtifactStoreTest.java
index 3a0ddb0d..60bc4143 100644
--- a/mrm-servlet/src/test/java/org/codehaus/mojo/mrm/impl/maven/MockArtifactStoreTest.java
+++ b/mrm-servlet/src/test/java/org/codehaus/mojo/mrm/impl/maven/MockArtifactStoreTest.java
@@ -72,9 +72,9 @@ public void testDirectoryContent() throws Exception
         Artifact mainArtifact = new Artifact( "localhost", "mrm-15", "1.0", "jar" );
         assertNotNull( artifactStore.get( mainArtifact ) );
 
-        List<String> names = new ArrayList<String>();
-        JarInputStream jis = new JarInputStream( artifactStore.get( mainArtifact ) );
-        try
+        List<String> names = new ArrayList<>();
+
+        try (JarInputStream jis = new JarInputStream( artifactStore.get( mainArtifact ) ) )
         {
             JarEntry jarEntry;
             while ( ( jarEntry = jis.getNextJarEntry() ) != null )
@@ -82,10 +82,6 @@ public void testDirectoryContent() throws Exception
                 names.add( jarEntry.getName() );
             }
         }
-        finally
-        {
-            jis.close();
-        }
         
         assertTrue( names.contains( "README.txt" ) );
     }
diff --git a/pom.xml b/pom.xml
index 00a58a4e..53cb15e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>3.0.24</version>
+        <version>3.4.0</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>