Browse Source

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>
tags/V1_9_7_M2
Alexander Kriegisch 3 years ago
parent
commit
116406fbbc

+ 2
- 1
aspectjmatcher/aspectjmatcher-sources-assembly.xml View File

@@ -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>

+ 2
- 2
aspectjmatcher/pom.xml View File

@@ -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>

+ 2
- 1
aspectjrt/aspectjrt-sources-assembly.xml View File

@@ -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>

+ 3
- 3
aspectjrt/pom.xml View File

@@ -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>

+ 2
- 1
aspectjtools/aspectjtools-sources-assembly.xml View File

@@ -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>

+ 2
- 2
aspectjtools/pom.xml View File

@@ -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>

+ 2
- 1
aspectjweaver/aspectjweaver-sources-assembly.xml View File

@@ -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>

+ 2
- 2
aspectjweaver/pom.xml View File

@@ -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>

+ 2
- 1
installer/aspectjinstaller-assembly.xml View File

@@ -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>

Loading…
Cancel
Save