Merge remote-tracking branch 'xander/maven-central-deployment'

28 files changed, 662 insertions, 555 deletions

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index 0cba8cae9..6dd942809 100644
--- a/aspectjmatcher/pom.xml
+++ b/aspectjmatcher/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -11,7 +10,41 @@
 	</parent>
 
 	<artifactId>aspectjmatcher</artifactId>
+
 	<name>AspectJ Matcher</name>
+	<description>
+		The AspectJ matcher can be used for matching pointcuts independently of any AspectJ compilation or weaving steps.
+		Most notably, this can be used by frameworks such as Spring AOP which utilise the @AspectJ pointcut syntax but
+		implement aspect weaving in a way independent of AspectJ, e.g. using dynamic proxies.
+	</description>
+	<url>https://www.eclipse.org/aspectj/</url>
+
+	<licenses>
+		<license>
+			<name>Eclipse Public License - v 1.0</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>aclement</id>
+			<name>Andy Clement</name>
+			<email>aclement@vmware.com</email>
+		</developer>
+		<developer>
+			<id>kriegaex</id>
+			<name>Alexander Kriegisch</name>
+			<email>kriegaex@aspectj.dev</email>
+		</developer>
+	</developers>
+
+	<scm>
+		<url>https://github.com/eclipse/org.aspectj</url>
+		<connection>scm:git:https://github.com/eclipse/org.aspectj.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com:eclipse/org.aspectj.git</developerConnection>
+	</scm>
 
 	<properties>
 		<!-- By default, do not deploy artifacts - but deploy this public one -->
@@ -124,6 +157,59 @@
 				</executions>
 			</plugin>
 
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>truezip-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unzip-relocated-sources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<!--
+								Skip, if javadoc generation is also meant to be skipped, which is the default unless the 'release'
+								profile is active or the property is overridden manually to be false. See property definitions in parent
+								POM for default case and release profile.
+							-->
+							<skip>${maven.javadoc.skip}</skip>
+							<verbose>true</verbose>
+							<fileset>
+								<directory>${project.build.directory}/${project.build.finalName}-sources.jar</directory>
+								<outputDirectory>${project.build.directory}/unpacked-sources</outputDirectory>
+							</fileset>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
+					<execution>
+						<id>javadoc-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
+							<!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjtools? -->
+							<subpackages>org.aspectj</subpackages>
+							<!-- Deactivate doclint checks in order to suppress errors -->
+							<doclint>none</doclint>
+							<!-- Generate class use xref, making javadocs considerably bigger, but also more informative -->
+							<use>true</use>
+							<!-- FIXME: Why does it fail without this parameter? -->
+							<javadocVersion>8</javadocVersion>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
 			<!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -149,6 +235,31 @@
 				</executions>
 			</plugin>
 
+			<!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) -->
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+			</plugin>
+
 		</plugins>
 	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>util</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>bridge</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>org.aspectj.matcher</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
 </project>
diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml
index 12571720c..bc5e36e59 100644
--- a/aspectjrt/pom.xml
+++ b/aspectjrt/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -11,21 +10,46 @@
 	</parent>
 
 	<artifactId>aspectjrt</artifactId>
+
 	<name>AspectJ Runtime</name>
+	<description>
+		The AspectJ runtime is a small library necessary to run Java programs enhanced by AspectJ aspects during a previous
+		compile-time or post-compile-time (binary weaving) build step.
+	</description>
+	<url>https://www.eclipse.org/aspectj/</url>
+
+	<licenses>
+		<license>
+			<name>Eclipse Public License - v 1.0</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>aclement</id>
+			<name>Andy Clement</name>
+			<email>aclement@vmware.com</email>
+		</developer>
+		<developer>
+			<id>kriegaex</id>
+			<name>Alexander Kriegisch</name>
+			<email>kriegaex@aspectj.dev</email>
+		</developer>
+	</developers>
+
+	<scm>
+		<url>https://github.com/eclipse/org.aspectj</url>
+		<connection>scm:git:https://github.com/eclipse/org.aspectj.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com:eclipse/org.aspectj.git</developerConnection>
+	</scm>
 
 	<properties>
 		<!-- By default, do not deploy artifacts - but deploy this public one -->
 		<maven.deploy.skip>false</maven.deploy.skip>
 	</properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>runtime</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-
 	<build>
 		<plugins>
 
