Update assemblies to include AspectJ licence

The former HTML file was moved up one directory level and converted to
asciidoc format. Therefore, include the ADOC file from the correct
location now.

Alternatively, we could have included the generated HTML from the
aj-build/dist/docs/doc directory, but that would have meant adding a
dependency to the 'docs' module to several other modules for this one
file. Actually, asciidoc has become a widely used and accepted format
for documentation and is human-readable by design. Therefore, it is OK
to include the ADOC file. The important thing is that the licence
information
  - is contained in each published artifact,
  - can be found easily,
  - its content is human-readable.

All these requirements are still met with this change. Arguably, ADOC is
easier to read than HTML and does not even need a web browser.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

aspectjmatcher/aspectjmatcher-assembly.xml

@@ -12,10 +12,10 @@
 
 	<fileSets>
 		<fileSet>
-			<directory>../docs/dist</directory>
+			<directory>../docs</directory>
 			<outputDirectory>.</outputDirectory>
 			<includes>
-				<include>LICENSE-AspectJ.html</include>
+				<include>LICENSE-AspectJ.adoc</include>
 			</includes>
 		</fileSet>
 		<fileSet>

aspectjmatcher/aspectjmatcher-sources-assembly.xml

@@ -13,10 +13,10 @@
 
 	<fileSets>
 		<fileSet>
-			<directory>../docs/dist</directory>
+			<directory>../docs</directory>
 			<outputDirectory>.</outputDirectory>
 			<includes>
-				<include>LICENSE-AspectJ.html</include>
+				<include>LICENSE-AspectJ.adoc</include>
 			</includes>
 		</fileSet>
 		<fileSet>

aspectjrt/aspectjrt-assembly.xml

@@ -12,10 +12,10 @@
 
 	<fileSets>
 		<fileSet>
-			<directory>../docs/dist</directory>
+			<directory>../docs</directory>
 			<outputDirectory>.</outputDirectory>
 			<includes>
-				<include>LICENSE-AspectJ.html</include>
+				<include>LICENSE-AspectJ.adoc</include>
 			</includes>
 		</fileSet>
 		<fileSet>

aspectjrt/aspectjrt-sources-assembly.xml

@@ -13,10 +13,10 @@
 
 	<fileSets>
 		<fileSet>
-			<directory>../docs/dist</directory>
+			<directory>../docs</directory>
 			<outputDirectory>.</outputDirectory>
 			<includes>
-				<include>LICENSE-AspectJ.html</include>
+				<include>LICENSE-AspectJ.adoc</include>
 			</includes>
 		</fileSet>
 		<fileSet>

aspectjtools/aspectjtools-assembly.xml

@@ -24,10 +24,10 @@
 
 	<fileSets>
 		<fileSet>
-			<directory>../docs/dist</directory>
+			<directory>../docs</directory>
 			<outputDirectory>.</outputDirectory>
 			<includes>
-				<include>LICENSE-AspectJ.html</include>
+				<include>LICENSE-AspectJ.adoc</include>
 			</includes>
 		</fileSet>
 

aspectjtools/aspectjtools-sources-assembly.xml

@@ -14,10 +14,10 @@
 	<fileSets>
 
 		<fileSet>
-			<directory>../docs/dist</directory>
+			<directory>../docs</directory>
 			<outputDirectory>.</outputDirectory>
 			<includes>
-				<include>LICENSE-AspectJ.html</include>
+				<include>LICENSE-AspectJ.adoc</include>
 			</includes>
 		</fileSet>
 

aspectjweaver/aspectjweaver-assembly.xml

@@ -23,10 +23,10 @@
 
 	<fileSets>
 		<fileSet>
-			<directory>../docs/dist</directory>
+			<directory>../docs</directory>
 			<outputDirectory>.</outputDirectory>
 			<includes>
-				<include>LICENSE-AspectJ.html</include>
+				<include>LICENSE-AspectJ.adoc</include>
 			</includes>
 		</fileSet>
 		<fileSet>

aspectjweaver/aspectjweaver-sources-assembly.xml

@@ -13,10 +13,10 @@
 
 	<fileSets>
 		<fileSet>
-			<directory>../docs/dist</directory>
+			<directory>../docs</directory>
 			<outputDirectory>.</outputDirectory>
 			<includes>
-				<include>LICENSE-AspectJ.html</include>
+				<include>LICENSE-AspectJ.adoc</include>
 			</includes>
 		</fileSet>
 		<fileSet>

docs/README-AspectJ.adoc

@@ -14,8 +14,8 @@ binaries,
 programming and development environment guides, instructions for the Ant
 tasks, a README for 1.1 changes, and a quick reference, all linked from
 the link:doc/index.html[index] page.
-* this README-AspectJ.html, and
-* the LICENSE-AspectJ.html applying to this distribution.
+* this README-AspectJ.adoc, and
+* the LICENSE-AspectJ.adoc applying to this distribution.
 
 '''''
 

installer/aspectjinstaller-assembly.xml

@@ -12,10 +12,10 @@
 
 	<fileSets>
 		<fileSet>
-			<directory>../docs/dist</directory>
+			<directory>../docs</directory>
 			<outputDirectory>.</outputDirectory>
 			<includes>
-				<include>LICENSE-AspectJ.html</include>
+				<include>LICENSE-AspectJ.adoc</include>
 			</includes>
 		</fileSet>
 		<fileSet>

installer/pom.xml

@@ -81,7 +81,7 @@
 			<artifactId>build</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<!-- AspectJ documentation, created by Ant job in aj-build/dist/docs -->
+		<!-- AspectJ documentation, created by Asciidoctor in aj-build/dist/docs -->
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>docs</artifactId>