From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Fri, 16 Apr 2021 03:26:45 +0000 (+0700)
Subject: Manage version version maven-assembly-plugin:3.1.1
X-Git-Tag: V1_9_7_M2~21^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2f981bdde6263a1ab9f5e26ce202cbd8ed51ca70;p=aspectj.git

Manage version version maven-assembly-plugin:3.1.1

No more manual version setting everywhere.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index a910dc3df..06597f41c 100644
--- a/aspectjmatcher/pom.xml
+++ b/aspectjmatcher/pom.xml
@@ -56,12 +56,8 @@
 			-->
 
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<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 611475af5..341b83fd6 100644
--- a/aspectjrt/pom.xml
+++ b/aspectjrt/pom.xml
@@ -38,12 +38,8 @@
 			</plugin>
 
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<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 bf098e2cc..b14b2fe01 100644
--- a/aspectjtools/pom.xml
+++ b/aspectjtools/pom.xml
@@ -94,12 +94,8 @@
 			</plugin>
 
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<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>
diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
index 386345c13..da4b3b233 100644
--- a/aspectjweaver/pom.xml
+++ b/aspectjweaver/pom.xml
@@ -62,12 +62,8 @@
 			</plugin>
 
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<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 b3cf10005..977fa1d12 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -37,12 +37,8 @@
 			</plugin>
 
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<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 d372ccab2..5f958f35e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,6 +211,11 @@
 					<artifactId>maven-dependency-plugin</artifactId>
 					<version>3.1.2</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>3.1.1</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>