@@ -126,6 +150,59 @@
 				</executions>
 			</plugin>
 
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>truezip-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unzip-relocated-sources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<!--
+								Skip, if javadoc generation is also meant to be skipped, which is the default unless the 'release'
+								profile is active or the property is overridden manually to be false. See property definitions in parent
+								POM for default case and release profile.
+							-->
+							<skip>${maven.javadoc.skip}</skip>
+							<verbose>true</verbose>
+							<fileset>
+								<directory>${project.build.directory}/${project.build.finalName}-sources.jar</directory>
+								<outputDirectory>${project.build.directory}/unpacked-sources</outputDirectory>
+							</fileset>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
+					<execution>
+						<id>javadoc-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
+							<!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjtools? -->
+							<subpackages>org.aspectj</subpackages>
+							<!-- Deactivate doclint checks in order to suppress errors -->
+							<doclint>none</doclint>
+							<!-- Generate class use xref, making javadocs considerably bigger, but also more informative -->
+							<use>true</use>
+							<!-- FIXME: Why does it fail without this parameter? -->
+							<javadocVersion>8</javadocVersion>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
 			<!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -151,6 +228,21 @@
 				</executions>
 			</plugin>
 
+			<!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) -->
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+			</plugin>
+
 		</plugins>
 	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>runtime</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
 </project>
diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index 0d5eb7913..dae023141 100644
--- a/aspectjtools/pom.xml
+++ b/aspectjtools/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -11,7 +10,42 @@
 	</parent>
 
 	<artifactId>aspectjtools</artifactId>
+
 	<name>AspectJ Tools (Compiler)</name>
+	<description>
+		AspectJ tools most notably contains the AspectJ compiler (AJC). AJC applies aspects to Java classes during
+		compilation, fully replacing Javac for plain Java classes and also compiling native AspectJ or annotation-based
+		@AspectJ syntax. Furthermore, AJC can weave aspects into existing class files in a post-compile binary weaving step.
+		This library is a superset of AspectJ weaver and hence also of AspectJ runtime.
+	</description>
+	<url>https://www.eclipse.org/aspectj/</url>
+
+	<licenses>
+		<license>
+			<name>Eclipse Public License - v 1.0</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>aclement</id>
+			<name>Andy Clement</name>
+			<email>aclement@vmware.com</email>
+		</developer>
+		<developer>
+			<id>kriegaex</id>
+			<name>Alexander Kriegisch</name>
+			<email>kriegaex@aspectj.dev</email>
+		</developer>
+	</developers>
+
+	<scm>
+		<url>https://github.com/eclipse/org.aspectj</url>
+		<connection>scm:git:https://github.com/eclipse/org.aspectj.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com:eclipse/org.aspectj.git</developerConnection>
+	</scm>
 
 	<properties>
 		<!-- By default, do not deploy artifacts - but deploy this public one -->
@@ -183,6 +217,66 @@
 					</execution>
 				</executions>
 			</plugin>
+			
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>truezip-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unzip-relocated-sources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<!--
+								Skip, if javadoc generation is also meant to be skipped, which is the default unless the 'release'
+								profile is active or the property is overridden manually to be false. See property definitions in parent
+								POM for default case and release profile.
+							-->
+							<skip>${maven.javadoc.skip}</skip>
+							<verbose>true</verbose>
+							<!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjtools? -->
+							<fileset>
+								<directory>${project.build.directory}/${project.build.finalName}-sources.jar/org/aspectj</directory>
+								<outputDirectory>${project.build.directory}/unpacked-sources/org/aspectj</outputDirectory>
+							</fileset>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
+					<execution>
+						<id>javadoc-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<!--
+						  FIXME: This configuration works with JDK 16, but throws errors on other JDK versions, e.g. 14. It looks as
+						   if the Maven Javadoc plugin does not do a particularly good job applying the plugin settings in a way
+						   making it work with different JDK javadoc tool versions. I am saying that, because when using the tool
+						   directly on the console, it works with basic settings and the correct classpath.
+						-->
+						<configuration>
+							<sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
+							<!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjtools? -->
+							<subpackages>org.aspectj</subpackages>
+							<!-- Deactivate doclint checks in order to suppress errors -->
+							<doclint>none</doclint>
+							<!-- Generate class use xref, making javadocs considerably bigger, but also more informative -->
+							<use>true</use>
+							<!-- FIXME: Why does it fail without this parameter? -->
+							<javadocVersion>8</javadocVersion>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
 			<!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module -->
 			<plugin>
