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 c22d1adf5ff9480edfe9db50c697d6329d80fe25..9b20bc1cff7863d7ad7d52f5f2b7b5fcc4c1bc01 100644 (file)
--- 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 95c0488fb2b27ece6b8851fe783568dca0b97a0b..378304cc10815e3bc94088f7c19363d15e8cbf79 100644 (file)
--- 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 3b55a165926ac998d2de3b8f79709b531cb634c1..09d7ac84b8f8c7da49488d5064bed62583f00cc9 100644 (file)
--- 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 f3b3576065355682baa0a4848f3c79881678a1a4..a25ef741dfcec09c4d249e096fd4a75401cf022a 100644 (file)
--- 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 1fe6f055bb3f5f3a47dd900d0cb70dd84c6bed04..4d5c17868dbd2640a7201a2839484f434c48e8e7 100644 (file)
--- 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 74a05e3ab205e36e76e771110c4540018645807d..d33238215307d7f5add3fb37358266f1bcfbc4ea 100644 (file)
--- 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 eaf9b773689ffa3177523b3ebdb7d8ff914d28c5..576bb2700996cb1a47aaa409014ac8b6138e4798 100644 (file)
--- 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 2088e905c6acfff734e852d59e85f829688ad65a..e27f5aff034bd237e6e0eeaa8138b0360249432a 100644 (file)
--- 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 6b12878f674e961dc140d0d2d661d53f64efd6a8..c754f3a44aa81b015060e1f312c5bd268b5b9dc4 100644 (file)
--- 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 cfd08697f58454cca84de648ab55126ebf576d7b..f3faf27d79a99909d17274ad4a272a2f51b5bd47 100644 (file)
--- 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 c5f8efa1f2a34764a2db634241d5be809b4d4972..565a456d1633a8b61e6216525d4c69c294f8691f 100644 (file)
--- 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>