diff options
| author | Andy Clement <aclement@pivotal.io> | 2019-02-07 09:17:40 -0800 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2019-02-07 09:17:40 -0800 |
| commit | f90f899aa718fe326cbe98fc6f3e30b7aa516524 (patch) | |
| tree | 011871f7bd2e92c6914e668de48f2c8fb0e466e7 | |
| parent | 5634171540aac3c52c40cff6cb1c22fb1ad66e6d (diff) | |
| download | aspectj-f90f899aa718fe326cbe98fc6f3e30b7aa516524.tar.gz aspectj-f90f899aa718fe326cbe98fc6f3e30b7aa516524.zip | |
Adjust generated jar names
| -rw-r--r-- | distribution/aspectjinstaller-assembly.xml | 49 | ||||
| -rw-r--r-- | distribution/pom.xml | 27 |
2 files changed, 76 insertions, 0 deletions
diff --git a/distribution/aspectjinstaller-assembly.xml b/distribution/aspectjinstaller-assembly.xml new file mode 100644 index 000000000..36e552606 --- /dev/null +++ b/distribution/aspectjinstaller-assembly.xml @@ -0,0 +1,49 @@ +<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>aspectjinstaller</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>../build/target/classes</directory> + <outputDirectory>.</outputDirectory> + <excludes> + <exclude>org/**</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../aj-build/dist/docs</directory> + <outputDirectory>files</outputDirectory> + </fileSet> + + <fileSet> + <directory>../runtime/target/site/apidocs</directory> + <outputDirectory>files/doc/runtime-apidocs</outputDirectory> + </fileSet> + </fileSets> + + <files> + <file> + <source>target/aspectjrt-${project.version}.jar</source> + <outputDirectory>files/lib</outputDirectory> + <destName>aspectjrt.jar</destName> + </file> + <file> + <source>target/aspectjweaver-${project.version}.jar</source> + <outputDirectory>files/lib</outputDirectory> + <destName>aspectjweaver.jar</destName> + </file> + <file> + <source>target/aspectjtools-${project.version}.jar</source> + <outputDirectory>files/lib</outputDirectory> + <destName>aspectjtools.jar</destName> + </file> + </files> + +</assembly> + diff --git a/distribution/pom.xml b/distribution/pom.xml index 400e0c02a..e4ac06ce6 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -63,6 +63,7 @@ </execution> </executions> </plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> @@ -73,6 +74,8 @@ <goal>single</goal> </goals> <configuration> + <finalName>aspectjrt-${project.version}</finalName> + <appendAssemblyId>false</appendAssemblyId> <archive> <manifestEntries> <Automatic-Module-Name>org.aspectj.runtime</Automatic-Module-Name> @@ -114,6 +117,8 @@ <goal>single</goal> </goals> <configuration> + <finalName>aspectjweaver-${project.version}</finalName> + <appendAssemblyId>false</appendAssemblyId> <archive> <manifestEntries> <Automatic-Module-Name>org.aspectj.weaver</Automatic-Module-Name> @@ -159,6 +164,8 @@ <goal>single</goal> </goals> <configuration> + <finalName>aspectjtools-${project.version}</finalName> + <appendAssemblyId>false</appendAssemblyId> <archive> <manifestEntries> <Automatic-Module-Name>org.aspectj.tools</Automatic-Module-Name> @@ -192,6 +199,26 @@ </descriptors> </configuration> </execution> + + <execution> + <id>aspectjinstaller-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>aspectj-${project.version}</finalName> + <appendAssemblyId>false</appendAssemblyId> + <archive> + <manifestEntries> + <Main-Class>$installer$.org.aspectj.Main</Main-Class> + </manifestEntries> + </archive> + <descriptors> + <descriptor>aspectjinstaller-assembly.xml</descriptor> + </descriptors> + </configuration> + </execution> </executions> </plugin> </plugins> |