diff options
| -rw-r--r-- | aspectjmatcher/aspectjmatcher-sources-assembly.xml | 3 | ||||
| -rw-r--r-- | aspectjmatcher/pom.xml | 4 | ||||
| -rw-r--r-- | aspectjrt/aspectjrt-sources-assembly.xml | 3 | ||||
| -rw-r--r-- | aspectjrt/pom.xml | 6 | ||||
| -rw-r--r-- | aspectjtools/aspectjtools-sources-assembly.xml | 3 | ||||
| -rw-r--r-- | aspectjtools/pom.xml | 4 | ||||
| -rw-r--r-- | aspectjweaver/aspectjweaver-sources-assembly.xml | 3 | ||||
| -rw-r--r-- | aspectjweaver/pom.xml | 4 | ||||
| -rw-r--r-- | installer/aspectjinstaller-assembly.xml | 3 |
9 files changed, 19 insertions, 14 deletions
diff --git a/aspectjmatcher/aspectjmatcher-sources-assembly.xml b/aspectjmatcher/aspectjmatcher-sources-assembly.xml index c3f925a4a..0425ccbe8 100644 --- a/aspectjmatcher/aspectjmatcher-sources-assembly.xml +++ b/aspectjmatcher/aspectjmatcher-sources-assembly.xml @@ -2,7 +2,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd"> -<id>aspectjmatcher-sources</id> + <!-- Do not change this ID. It becomes the artifact classifier with appendAssemblyId=true. --> + <id>sources</id> <formats> <format>jar</format> diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml index 3aa998b6c..b183bd3d6 100644 --- a/aspectjmatcher/pom.xml +++ b/aspectjmatcher/pom.xml @@ -103,8 +103,8 @@ <goal>single</goal> </goals> <configuration> - <classifier>sources</classifier> - <finalName>aspectjmatcher-${project.version}</finalName> + <!-- The assembly ID 'sources' becomes the artifact classifier, exactly what we want --> + <appendAssemblyId>true</appendAssemblyId> <archive> </archive> <descriptors> diff --git a/aspectjrt/aspectjrt-sources-assembly.xml b/aspectjrt/aspectjrt-sources-assembly.xml index b4c13e2a9..fc030c3c2 100644 --- a/aspectjrt/aspectjrt-sources-assembly.xml +++ b/aspectjrt/aspectjrt-sources-assembly.xml @@ -2,7 +2,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd"> -<id>aspectjrt-sources</id> + <!-- Do not change this ID. It becomes the artifact classifier with appendAssemblyId=true. --> + <id>sources</id> <formats> <format>jar</format> diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml index 341b83fd6..930ba02ca 100644 --- a/aspectjrt/pom.xml +++ b/aspectjrt/pom.xml @@ -99,14 +99,14 @@ </execution> <execution> - <id>aspectjrt-src-assembly</id> + <id>aspectjrt-sources-assembly</id> <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> - <classifier>sources</classifier> - <finalName>aspectjrt-${project.version}</finalName> + <!-- The assembly ID 'sources' becomes the artifact classifier, exactly what we want --> + <appendAssemblyId>true</appendAssemblyId> <archive> </archive> <descriptors> diff --git a/aspectjtools/aspectjtools-sources-assembly.xml b/aspectjtools/aspectjtools-sources-assembly.xml index 7b54c09b2..8317c9f20 100644 --- a/aspectjtools/aspectjtools-sources-assembly.xml +++ b/aspectjtools/aspectjtools-sources-assembly.xml @@ -2,7 +2,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd"> -<id>aspectjtools-sources</id> + <!-- Do not change this ID. It becomes the artifact classifier with appendAssemblyId=true. --> + <id>sources</id> <formats> <format>jar</format> diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml index cac9b9e2f..62cf15ebf 100644 --- a/aspectjtools/pom.xml +++ b/aspectjtools/pom.xml @@ -119,8 +119,8 @@ <goal>single</goal> </goals> <configuration> - <classifier>sources</classifier> - <finalName>aspectjtools-${project.version}</finalName> + <!-- The assembly ID 'sources' becomes the artifact classifier, exactly what we want --> + <appendAssemblyId>true</appendAssemblyId> <archive> </archive> <descriptors> diff --git a/aspectjweaver/aspectjweaver-sources-assembly.xml b/aspectjweaver/aspectjweaver-sources-assembly.xml index e1760dfe5..61d89a71e 100644 --- a/aspectjweaver/aspectjweaver-sources-assembly.xml +++ b/aspectjweaver/aspectjweaver-sources-assembly.xml @@ -2,7 +2,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd"> -<id>aspectjweaver-sources</id> + <!-- Do not change this ID. It becomes the artifact classifier with appendAssemblyId=true. --> + <id>sources</id> <formats> <format>jar</format> diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml index 921401691..3552ab630 100644 --- a/aspectjweaver/pom.xml +++ b/aspectjweaver/pom.xml @@ -122,8 +122,8 @@ <goal>single</goal> </goals> <configuration> - <classifier>sources</classifier> - <finalName>aspectjweaver-${project.version}</finalName> + <!-- The assembly ID 'sources' becomes the artifact classifier, exactly what we want --> + <appendAssemblyId>true</appendAssemblyId> <archive> </archive> <descriptors> diff --git a/installer/aspectjinstaller-assembly.xml b/installer/aspectjinstaller-assembly.xml index f7255b345..2a5cfac7b 100644 --- a/installer/aspectjinstaller-assembly.xml +++ b/installer/aspectjinstaller-assembly.xml @@ -3,9 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd"> <id>aspectjinstaller</id> + <formats> <format>jar</format> </formats> + <includeBaseDirectory>false</includeBaseDirectory> <fileSets> @@ -20,7 +22,6 @@ <directory>../aj-build/dist/docs</directory> <outputDirectory>files</outputDirectory> </fileSet> - <fileSet> <directory>../runtime/target/site/apidocs</directory> <outputDirectory>files/doc/runtime-apidocs</outputDirectory> |