@@ -209,22 +303,99 @@
 				</executions>
 			</plugin>
 
+			<!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) -->
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+			</plugin>
+
 		</plugins>
+
 	</build>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.aspectj</groupId>
-			<artifactId>org.aspectj.ajdt.core</artifactId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>asm-renamed</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>runtime</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
+			<artifactId>weaver</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
+<<<<<<< HEAD
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm</artifactId>
+=======
+			<groupId>org.aspectj</groupId>
+			<artifactId>util</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>bridge</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>asm</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>org.aspectj.matcher</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>bcel-builder</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>loadtime</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>ajbrowser</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>ajde</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>ajde.core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>ajdoc</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>org.aspectj.ajdt.core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>taskdefs</artifactId>
+			<version>${project.version}</version>
+>>>>>>> xander/maven-central-deployment
 		</dependency>
 	</dependencies>
 
diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
index 6689fbb6e..996cc6d87 100644
--- a/aspectjweaver/pom.xml
+++ b/aspectjweaver/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -11,7 +10,40 @@
 	</parent>
 
 	<artifactId>aspectjweaver</artifactId>
+
 	<name>AspectJ Weaver</name>
+	<description>
+		The AspectJ weaver applies aspects to Java classes. It can be used as a Java agent in order to apply load-time
+		weaving (LTW) during class-loading and also contains the AspectJ runtime classes.
+	</description>
+	<url>https://www.eclipse.org/aspectj/</url>
+
+	<licenses>
+		<license>
+			<name>Eclipse Public License - v 1.0</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>aclement</id>
+			<name>Andy Clement</name>
+			<email>aclement@vmware.com</email>
+		</developer>
+		<developer>
+			<id>kriegaex</id>
+			<name>Alexander Kriegisch</name>
+			<email>kriegaex@aspectj.dev</email>
+		</developer>
+	</developers>
+
+	<scm>
+		<url>https://github.com/eclipse/org.aspectj</url>
+		<connection>scm:git:https://github.com/eclipse/org.aspectj.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com:eclipse/org.aspectj.git</developerConnection>
+	</scm>
 
 	<properties>
 		<!-- By default, do not deploy artifacts - but deploy this public one -->
@@ -186,6 +218,66 @@
 					</execution>
 				</executions>
 			</plugin>
+			
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>truezip-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unzip-relocated-sources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<!--
+								Skip, if javadoc generation is also meant to be skipped, which is the default unless the 'release'
+								profile is active or the property is overridden manually to be false. See property definitions in parent
+								POM for default case and release profile.
+							-->
+							<skip>${maven.javadoc.skip}</skip>
+							<verbose>true</verbose>
+							<!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjweaver? -->
+							<fileset>
+								<directory>${project.build.directory}/${project.build.finalName}-sources.jar/org/aspectj</directory>
+								<outputDirectory>${project.build.directory}/unpacked-sources/org/aspectj</outputDirectory>
+							</fileset>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
+					<execution>
+						<id>javadoc-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<!--
+						  FIXME: This configuration works with JDK 16, but throws errors on other JDK versions, e.g. 14. It looks as
+						   if the Maven Javadoc plugin does not do a particularly good job applying the plugin settings in a way
+						   making it work with different JDK javadoc tool versions. I am saying that, because when using the tool
+						   directly on the console, it works with basic settings and the correct classpath.
+						-->
+						<configuration>
+							<sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
+							<!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjtools? -->
+							<subpackages>org.aspectj</subpackages>
+							<!-- Deactivate doclint checks in order to suppress errors -->
+							<doclint>none</doclint>
+							<!-- Generate class use xref, making javadocs considerably bigger, but also more informative -->
+							<use>true</use>
+							<!-- FIXME: Why does it fail without this parameter? -->
+							<javadocVersion>8</javadocVersion>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
 			<!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module -->
 			<plugin>
