From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Sat, 6 Jan 2024 09:48:24 +0000 (+0700)
Subject: Update assemblies to include AspectJ licence
X-Git-Tag: V1_9_21_1~34
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=939e81e6babc20852fe1d6d1fa490c95e1aa8b56;p=aspectj.git

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

diff --git a/aspectjmatcher/aspectjmatcher-assembly.xml b/aspectjmatcher/aspectjmatcher-assembly.xml
index c22d1adf5..9b20bc1cf 100644
--- a/aspectjmatcher/aspectjmatcher-assembly.xml
+++ b/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>
diff --git a/aspectjmatcher/aspectjmatcher-sources-assembly.xml b/aspectjmatcher/aspectjmatcher-sources-assembly.xml
index 95c0488fb..378304cc1 100644
--- a/aspectjmatcher/aspectjmatcher-sources-assembly.xml
+++ b/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>
diff --git a/aspectjrt/aspectjrt-assembly.xml b/aspectjrt/aspectjrt-assembly.xml
index 3b55a1659..09d7ac84b 100644
--- a/aspectjrt/aspectjrt-assembly.xml
+++ b/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>
diff --git a/aspectjrt/aspectjrt-sources-assembly.xml b/aspectjrt/aspectjrt-sources-assembly.xml
index f3b357606..a25ef741d 100644
--- a/aspectjrt/aspectjrt-sources-assembly.xml
+++ b/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>
diff --git a/aspectjtools/aspectjtools-assembly.xml b/aspectjtools/aspectjtools-assembly.xml
index 1fe6f055b..4d5c17868 100644
--- a/aspectjtools/aspectjtools-assembly.xml
+++ b/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>
 
diff --git a/aspectjtools/aspectjtools-sources-assembly.xml b/aspectjtools/aspectjtools-sources-assembly.xml
index 74a05e3ab..d33238215 100644
--- a/aspectjtools/aspectjtools-sources-assembly.xml
+++ b/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>
 
diff --git a/aspectjweaver/aspectjweaver-assembly.xml b/aspectjweaver/aspectjweaver-assembly.xml
index eaf9b7736..576bb2700 100644
--- a/aspectjweaver/aspectjweaver-assembly.xml
+++ b/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>
diff --git a/aspectjweaver/aspectjweaver-sources-assembly.xml b/aspectjweaver/aspectjweaver-sources-assembly.xml
index 2088e905c..e27f5aff0 100644
--- a/aspectjweaver/aspectjweaver-sources-assembly.xml
+++ b/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>
diff --git a/docs/README-AspectJ.adoc b/docs/README-AspectJ.adoc
index 6b12878f6..c754f3a44 100644
--- a/docs/README-AspectJ.adoc
+++ b/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.
 
 '''''
 
diff --git a/installer/aspectjinstaller-assembly.xml b/installer/aspectjinstaller-assembly.xml
index cfd08697f..f3faf27d7 100644
--- a/installer/aspectjinstaller-assembly.xml
+++ b/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>
diff --git a/installer/pom.xml b/installer/pom.xml
index c5f8efa1f..565a456d1 100644
--- a/installer/pom.xml
+++ b/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>