From 1ed026071e9f15130274f6123c3cd9e009f4d2cb Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Fri, 9 Apr 2021 14:07:09 +0700
Subject: [PATCH] POM cosmetics, e.g. plugin version management

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---
 bridge/pom.xml              |   3 +-
 build/pom.xml               |  10 +---
 pom.xml                     | 110 ++++++++++++++++++++++++++----------
 run-all-junit-tests/pom.xml |   2 +-
 tests/pom.xml               |   7 +++
 5 files changed, 92 insertions(+), 40 deletions(-)

diff --git a/bridge/pom.xml b/bridge/pom.xml
index 2ab25be17..2ea3932fa 100644
--- a/bridge/pom.xml
+++ b/bridge/pom.xml
@@ -26,7 +26,6 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
 				<executions>
 					<execution>
 						<id>build.time</id>
@@ -34,11 +33,11 @@
 							<goal>timestamp-property</goal>
 						</goals>
 						<configuration>
+							<!-- Timestamp format: Thursday Apr 8, 2021 at 20:04:07 PDT -->
 							<name>version.time_text</name>
 							<pattern>EEEE MMM d, yyyy 'at' HH:mm:ss z</pattern>
 							<timeZone>America/Los_Angeles</timeZone>
 							<locale>en_US</locale>
-							<!-- build.time: Monday Feb 4, 2019 at 23:50:25 GMT -->
 						</configuration>
 					</execution>
 				</executions>
diff --git a/build/pom.xml b/build/pom.xml
index fe6b41cb0..6fa02a049 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -33,7 +33,6 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.9.1</version>
 				<executions>
 					<execution>
 						<id>build.date</id>
@@ -41,11 +40,11 @@
 							<goal>timestamp-property</goal>
 						</goals>
 						<configuration>
+							<!-- Timestamp format: Thu Apr 8, 2021 -->
 							<name>build.date</name>
 							<pattern>E MMM d, YYYY</pattern>
 							<timeZone>America/Los_Angeles</timeZone>
 							<locale>en_US</locale>
-							<!-- build.date: Monday Feb 4, 2019 -->
 						</configuration>
 					</execution>
 					<execution>
@@ -54,14 +53,11 @@
 							<goal>timestamp-property</goal>
 						</goals>
 						<configuration>
+							<!-- Timestamp format: Thursday Apr 8, 2021 at 20:20:16 PDT -->
 							<name>build.time</name>
-							<!--
-							<pattern>E MMM d, YYYY 'at' HH:MM:SS z</pattern>
-							 -->
 							<pattern>EEEE MMM d, yyyy 'at' HH:mm:ss z</pattern>
 							<timeZone>America/Los_Angeles</timeZone>
 							<locale>en_US</locale>
-							<!-- build.time: Monday Feb 4, 2019 at 23:50:25 GMT -->
 						</configuration>
 					</execution>
 					<execution>
@@ -70,11 +66,11 @@
 							<goal>timestamp-property</goal>
 						</goals>
 						<configuration>
+							<!-- Timestamp format: 2021 -->
 							<name>build.year</name>
 							<pattern>YYYY</pattern>
 							<timeZone>America/Los_Angeles</timeZone>
 							<locale>en_US</locale>
-							<!-- year: 2019 -->
 						</configuration>
 					</execution>
 				</executions>
diff --git a/pom.xml b/pom.xml
index ade7b903d..8c21ca6db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
 	<properties>
 		<revision>1.9.7.BUILD-SNAPSHOT</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<jdt.core.version>3.25.0-SNAPSHOT</jdt.core.version>
 		<lib.ant.version>1.6.3</lib.ant.version>
 		<lib.ant.xerces.version>2.6.2</lib.ant.xerces.version>
@@ -57,7 +58,6 @@
 		<module>bcel-builder</module>
 		<module>weaver</module>
 		<module>loadtime</module>
-		<module>org.eclipse.jdt.core</module>
 		<module>org.aspectj.ajdt.core</module>
 		<module>ajde.core</module>
 		<module>ajde</module>
@@ -143,6 +143,69 @@
 					<artifactId>maven-help-plugin</artifactId>
 					<version>3.2.0</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-source-plugin</artifactId>
+					<version>3.2.0</version>
+					<executions>
+						<execution>
+							<id>attach-sources</id>
+							<phase>package</phase>
+							<goals>
+								<goal>jar-no-fork</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>3.2.0</version>
+					<configuration>
+						<archive>
+							<addMavenDescriptor>false</addMavenDescriptor>
+						</archive>
+					</configuration>
+					<executions>
+						<execution>
+							<id>test-jar</id>
+							<goals>
+								<goal>test-jar</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-shade-plugin</artifactId>
+					<!-- TODO: upgrade after https://issues.apache.org/jira/browse/MSHADE-366 is fixed -->
+					<version>3.2.4</version>
+					<configuration>
+						<createSourcesJar>true</createSourcesJar>
+						<createDependencyReducedPom>false</createDependencyReducedPom>
+						<shadedArtifactAttached>false</shadedArtifactAttached>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>2.5.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>3.0.0-M3</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>build-helper-maven-plugin</artifactId>
+					<version>3.2.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>3.1.0</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 
@@ -150,25 +213,10 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-					<version>3.2.0</version>
-				<configuration>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-				</configuration>
-				<executions>
-					<execution>
-						<id>test-jar</id>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.1.0</version>
 				<configuration>
 					<filesets>
 						<fileset>
@@ -176,26 +224,28 @@
 							<includes>
 								<include>**/ajcore.*.txt</include>
 							</includes>
-<!--
-							<excludes>
-								<exclude>**/important.log</exclude>
-								<exclude>**/another-important.log</exclude>
-							</excludes>
--->
 							<followSymlinks>false</followSymlinks>
 						</fileset>
 						<fileset>
 							<directory>aj-build</directory>
-<!--
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>.</directory>
 							<includes>
-								<include>**/*.tmp</include>
-								<include>**/*.log</include>
+								<include>**/ajcore.*.txt</include>
 							</includes>
-							<excludes>
-								<exclude>**/important.log</exclude>
-								<exclude>**/another-important.log</exclude>
-							</excludes>
--->
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+						<fileset>
+							<directory>aj-build</directory>
 							<followSymlinks>false</followSymlinks>
 						</fileset>
 					</filesets>
diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml
index 6abd8610b..f2613d996 100644
--- a/run-all-junit-tests/pom.xml
+++ b/run-all-junit-tests/pom.xml
@@ -239,7 +239,7 @@
 			<artifactId>ant</artifactId>
 			<version>${lib.ant.version}</version>
 		</dependency>
-    <dependency>
+		<dependency>
 			<groupId>jrockit</groupId>
 			<artifactId>jrockit</artifactId>
 			<version>1.0</version>
diff --git a/tests/pom.xml b/tests/pom.xml
index 0f766d006..f330e5f1a 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -120,6 +120,13 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath>
 		</dependency>
+-->
+<!--
+		<dependency>
+			<groupId>commons-digester</groupId>
+			<artifactId>commons-digester</artifactId>
+			<version>${lib.commons.digester.version}</version>
+		</dependency>
 -->
 	</dependencies>
 
-- 
2.39.5