@@ -212,6 +304,12 @@
 				</executions>
 			</plugin>
 
+			<!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) -->
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+			</plugin>
+
 		</plugins>
 	</build>
 
diff --git a/build/aspectjrt.pom b/build/aspectjrt.pom
deleted file mode 100644
index 82ee07329..000000000
--- a/build/aspectjrt.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjrt</artifactId>
-  <packaging>jar</packaging>
-  <version>ASPECTJVERSION</version>
-  <name>AspectJ runtime</name>
-  <description>The runtime needed to execute a program using AspectJ</description>
-  <url>http://www.aspectj.org</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
-  </scm>
-
-</project>
diff --git a/build/aspectjtools.pom b/build/aspectjtools.pom
deleted file mode 100644
index f5ad3e8b5..000000000
--- a/build/aspectjtools.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjtools</artifactId>
-  <packaging>jar</packaging>
-  <version>ASPECTJVERSION</version>
-  <name>AspectJ tools</name>
-  <description>Tools from the AspectJ project</description>
-  <url>http://www.aspectj.org</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
-  </scm>
-
-</project>
\ No newline at end of file
diff --git a/build/aspectjweaver.pom b/build/aspectjweaver.pom
deleted file mode 100644
index 45ddafddc..000000000
--- a/build/aspectjweaver.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjweaver</artifactId>
-  <packaging>jar</packaging>
-  <version>ASPECTJVERSION</version>
-  <name>AspectJ weaver</name>
-  <description>The AspectJ weaver introduces advices to java classes</description>
-  <url>http://www.aspectj.org</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
-  </scm>
-
-</project>
diff --git a/build/pomsForRelease/README.txt b/build/pomsForRelease/README.txt
deleted file mode 100644
index 0270e0e73..000000000
--- a/build/pomsForRelease/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-These are new for 1.9.6 onwards - these are used to create the final release artifacts.
diff --git a/build/pomsForRelease/aspectjmatcher.pom b/build/pomsForRelease/aspectjmatcher.pom
deleted file mode 100644
index fef415ac1..000000000
--- a/build/pomsForRelease/aspectjmatcher.pom
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjmatcher</artifactId>
-  <packaging>jar</packaging>
-  <version>VERSION</version>
-  <name>AspectJ weaver</name>
-  <description>The AspectJ matcher includes the pointcut matching capabilities</description>
-  <url>https://www.eclipse.org/aspectj/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>aclement</id>
-      <name>Andy Clement</name>
-      <email>aclement@vmware.com</email>
-    </developer>
-  </developers>
-
-  <scm>
-    <url>https://github.com/eclipse/org.aspectj</url>
-  </scm>
-
-</project>
diff --git a/build/pomsForRelease/aspectjrt.pom b/build/pomsForRelease/aspectjrt.pom
deleted file mode 100644
index c1f690c9f..000000000
--- a/build/pomsForRelease/aspectjrt.pom
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjrt</artifactId>
-  <packaging>jar</packaging>
-  <version>VERSION</version>
-  <name>AspectJ runtime</name>
-  <description>The runtime needed to execute a program using AspectJ</description>
-  <url>https://www.eclipse.org/aspectj/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>aclement</id>
-      <name>Andy Clement</name>
-      <email>aclement@vmware.com</email>
-    </developer>
-  </developers>
-
-  <scm>
-    <url>https://github.com/eclipse/org.aspectj</url>
-  </scm>
-</project>
diff --git a/build/pomsForRelease/aspectjtools.pom b/build/pomsForRelease/aspectjtools.pom
deleted file mode 100644
index 9925c8247..000000000
--- a/build/pomsForRelease/aspectjtools.pom
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjtools</artifactId>
-  <packaging>jar</packaging>
-  <version>VERSION</version>
-  <name>AspectJ tools</name>
-  <description>Tools from the AspectJ project</description>
-  <url>https://www.eclipse.org/aspectj/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>aclement</id>
-      <name>Andy Clement</name>
-      <email>aclement@vmware.com</email>
-    </developer>
-  </developers>
-
-
-  <scm>
-    <url>https://github.com/eclipse/org.aspectj</url>
-  </scm>
-
-</project>
diff --git a/build/pomsForRelease/aspectjweaver.pom b/build/pomsForRelease/aspectjweaver.pom
deleted file mode 100644
index 8788685c1..000000000
--- a/build/pomsForRelease/aspectjweaver.pom
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjweaver</artifactId>
-  <packaging>jar</packaging>
-  <version>VERSION</version>
-  <name>AspectJ weaver</name>
-  <description>The AspectJ weaver introduces advices to java classes</description>
-  <url>https://www.eclipse.org/aspectj/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>aclement</id>
-      <name>Andy Clement</name>
-      <email>aclement@vmware.com</email>
-    </developer>
-  </developers>
-
-  <scm>
-    <url>https://github.com/eclipse/org.aspectj</url>
-  </scm>
-
-</project>
diff --git a/build/usedForMavenUpload/aspectjmatcher.pom b/build/usedForMavenUpload/aspectjmatcher.pom
deleted file mode 100644
index 909c06c13..000000000
--- a/build/usedForMavenUpload/aspectjmatcher.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjmatcher</artifactId>
-  <packaging>jar</packaging>
-  <version>1.9.6.BUILD-SNAPSHOT</version>
-  <name>AspectJ matcher</name>
-  <description>The AspectJ matcher can be used for matching pointcuts</description>
-  <url>http://www.aspectj.org</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
-  </scm>
-
-</project>
diff --git a/build/usedForMavenUpload/aspectjrt.pom b/build/usedForMavenUpload/aspectjrt.pom
deleted file mode 100644
index 9189f6c9f..000000000
--- a/build/usedForMavenUpload/aspectjrt.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjrt</artifactId>
-  <packaging>jar</packaging>
-  <version>1.9.6.BUILD-SNAPSHOT</version>
-  <name>AspectJ runtime</name>
-  <description>The runtime needed to execute a program using AspectJ</description>
-  <url>http://www.aspectj.org</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
-  </scm>
-
-</project>
diff --git a/build/usedForMavenUpload/aspectjtools.pom b/build/usedForMavenUpload/aspectjtools.pom
deleted file mode 100644
index da1cd2ce3..000000000
--- a/build/usedForMavenUpload/aspectjtools.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjtools</artifactId>
-  <packaging>jar</packaging>
-  <version>1.9.6.BUILD-SNAPSHOT</version>
-  <name>AspectJ tools</name>
-  <description>Tools from the AspectJ project</description>
-  <url>http://www.aspectj.org</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
-  </scm>
-
-</project>
diff --git a/build/usedForMavenUpload/aspectjweaver.pom b/build/usedForMavenUpload/aspectjweaver.pom
deleted file mode 100644
index 011c91af4..000000000
--- a/build/usedForMavenUpload/aspectjweaver.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjweaver</artifactId>
-  <packaging>jar</packaging>
-  <version>1.9.6.BUILD-SNAPSHOT</version>
-  <name>AspectJ weaver</name>
-  <description>The AspectJ weaver introduces advices to java classes</description>
-  <url>http://www.aspectj.org</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
-  </scm>
-
-</project>
diff --git a/build/usedForMavenUpload_milestone/aspectjmatcher.pom b/build/usedForMavenUpload_milestone/aspectjmatcher.pom
deleted file mode 100644
index d57047b73..000000000
--- a/build/usedForMavenUpload_milestone/aspectjmatcher.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjmatcher</artifactId>
-  <packaging>jar</packaging>
-  <version>1.9.7.M1</version>
-  <name>AspectJ matcher</name>
-  <description>The AspectJ matcher can be used for matching pointcuts</description>
-  <url>http://www.aspectj.org</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
-  </scm>
-
-</project>
diff --git a/build/usedForMavenUpload_milestone/aspectjrt.pom b/build/usedForMavenUpload_milestone/aspectjrt.pom
deleted file mode 100644
index 79175e87d..000000000
--- a/build/usedForMavenUpload_milestone/aspectjrt.pom
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjrt</artifactId>
-  <packaging>jar</packaging>
-  <version>1.9.7.M1</version>
-  <name>AspectJ runtime</name>
-  <description>The runtime needed to execute a program using AspectJ</description>
-  <url>http://www.aspectj.org</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
-  </scm> 
-</project>
diff --git a/build/usedForMavenUpload_milestone/aspectjtools.pom b/build/usedForMavenUpload_milestone/aspectjtools.pom
deleted file mode 100644
index d3ade9c4d..000000000
--- a/build/usedForMavenUpload_milestone/aspectjtools.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjtools</artifactId>
-  <packaging>jar</packaging>
-  <version>1.9.7.M1</version>
-  <name>AspectJ tools</name>
-  <description>Tools from the AspectJ project</description>
-  <url>http://www.aspectj.org</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
-  </scm>
-
-</project>
diff --git a/build/usedForMavenUpload_milestone/aspectjweaver.pom b/build/usedForMavenUpload_milestone/aspectjweaver.pom
deleted file mode 100644
index 5dddf2c9c..000000000
--- a/build/usedForMavenUpload_milestone/aspectjweaver.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjweaver</artifactId>
-  <packaging>jar</packaging>
-  <version>1.9.7.M1</version>
-  <name>AspectJ weaver</name>
-  <description>The AspectJ weaver introduces advices to java classes</description>
-  <url>http://www.aspectj.org</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
-  </scm>
-
-</project>
diff --git a/build/usedForMavenUpload_release/aspectjrt.pom b/build/usedForMavenUpload_release/aspectjrt.pom
deleted file mode 100644
index 6a9e0c000..000000000
--- a/build/usedForMavenUpload_release/aspectjrt.pom
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjrt</artifactId>
-  <packaging>jar</packaging>
-  <version>1.8.6</version>
-  <name>AspectJ runtime</name>
-  <description>The runtime needed to execute a program using AspectJ</description>
-  <url>https://www.eclipse.org/aspectj/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>aclement</id>
-      <name>Andy Clement</name>
-      <email>aclement@vmware.com</email>
-    </developer>
-  </developers>
-  
-  <scm>
-    <url>https://github.com/eclipse/org.aspectj</url>
-  </scm>
-
-</project>
diff --git a/build/usedForMavenUpload_release/aspectjtools.pom b/build/usedForMavenUpload_release/aspectjtools.pom
deleted file mode 100644
index 5802ba208..000000000
--- a/build/usedForMavenUpload_release/aspectjtools.pom
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjtools</artifactId>
-  <packaging>jar</packaging>
-  <version>1.8.6</version>
-  <name>AspectJ tools</name>
-  <description>Tools from the AspectJ project</description>
-  <url>https://www.eclipse.org/aspectj/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>aclement</id>
-      <name>Andy Clement</name>
-      <email>aclement@vmware.com</email>
-    </developer>
-  </developers>
-  
-  <scm>
-    <url>https://github.com/eclipse/org.aspectj</url>
-  </scm>
-
-</project>
diff --git a/build/usedForMavenUpload_release/aspectjweaver.pom b/build/usedForMavenUpload_release/aspectjweaver.pom
deleted file mode 100644
index 9c15d2712..000000000
--- a/build/usedForMavenUpload_release/aspectjweaver.pom
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.aspectj</groupId>
-  <artifactId>aspectjweaver</artifactId>
-  <packaging>jar</packaging>
-  <version>1.8.6</version>
-  <name>AspectJ weaver</name>
-  <description>The AspectJ weaver introduces advices to java classes</description>
-  <url>https://www.eclipse.org/aspectj/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License - v 1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>aclement</id>
-      <name>Andy Clement</name>
-      <email>aclement@vmware.com</email>
-    </developer>
-  </developers>
-  
-  <scm>
-    <url>https://github.com/eclipse/org.aspectj</url>
-  </scm>
-
-</project>
diff --git a/installer/aspectjinstaller-assembly.xml b/installer/aspectjinstaller-assembly.xml
index 2a5cfac7b..1a2c69190 100644
--- a/installer/aspectjinstaller-assembly.xml
+++ b/installer/aspectjinstaller-assembly.xml
@@ -22,6 +22,7 @@
 			<directory>../aj-build/dist/docs</directory>
 			<outputDirectory>files</outputDirectory>
 		</fileSet>
