aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2021-04-16 15:30:36 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2021-04-17 00:14:55 +0700
commit116406fbbc665f6ea6d8fccf150389d808751642 (patch)
tree34e4a1c9e70faa9b1c3ea4e946e85aa8ca8728e1
parent0e7ac59f24f449d6d54d31634075f9bffcb57588 (diff)
downloadaspectj-116406fbbc665f6ea6d8fccf150389d808751642.tar.gz
aspectj-116406fbbc665f6ea6d8fccf150389d808751642.zip
Fix: make sure that source assemblies are attached to build
Previously I renamed the source assemblies from the uniform name 'sources' to something more individual like 'aspectjtools-sources', not realising that the magic name 'sources' in combination with the default configuration value 'appendAssemblyId=true' results in an artifact classifier equal to the assembly ID, i.e. 'sources', which is exactly what we need here, but not quite obvious. Therefore, I documented it with comments in both the assemblies and the POMs. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
-rw-r--r--aspectjmatcher/aspectjmatcher-sources-assembly.xml3
-rw-r--r--aspectjmatcher/pom.xml4
-rw-r--r--aspectjrt/aspectjrt-sources-assembly.xml3
-rw-r--r--aspectjrt/pom.xml6
-rw-r--r--aspectjtools/aspectjtools-sources-assembly.xml3
-rw-r--r--aspectjtools/pom.xml4
-rw-r--r--aspectjweaver/aspectjweaver-sources-assembly.xml3
-rw-r--r--aspectjweaver/pom.xml4
-rw-r--r--installer/aspectjinstaller-assembly.xml3
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>