From 21d651573103fee74dec9b01c36ad3932d355bcf Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Sat, 1 Oct 2022 09:49:19 +0200
Subject: [PATCH] Add docs/dist/LICENSE-AspectJ.html to all public artifacts

The license file will be included right in the main directory of both
binary and source artifacts for
  - AspectJ Matcher,
  - AspectJ Runtime,
  - AspectJ Weaver,
  - AspectJ Tools (Compiler),
  - AspectJ Installer.

Fixes #185.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---
 aspectjmatcher/aspectjmatcher-assembly.xml         | 8 +++++++-
 aspectjmatcher/aspectjmatcher-sources-assembly.xml | 8 +++++++-
 aspectjrt/aspectjrt-assembly.xml                   | 8 +++++++-
 aspectjrt/aspectjrt-sources-assembly.xml           | 8 +++++++-
 aspectjtools/aspectjtools-assembly.xml             | 8 ++++++++
 aspectjtools/aspectjtools-sources-assembly.xml     | 8 ++++++++
 aspectjweaver/aspectjweaver-assembly.xml           | 8 +++++++-
 aspectjweaver/aspectjweaver-sources-assembly.xml   | 8 +++++++-
 installer/aspectjinstaller-assembly.xml            | 8 +++++++-
 9 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/aspectjmatcher/aspectjmatcher-assembly.xml b/aspectjmatcher/aspectjmatcher-assembly.xml
index 3146028d2..c22d1adf5 100644
--- a/aspectjmatcher/aspectjmatcher-assembly.xml
+++ b/aspectjmatcher/aspectjmatcher-assembly.xml
@@ -11,6 +11,13 @@
 	<includeBaseDirectory>false</includeBaseDirectory>
 
 	<fileSets>
+		<fileSet>
+			<directory>../docs/dist</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>LICENSE-AspectJ.html</include>
+			</includes>
+		</fileSet>
 		<fileSet>
 			<directory>../util/target/classes</directory>
 			<outputDirectory>.</outputDirectory>
@@ -35,4 +42,3 @@
 	</fileSets>
 
 </assembly>
-
diff --git a/aspectjmatcher/aspectjmatcher-sources-assembly.xml b/aspectjmatcher/aspectjmatcher-sources-assembly.xml
index 0425ccbe8..95c0488fb 100644
--- a/aspectjmatcher/aspectjmatcher-sources-assembly.xml
+++ b/aspectjmatcher/aspectjmatcher-sources-assembly.xml
@@ -12,6 +12,13 @@
 	<includeBaseDirectory>false</includeBaseDirectory>
 
 	<fileSets>
+		<fileSet>
+			<directory>../docs/dist</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>LICENSE-AspectJ.html</include>
+			</includes>
+		</fileSet>
 		<fileSet>
 			<directory>../util/src/main/java</directory>
 			<outputDirectory>.</outputDirectory>
@@ -27,4 +34,3 @@
 	</fileSets>
 
 </assembly>
-
diff --git a/aspectjrt/aspectjrt-assembly.xml b/aspectjrt/aspectjrt-assembly.xml
index 5c3e41713..3b55a1659 100644
--- a/aspectjrt/aspectjrt-assembly.xml
+++ b/aspectjrt/aspectjrt-assembly.xml
@@ -11,6 +11,13 @@
 	<includeBaseDirectory>false</includeBaseDirectory>
 
 	<fileSets>
+		<fileSet>
+			<directory>../docs/dist</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>LICENSE-AspectJ.html</include>
+			</includes>
+		</fileSet>
 		<fileSet>
 			<directory>../runtime/target/classes</directory>
 			<outputDirectory>.</outputDirectory>
@@ -21,4 +28,3 @@
 	</fileSets>
 
 </assembly>
-
diff --git a/aspectjrt/aspectjrt-sources-assembly.xml b/aspectjrt/aspectjrt-sources-assembly.xml
index fc030c3c2..f3b357606 100644
--- a/aspectjrt/aspectjrt-sources-assembly.xml
+++ b/aspectjrt/aspectjrt-sources-assembly.xml
@@ -12,6 +12,13 @@
 	<includeBaseDirectory>false</includeBaseDirectory>
 
 	<fileSets>