+		<!-- Runtime javadocs - TODO: use full tools javadocs instead -->
 		<fileSet>
 			<directory>../runtime/target/site/apidocs</directory>
 			<outputDirectory>files/doc/runtime-apidocs</outputDirectory>
diff --git a/installer/pom.xml b/installer/pom.xml
index 321d573a8..dece35288 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -11,17 +10,85 @@
 	</parent>
 
 	<artifactId>installer</artifactId>
+
 	<name>AspectJ Installer</name>
+	<description>
+		The AspectJ installer is an executable JAR capable of installing a full AspectJ distribution consisting of libraries
+		(AspectJ runtime, weaver and tools/compiler) and API Javadoc.
+	</description>
+	<url>https://www.eclipse.org/aspectj/</url>
+
+	<licenses>
+		<license>
+			<name>Eclipse Public License - v 1.0</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>aclement</id>
+			<name>Andy Clement</name>
+			<email>aclement@vmware.com</email>
+		</developer>
+		<developer>
+			<id>kriegaex</id>
+			<name>Alexander Kriegisch</name>
+			<email>kriegaex@aspectj.dev</email>
+		</developer>
+	</developers>
+
+	<scm>
+		<url>https://github.com/eclipse/org.aspectj</url>
+		<connection>scm:git:https://github.com/eclipse/org.aspectj.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com:eclipse/org.aspectj.git</developerConnection>
+	</scm>
 
 	<properties>
