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>

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index 296504a0ed2b22359fe31af341168b0897d07558..ce975e7432a1010aaf83b10b5f5b406770a8b756 100644 (file)
--- 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 9f721aed5fcba48caf2d17a23506b6580321993e..94fc003eb8ce6188c891c2a2075359287f1ccb88 100644 (file)
--- 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 56453245ffeeec2aa571c8acbcab081534a5747b..292e9db416c9ceea7c63c97ce42d00cdd1d4e956 100644 (file)
--- 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 481a2a7400ac19f3de95699822c9b72b61a09c77..a8856330ea449a65b4a1b54919b738e533c1914d 100644 (file)
--- 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 527be9ab5a0c1e72eb3ade2c400e412c73cdb585..b3cf100050b7ecedf8bc45518e050134d0ef2b91 100644 (file)
--- 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 da5b99a0af5b86f72f8ac1ce811cb6599d2745c8..16b3f2ba1d28f98da5531fd9190016586aae1dbd 100644 (file)
--- 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>