From ee5274fa7e0f82f6f840346aa969f618682dfdba Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Thu, 11 Mar 2021 23:13:06 +0700
Subject: [PATCH] Set maven-assembly-plugin version 3.1.1 explicitly for each
 POM module

Background: There are CI tests failing because the version is not taken
from the parent POM, even if set in the 'pluginManagement' section.
Instead, it is resolved via the Maven Super POM, e.g. 2.2-beta-5, see:
https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom.html
That assembly plugin version in turn requires plexus-archiver
1.0-alpha-12. The latter cannot be downloaded from Maven Central,
leading to the problems seen during builds.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---
 aspectjmatcher/pom.xml | 11 ++++++++---
 aspectjrt/pom.xml      |  7 ++++++-
 aspectjtools/pom.xml   | 19 +++++++++++--------
 aspectjweaver/pom.xml  | 11 ++++++++---
 installer/pom.xml      |  9 +++++++--
 pom.xml                |  4 ----
 6 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index 296504a0e..ce975e743 100644
--- a/aspectjmatcher/pom.xml
+++ b/aspectjmatcher/pom.xml
@@ -24,12 +24,12 @@
 				<executions>
 					<execution>
 						<id>test-jar</id>
-						<phase></phase>
+						<phase>none</phase>
 					</execution>
 				</executions>
 			</plugin>
-			
-			
+
+
 			<!--
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -57,6 +57,11 @@
 
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
+				<!--
+					Set version manually in order to override version from super POM, e.g. 2.2-beta-5 from
+					https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom
+				-->
+				<version>3.1.1</version>
 				<executions>
 					<execution>
 						<id>aspectjmatcher-assembly</id>
diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml
index 9f721aed5..94fc003eb 100644
--- a/aspectjrt/pom.xml
+++ b/aspectjrt/pom.xml
@@ -32,13 +32,18 @@
 				<executions>
 					<execution>
 						<id>test-jar</id>
-						<phase></phase>
+						<phase>none</phase>
 					</execution>
 				</executions>
 			</plugin>
 
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
+				<!--
+					Set version manually in order to override version from super POM, e.g. 2.2-beta-5 from
+					https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom
+				-->
+				<version>3.1.1</version>
 				<executions>
 					<execution>
 						<id>aspectjrt-assembly</id>
diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index 56453245f..292e9db41 100644
--- a/aspectjtools/pom.xml
+++ b/aspectjtools/pom.xml
@@ -32,12 +32,12 @@
 				<executions>
 					<execution>
 						<id>test-jar</id>
-						<phase></phase>
+						<phase>none</phase>
 					</execution>
 				</executions>
 			</plugin>
-			
-			
+
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
@@ -58,7 +58,7 @@
 							<goal>run</goal>
 						</goals>
 					</execution>
-					
+
 					<execution>
 						<id>unzipjdt</id>
 						<phase>validate</phase>
@@ -74,7 +74,7 @@
 							<goal>run</goal>
 						</goals>
 					</execution>
-					
+
 					<execution>
 						<id>unzipjdtsrc</id>
 						<phase>validate</phase>
@@ -92,12 +92,15 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
+				<!--
+					Set version manually in order to override version from super POM, e.g. 2.2-beta-5 from
+					https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom
+				-->
+				<version>3.1.1</version>
 				<executions>
-				
-				
 					<execution>
 						<id>aspectjtools-assembly</id>
 						<phase>package</phase>
diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
index 481a2a740..a8856330e 100644
--- a/aspectjweaver/pom.xml
+++ b/aspectjweaver/pom.xml
@@ -32,12 +32,12 @@
 				<executions>
 					<execution>
 						<id>test-jar</id>
-						<phase></phase>
+						<phase>none</phase>
 					</execution>
 				</executions>
 			</plugin>
-			
-			
+
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
@@ -63,6 +63,11 @@
 
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
+				<!--
+					Set version manually in order to override version from super POM, e.g. 2.2-beta-5 from
+					https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom
+				-->
+				<version>3.1.1</version>
 				<executions>
 					<execution>
 						<id>aspectjweaver-assembly</id>
diff --git a/installer/pom.xml b/installer/pom.xml
index 527be9ab5..b3cf10005 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -31,13 +31,18 @@
 				<executions>
 					<execution>
 						<id>test-jar</id>
-						<phase></phase>
+						<phase>none</phase>
 					</execution>
 				</executions>
 			</plugin>
-			
+
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
+				<!--
+					Set version manually in order to override version from super POM, e.g. 2.2-beta-5 from
+					https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom
+				-->
+				<version>3.1.1</version>
 				<executions>
 					<execution>
 						<id>aspectjinstaller-assembly</id>
diff --git a/pom.xml b/pom.xml
index da5b99a0a..16b3f2ba1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,10 +96,6 @@
 				</executions>
 			</plugin>
 
-			<!-- <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>3.1.1</version>
-				<configuration> <descriptors> <descriptor>assembly.xml</descriptor> </descriptors>
-				</configuration> </plugin> -->
-
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
 				<version>3.1.0</version>
-- 
2.39.5