+		<!--
+			TODO: Decide whether to publish this artifact on Maven Central or not. For now, skip the deployment until a final
+			  decision was made. If we do decide to publish, we need to add source and javadoc JARs. I suggest to re-use the
+			  ones from aspectjtools, because the installer contains runtime, weaver and tools and the latter one is a
+			  superset of the former two.
+		-->
 		<!-- By default, do not deploy artifacts - but deploy this public one -->
-		<maven.deploy.skip>false</maven.deploy.skip>
+		<!--<maven.deploy.skip>false</maven.deploy.skip>-->
 	</properties>
 
 	<dependencies>
+		<!-- Uber JARs to add to the installer archive: runtime, weaver, tools -->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjtools</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<!-- Executable JAR installer classes -->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>build</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<!-- AspectJ documentation, created by Ant job in aj-build/dist/docs -->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>docs</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<!-- Runtime javadocs - TODO: use full tools javadocs instead -->
 		<dependency>
 			<groupId>org.aspectj</groupId>
-			<artifactId>run-all-junit-tests</artifactId>
+			<artifactId>runtime</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/lib/pom.xml b/lib/pom.xml
index 807d8a344..a8cddc23a 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -355,7 +355,6 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>truezip-maven-plugin</artifactId>
-            <version>1.2</version>
             <!--
               The TrueZIP plugin can seamlessly copy out of or into (nested) ZIP files as if they were normal file system
               paths. No additional moves and deletes with Antrun are necessary.