+		<fileSet>
+			<directory>../docs/dist</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>LICENSE-AspectJ.html</include>
+			</includes>
+		</fileSet>
 		<fileSet>
 			<directory>../runtime/src/main/java</directory>
 			<outputDirectory>.</outputDirectory>
@@ -29,4 +36,3 @@
 	</fileSets>
 
 </assembly>
-
diff --git a/aspectjtools/aspectjtools-assembly.xml b/aspectjtools/aspectjtools-assembly.xml
index fefc2c8d8..1fe6f055b 100644
--- a/aspectjtools/aspectjtools-assembly.xml
+++ b/aspectjtools/aspectjtools-assembly.xml
@@ -23,6 +23,14 @@
 	</dependencySets>
 
 	<fileSets>
+		<fileSet>
+			<directory>../docs/dist</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>LICENSE-AspectJ.html</include>
+			</includes>
+		</fileSet>
+
 		<!-- runtime -->
 		<fileSet>
 			<directory>../runtime/target/classes</directory>
diff --git a/aspectjtools/aspectjtools-sources-assembly.xml b/aspectjtools/aspectjtools-sources-assembly.xml
index cc708ae7f..74a05e3ab 100644
--- a/aspectjtools/aspectjtools-sources-assembly.xml
+++ b/aspectjtools/aspectjtools-sources-assembly.xml
@@ -13,6 +13,14 @@
 
 	<fileSets>
 
+		<fileSet>
+			<directory>../docs/dist</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>LICENSE-AspectJ.html</include>
+			</includes>
+		</fileSet>
+
 		<fileSet>
 			<directory>../weaver/src/main/java</directory>
 			<outputDirectory>.</outputDirectory>
diff --git a/aspectjweaver/aspectjweaver-assembly.xml b/aspectjweaver/aspectjweaver-assembly.xml
index 3433f6555..eaf9b7736 100644
--- a/aspectjweaver/aspectjweaver-assembly.xml
+++ b/aspectjweaver/aspectjweaver-assembly.xml
@@ -22,6 +22,13 @@
 	</dependencySets>
 
 	<fileSets>
+		<fileSet>
+			<directory>../docs/dist</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>LICENSE-AspectJ.html</include>
+			</includes>
+		</fileSet>
 		<fileSet>
 			<directory>../weaver/target/classes</directory>
 			<outputDirectory>.</outputDirectory>
@@ -81,4 +88,3 @@
 	</fileSets>
 
 </assembly>
-
diff --git a/aspectjweaver/aspectjweaver-sources-assembly.xml b/aspectjweaver/aspectjweaver-sources-assembly.xml
index 61d89a71e..2088e905c 100644
--- a/aspectjweaver/aspectjweaver-sources-assembly.xml
+++ b/aspectjweaver/aspectjweaver-sources-assembly.xml
@@ -12,6 +12,13 @@
 	<includeBaseDirectory>false</includeBaseDirectory>
 
 	<fileSets>
+		<fileSet>
+			<directory>../docs/dist</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>LICENSE-AspectJ.html</include>
+			</includes>
+		</fileSet>
 		<fileSet>
 			<directory>../weaver/src/main/java</directory>
 			<outputDirectory>.</outputDirectory>
@@ -52,4 +59,3 @@
 	</fileSets>
 
 </assembly>
-
diff --git a/installer/aspectjinstaller-assembly.xml b/installer/aspectjinstaller-assembly.xml
index 1a2c69190..cfd08697f 100644
--- a/installer/aspectjinstaller-assembly.xml
+++ b/installer/aspectjinstaller-assembly.xml
@@ -11,6 +11,13 @@
 	<includeBaseDirectory>false</includeBaseDirectory>
 
 	<fileSets>
+		<fileSet>
+			<directory>../docs/dist</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>LICENSE-AspectJ.html</include>
+			</includes>
+		</fileSet>
 		<fileSet>
 			<directory>../build/target/classes</directory>
 			<outputDirectory>.</outputDirectory>
@@ -48,4 +55,3 @@
 	</files>
 
 </assembly>
-
-- 
2.39.5