This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch update-dependencies-in-maven-plugins-to-maven-2.x in repository https://gitbox.apache.org/repos/asf/aries.git
commit 12f10ad348800d2e75a816e10a87508a0a8c08b0 Author: Dominik Przybysz <[email protected]> AuthorDate: Wed Mar 26 06:02:15 2025 +0100 [MAINTENANCE] Update dependencies in maven plugins to the newest 2.x --- eba-maven-plugin/pom.xml | 29 +++++++++----------- .../org/apache/aries/plugin/eba/EbaMojoTest.java | 19 ++++++------- esa-maven-plugin/pom.xml | 32 ++++++++++------------ .../org/apache/aries/plugin/esa/EsaMojoTest.java | 28 +++++++++---------- 4 files changed, 51 insertions(+), 57 deletions(-) diff --git a/eba-maven-plugin/pom.xml b/eba-maven-plugin/pom.xml index 6ba1d600e..008415a04 100644 --- a/eba-maven-plugin/pom.xml +++ b/eba-maven-plugin/pom.xml @@ -43,17 +43,14 @@ <properties> <biz.aQute.bndlib.version>6.4.1</biz.aQute.bndlib.version> - <maven-archiver.version>2.3</maven-archiver.version> - <maven-artifact.version>2.0.4</maven-artifact.version> + <maven-archiver.version>2.6</maven-archiver.version> + <maven.version>2.2.1</maven.version> <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version> <maven-invoker-plugin.version>3.9.0</maven-invoker-plugin.version> - <maven-model.version>3.9.9</maven-model.version> - <maven-plugin-api.version>2.0</maven-plugin-api.version> - <maven-plugin-testing-harness.version>1.1</maven-plugin-testing-harness.version> - <maven-project.version>2.2.1</maven-project.version> - <plexus-archiver.version>1.0-alpha-7</plexus-archiver.version> - <plexus-container-default.version>1.0-alpha-9-stable-1</plexus-container-default.version> - <plexus-utils.version>3.6.0</plexus-utils.version> + <maven-plugin-testing-harness.version>1.3</maven-plugin-testing-harness.version> + <plexus-archiver.version>3.7.0</plexus-archiver.version> + <plexus-utils.version>4.0.2</plexus-utils.version> + <plexus-xml.version>4.0.4</plexus-xml.version> </properties> <dependencies> @@ -70,17 +67,17 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>${maven-plugin-api.version}</version> + <version>${maven.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>${maven-project.version}</version> + <version>${maven.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>${maven-artifact.version}</version> + <version>${maven.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -90,7 +87,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>${maven-model.version}</version> + <version>${maven.version}</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -104,11 +101,11 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - <version>${plexus-container-default.version}</version> + <artifactId>plexus-xml</artifactId> + <version>${plexus-xml.version}</version> </dependency> <dependency> - <groupId>org.apache.maven.shared</groupId> + <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> <version>${maven-plugin-testing-harness.version}</version> <scope>test</scope> diff --git a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/EbaMojoTest.java b/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/EbaMojoTest.java index 73d4ccf0b..39f149e90 100644 --- a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/EbaMojoTest.java +++ b/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/EbaMojoTest.java @@ -25,11 +25,10 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; -import java.util.Iterator; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.codehaus.plexus.archiver.zip.ZipEntry; -import org.codehaus.plexus.archiver.zip.ZipFile; import org.codehaus.plexus.util.FileUtils; /** @@ -97,7 +96,7 @@ public class EbaMojoTest ZipFile eba = new ZipFile( ebaFile ); - Enumeration entries = eba.getEntries(); + Enumeration entries = eba.entries(); assertTrue( entries.hasMoreElements() ); @@ -146,7 +145,7 @@ public class EbaMojoTest ZipFile eba = new ZipFile( ebaFile ); - Enumeration entries = eba.getEntries(); + Enumeration entries = eba.entries(); assertTrue( entries.hasMoreElements() ); @@ -196,7 +195,7 @@ public class EbaMojoTest ZipFile eba = new ZipFile( ebaFile ); - Enumeration entries = eba.getEntries(); + Enumeration entries = eba.entries(); assertTrue( entries.hasMoreElements() ); @@ -243,7 +242,7 @@ public class EbaMojoTest ZipFile eba = new ZipFile( ebaFile ); - Enumeration entries = eba.getEntries(); + Enumeration entries = eba.entries(); assertTrue( entries.hasMoreElements() ); @@ -319,7 +318,7 @@ public class EbaMojoTest ZipFile eba = new ZipFile( ebaFile ); - Enumeration entries = eba.getEntries(); + Enumeration entries = eba.entries(); assertTrue( entries.hasMoreElements() ); @@ -367,7 +366,7 @@ public class EbaMojoTest ZipFile eba = new ZipFile( ebaFile ); - Enumeration entries = eba.getEntries(); + Enumeration entries = eba.entries(); assertTrue( entries.hasMoreElements() ); @@ -416,7 +415,7 @@ public class EbaMojoTest ZipFile eba = new ZipFile( ebaFile ); - Enumeration entries = eba.getEntries(); + Enumeration entries = eba.entries(); assertTrue( entries.hasMoreElements() ); diff --git a/esa-maven-plugin/pom.xml b/esa-maven-plugin/pom.xml index cff224047..69afa2b76 100644 --- a/esa-maven-plugin/pom.xml +++ b/esa-maven-plugin/pom.xml @@ -43,17 +43,15 @@ <properties> <biz.aQute.bndlib.version>6.4.1</biz.aQute.bndlib.version> - <maven-archiver.version>2.3</maven-archiver.version> - <maven-artifact.version>2.0.4</maven-artifact.version> + <maven.version>2.2.1</maven.version> + <maven-archiver.version>2.6</maven-archiver.version> <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version> - <maven-model.version>3.9.9</maven-model.version> - <maven-plugin-api.version>2.0</maven-plugin-api.version> - <maven-plugin-testing-harness.version>1.1</maven-plugin-testing-harness.version> - <maven-project.version>2.2.1</maven-project.version> + <maven-invoker-plugin.version>3.9.0</maven-invoker-plugin.version> + <maven-plugin-testing-harness.version>1.3</maven-plugin-testing-harness.version> <org.apache.aries.util.version>1.1.3</org.apache.aries.util.version> - <plexus-archiver.version>1.0-alpha-7</plexus-archiver.version> - <plexus-container-default.version>1.0-alpha-9-stable-1</plexus-container-default.version> - <plexus-utils.version>3.6.0</plexus-utils.version> + <plexus-archiver.version>3.7.0</plexus-archiver.version> + <plexus-utils.version>4.0.2</plexus-utils.version> + <plexus-xml.version>4.0.4</plexus-xml.version> </properties> <dependencies> @@ -75,17 +73,17 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>${maven-plugin-api.version}</version> + <version>${maven.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>${maven-project.version}</version> + <version>${maven.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>${maven-artifact.version}</version> + <version>${maven.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -95,7 +93,7 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>${maven-model.version}</version> + <version>${maven.version}</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -109,11 +107,11 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - <version>${plexus-container-default.version}</version> + <artifactId>plexus-xml</artifactId> + <version>${plexus-xml.version}</version> </dependency> <dependency> - <groupId>org.apache.maven.shared</groupId> + <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> <version>${maven-plugin-testing-harness.version}</version> <scope>test</scope> @@ -127,7 +125,7 @@ <plugins> <plugin> <artifactId>maven-invoker-plugin</artifactId> - <version>3.9.0</version> + <version>${maven-invoker-plugin.version}</version> <configuration> <debug>true</debug> <projectsDirectory>src/it</projectsDirectory> diff --git a/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/EsaMojoTest.java b/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/EsaMojoTest.java index 36a66ec42..35c22cf3b 100644 --- a/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/EsaMojoTest.java +++ b/esa-maven-plugin/src/test/java/org/apache/aries/plugin/esa/EsaMojoTest.java @@ -29,10 +29,10 @@ import java.util.List; import java.util.Map; import java.util.jar.Attributes; import java.util.jar.Manifest; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.codehaus.plexus.archiver.zip.ZipEntry; -import org.codehaus.plexus.archiver.zip.ZipFile; import aQute.bnd.osgi.Analyzer; @@ -106,7 +106,7 @@ public class EsaMojoTest ZipFile esa = new ZipFile( esaFile ); - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); assertTrue( entries.hasMoreElements() ); @@ -155,7 +155,7 @@ public class EsaMojoTest ZipFile esa = new ZipFile( esaFile ); - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); assertTrue( entries.hasMoreElements() ); @@ -206,7 +206,7 @@ public class EsaMojoTest ZipFile esa = new ZipFile( esaFile ); - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); assertTrue( entries.hasMoreElements() ); @@ -232,7 +232,7 @@ public class EsaMojoTest private void testForHeader(ZipFile esa, String header, String exactEntry) throws Exception { - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); // Test Use-Bundle & Subsytem-Type inclusion @@ -292,7 +292,7 @@ public class EsaMojoTest ZipFile esa = new ZipFile( esaFile ); - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); assertTrue( entries.hasMoreElements() ); @@ -340,7 +340,7 @@ public class EsaMojoTest ZipFile esa = new ZipFile( esaFile ); - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); assertTrue( entries.hasMoreElements() ); @@ -405,7 +405,7 @@ public class EsaMojoTest ZipFile esa = new ZipFile( esaFile ); - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); assertTrue( entries.hasMoreElements() ); @@ -452,7 +452,7 @@ public class EsaMojoTest ZipFile esa = new ZipFile( esaFile ); - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); assertTrue( entries.hasMoreElements() ); @@ -500,7 +500,7 @@ public class EsaMojoTest ZipFile esa = new ZipFile( esaFile ); - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); assertTrue( entries.hasMoreElements() ); @@ -550,7 +550,7 @@ public class EsaMojoTest ZipFile esa = new ZipFile( esaFile ); - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); assertTrue( entries.hasMoreElements() ); @@ -686,7 +686,7 @@ public class EsaMojoTest ZipFile esa = new ZipFile( esaFile ); - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); assertTrue( entries.hasMoreElements() ); @@ -737,7 +737,7 @@ public class EsaMojoTest ZipFile esa = new ZipFile(esaFile); - Enumeration entries = esa.getEntries(); + Enumeration entries = esa.entries(); assertTrue(entries.hasMoreElements());