diff --git a/pom.xml b/pom.xml
index 6d732a6d0..55f538272 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.aspectj</groupId>
 	<artifactId>aspectj-parent</artifactId>
-	<packaging>pom</packaging>
 	<version>1.9.7.BUILD-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
 	<name>AspectJ Parent Project</name>
 
 	<properties>
@@ -16,8 +16,12 @@
 		<!-- Basic build properties -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
 		<!-- By default, do not deploy artifacts - override for the ones which actually should be deployed -->
 		<maven.deploy.skip>true</maven.deploy.skip>
+		<!-- By default, do not create javadoc - override in release profile or manually -->
+		<maven.javadoc.skip>true</maven.javadoc.skip>
+
 		<!-- Dependency versions -->
 		<jdt.core.version>3.25.0-SNAPSHOT</jdt.core.version>
 		<asm.version>9.1</asm.version>
@@ -35,29 +39,23 @@
 	</properties>
 
 	<distributionManagement>
-		<repository>
-			<id>aspectj-dev-deploy</id>
-			<name>AspectJ.dev WebDAV Releases</name>
-			<!-- Please specify the local mount point for the WebDAV share in your settings.xml -->
-			<url>${aspectj.dev.webdav.share}</url>
-			<uniqueVersion>false</uniqueVersion>
-		</repository>
 		<snapshotRepository>
