add aspectjweaver producing submodule

4 files changed, 273 insertions, 52 deletions

diff --git a/aspectjweaver/aspectjweaver-assembly.xml b/aspectjweaver/aspectjweaver-assembly.xml
new file mode 100644
index 000000000..af08bc45c
--- /dev/null
+++ b/aspectjweaver/aspectjweaver-assembly.xml
@@ -0,0 +1,82 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+	<id>aspectjweaver</id>
+	
+	<formats>
+		<format>jar</format>
+	</formats>
+	
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>../weaver/target/classes</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+				<exclude>META-INF/maven/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>../runtime/target/classes</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+				<exclude>META-INF/maven/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>../util/target/classes</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+				<exclude>META-INF/maven/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>../bridge/target/classes</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+				<exclude>META-INF/maven/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>../asm/target/classes</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+				<exclude>META-INF/maven/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>../org.aspectj.matcher/target/classes</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+				<exclude>META-INF/maven/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>../bcel-builder/target/classes</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+				<exclude>META-INF/maven/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>../loadtime/target/classes</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+				<exclude>META-INF/maven/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>target/asm-unzipped</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+				<exclude>META-INF/maven/**</exclude>
+				<exclude>org/**</exclude>
+				<exclude>META-INF/MANIFEST.MF</exclude>
+			</excludes>
+		</fileSet>
+	</fileSets>
+
+</assembly>
+
diff --git a/aspectjweaver/aspectjweaver-sources-assembly.xml b/aspectjweaver/aspectjweaver-sources-assembly.xml
new file mode 100644
index 000000000..17e112d39
--- /dev/null
+++ b/aspectjweaver/aspectjweaver-sources-assembly.xml
@@ -0,0 +1,55 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+	<id>sources</id>
+
+	<formats>
+		<format>jar</format>
+	</formats>
+
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>../weaver/src/main/java</directory>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../runtime/src/main/java</directory>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../util/src/main/java</directory>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../bridge/src/main/java</directory>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../asm/src/main/java</directory>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../org.aspectj.matcher/src/main/java</directory>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../bcel-builder/src/main/java</directory>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../loadtime/src/main/java</directory>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+		<!-- 
+		<fileSet>
+			<directory>target/asm-unzipped</directory>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+		 -->
+	</fileSets>
+
+</assembly>
+
diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
new file mode 100644
index 000000000..efdebf022
--- /dev/null
+++ b/aspectjweaver/pom.xml
@@ -0,0 +1,136 @@
+<?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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.aspectj</groupId>
+		<artifactId>aspectj-parent</artifactId>
+		<version>1.9.3.BUILD-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>aspectjweaver</artifactId>
+	<packaging>pom</packaging>
+	<name>AspectJ Weaver</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>weaver</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+
+			<!-- skip creation of test-jar in here -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>test-jar</id>
+						<phase></phase>
+					</execution>
+				</executions>
+			</plugin>
+			
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.6</version>
+				<executions>
+					<execution>
+						<id>unzipasm</id>
+						<phase>validate</phase>
+						<configuration>
+							<tasks>
+								<echo message="unzip jarjar'd asm" />
+								<unzip
+									src="${project.basedir}/../lib/asm/asm-7.0-beta.renamed.jar"
+									dest="target/asm-unzipped" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>aspectjweaver-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<finalName>aspectjweaver-${project.version}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<archive>
+								<manifestEntries>
+									<Automatic-Module-Name>org.aspectj.weaver</Automatic-Module-Name>
+									<PremainClass>org.aspectj.weaver.loadtime.Agent</PremainClass>
+									<AgentClass>org.aspectj.weaver.loadtime.Agent</AgentClass>
+									<CanRedefineClasses>true</CanRedefineClasses>
+								</manifestEntries>
+
+
+								<manifestSections>
+									<manifestSection>
+										<name>org/aspectj/weaver/</name>
+										<manifestEntries>
+
+											<Specification-Title>AspectJ Weaver Classes</Specification-Title>
+											<Specification-Version>${project.version}</Specification-Version>
+											<Specification-Vendor>https://www.eclipse.org/aspectj/</Specification-Vendor>
+
+											<Implementation-Title>org.aspectj.weaver</Implementation-Title>
+											<Implementation-Version>${project.version}</Implementation-Version>
+											<Implementation-Vendor>https://www.eclipse.org/aspectj/</Implementation-Vendor>
+
+											<Bundle-Name>AspectJ Weaver</Bundle-Name>
+											<Bundle-Version>${project.version}</Bundle-Version>
+											<Bundle-Copyright>(C) Copyright 1999-2001 Xerox Corporation,
+												2002 Palo Alto Research Center, Incorporated (PARC),
+												2003-2019 Contributors. All Rights Reserved</Bundle-Copyright>
+										</manifestEntries>
+									</manifestSection>
+								</manifestSections>
+							</archive>
+
+							<descriptors>
+								<descriptor>aspectjweaver-assembly.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>aspectjweaver-sources-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<classifier>sources</classifier>
+							<finalName>aspectjweaver-${project.version}</finalName>
+							<archive>
+							</archive>
+							<descriptors>
+								<descriptor>aspectjweaver-sources-assembly.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+
+				</executions>
+			</plugin>
+
+		</plugins>
+	</build>
+</project>
diff --git a/distribution/aspectjweaver-assembly.xml b/distribution/aspectjweaver-assembly.xml
deleted file mode 100644
index 8c54cf53f..000000000
--- a/distribution/aspectjweaver-assembly.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-
-  <id>aspectjweaver</id>
-  <formats><format>jar</format></formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <fileSets>
-   <fileSet>
-    <directory>../weaver/target/classes</directory>
-    <outputDirectory>.</outputDirectory>
-   </fileSet>
-   <fileSet>
-    <directory>../runtime/target/classes</directory>
-    <outputDirectory>.</outputDirectory>
-   </fileSet>
-   <fileSet>
-    <directory>../util/target/classes</directory>
-    <outputDirectory>.</outputDirectory>
-   </fileSet>
-   <fileSet>
-    <directory>../bridge/target/classes</directory>
-    <outputDirectory>.</outputDirectory>
-   </fileSet>
-   <fileSet>
-    <directory>../asm/target/classes</directory>
-    <outputDirectory>.</outputDirectory>
-   </fileSet>
-   <fileSet>
-    <directory>../org.aspectj.matcher/target/classes</directory>
-    <outputDirectory>.</outputDirectory>
-   </fileSet>
-   <fileSet>
-    <directory>../bcel-builder/target/classes</directory>
-    <outputDirectory>.</outputDirectory>
-   </fileSet>
-   <fileSet>
-    <directory>../loadtime/target/classes</directory>
-    <outputDirectory>.</outputDirectory>
-   </fileSet>
-   <fileSet>
-    <directory>target/asm-unzipped</directory>
-    <outputDirectory>.</outputDirectory>
-    <excludes>
- <exclude>org/**</exclude>
-<exclude>META-INF/MANIFEST.MF</exclude>
-    </excludes>
-   </fileSet>
-  </fileSets>
-
-</assembly>
-