-			<id>aspectj-dev-deploy</id>
-			<name>AspectJ.dev WebDAV Snapshots</name>
-			<!-- Please specify the local mount point for the WebDAV share in your settings.xml -->
-			<url>${aspectj.dev.webdav.share}</url>
-			<uniqueVersion>true</uniqueVersion>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
 		</snapshotRepository>
+		<repository>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
 	</distributionManagement>
 
 	<repositories>
 		<!--
-      Repeat Central definition from super POM https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom.html.
-      Define it as the first repository to search at, otherwise Maven would always search any other repositories defined
-      in the POM or in settings.xml first, slowing down the build, because most artifacts reside at Maven Central. See
-      https://maven.apache.org/guides/mini/guide-multiple-repositories.html#repository-order for more details.
-    -->
+			Repeat Central definition from super POM https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom.html.
+			Define it as the first repository to search at, otherwise Maven would always search any other repositories defined
+			in the POM or in settings.xml first, slowing down the build, because most artifacts reside at Maven Central. See
+			https://maven.apache.org/guides/mini/guide-multiple-repositories.html#repository-order for more details.
+		-->
 		<repository>
 			<id>central</id>
 			<name>Central Repository</name>
@@ -89,11 +87,11 @@
 
 	<pluginRepositories>
 		<!--
-      Repeat Central definition from super POM https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom.html.
-      Define it as the first repository to search at, otherwise Maven would always search any other repositories defined
-      in the POM or in settings.xml first, slowing down the build, because most artifacts reside at Maven Central. See
-      https://maven.apache.org/guides/mini/guide-multiple-repositories.html#repository-order for more details.
-    -->
+			Repeat Central definition from super POM https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom.html.
+			Define it as the first repository to search at, otherwise Maven would always search any other repositories defined
+			in the POM or in settings.xml first, slowing down the build, because most artifacts reside at Maven Central. See
+			https://maven.apache.org/guides/mini/guide-multiple-repositories.html#repository-order for more details.
+		-->
 		<pluginRepository>
 			<id>central</id>
 			<name>Central Repository</name>
@@ -183,6 +181,21 @@
 				<jvm.arg.addOpens>--add-opens java.base/java.lang=ALL-UNNAMED</jvm.arg.addOpens>
 			</properties>
 		</profile>
+		<profile>
+			<id>release</id>
+			<properties>
+				<!-- By default, do not create javadoc - override in release profile -->
+				<maven.javadoc.skip>false</maven.javadoc.skip>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 
 	<build>
@@ -293,6 +306,68 @@
 					<artifactId>flatten-maven-plugin</artifactId>
 					<version>1.2.2</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-gpg-plugin</artifactId>
+					<version>1.6</version>
+					<executions>
+						<execution>
+							<id>sign-artifacts</id>
+							<phase>verify</phase>
+							<goals>
+								<goal>sign</goal>
+							</goals>
+							<configuration>
+								<!-- Only sign artifacts which are also meant to be deployed -->
+								<skip>${maven.deploy.skip}</skip>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>2.8.2</version>
+					<executions>
+						<execution>
+							<id>default-deploy</id>
+							<phase>deploy</phase>
+							<goals>
+								<goal>deploy</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<!-- Deploy at the end of a multi-module build -->
+						<deployAtEnd>true</deployAtEnd>
+					</configuration>
+				</plugin>
+				<plugin>
+					<!--
+						Other than Maven Deploy, this plugin cannot just be added to the 'build/plugins' section of the parent POM
+						once and (de-)activated with a simple property like 'maven.deploy.skip' on a per-module basis. See also
+						https://issues.sonatype.org/browse/OSSRH-68966. Consequently, we do not add it to the parent but separately
+						to each module meant to be published.
+					-->
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<version>1.6.8</version>
+					<extensions>true</extensions>
+					<configuration>
+						<serverId>ossrh</serverId>
+						<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+						<autoReleaseAfterClose>false</autoReleaseAfterClose>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>truezip-maven-plugin</artifactId>
+					<version>1.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>3.2.0</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 7607e2823..ff4c8836d 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -16,7 +16,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.0.1</version>
 				<configuration>
 				</configuration>
 				<executions>