Skip to content

Commit 939e81e

Browse files
kriegaexkriegaex
committed
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 <[email protected]>
1 parent 81dc828 commit 939e81e

11 files changed

+21
-21
lines changed

‎aspectjmatcher/aspectjmatcher-assembly.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
<fileSets>
1414
<fileSet>
15-
<directory>../docs/dist</directory>
15+
<directory>../docs</directory>
1616
<outputDirectory>.</outputDirectory>
1717
<includes>
18-
<include>LICENSE-AspectJ.html</include>
18+
<include>LICENSE-AspectJ.adoc</include>
1919
</includes>
2020
</fileSet>
2121
<fileSet>

‎aspectjmatcher/aspectjmatcher-sources-assembly.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
<fileSets>
1515
<fileSet>
16-
<directory>../docs/dist</directory>
16+
<directory>../docs</directory>
1717
<outputDirectory>.</outputDirectory>
1818
<includes>
19-
<include>LICENSE-AspectJ.html</include>
19+
<include>LICENSE-AspectJ.adoc</include>
2020
</includes>
2121
</fileSet>
2222
<fileSet>

‎aspectjrt/aspectjrt-assembly.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
<fileSets>
1414
<fileSet>
15-
<directory>../docs/dist</directory>
15+
<directory>../docs</directory>
1616
<outputDirectory>.</outputDirectory>
1717
<includes>
18-
<include>LICENSE-AspectJ.html</include>
18+
<include>LICENSE-AspectJ.adoc</include>
1919
</includes>
2020
</fileSet>
2121
<fileSet>

‎aspectjrt/aspectjrt-sources-assembly.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
<fileSets>
1515
<fileSet>
16-
<directory>../docs/dist</directory>
16+
<directory>../docs</directory>
1717
<outputDirectory>.</outputDirectory>
1818
<includes>
19-
<include>LICENSE-AspectJ.html</include>
19+
<include>LICENSE-AspectJ.adoc</include>
2020
</includes>
2121
</fileSet>
2222
<fileSet>

‎aspectjtools/aspectjtools-assembly.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424

2525
<fileSets>
2626
<fileSet>
27-
<directory>../docs/dist</directory>
27+
<directory>../docs</directory>
2828
<outputDirectory>.</outputDirectory>
2929
<includes>
30-
<include>LICENSE-AspectJ.html</include>
30+
<include>LICENSE-AspectJ.adoc</include>
3131
</includes>
3232
</fileSet>
3333

‎aspectjtools/aspectjtools-sources-assembly.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
<fileSets>
1515

1616
<fileSet>
17-
<directory>../docs/dist</directory>
17+
<directory>../docs</directory>
1818
<outputDirectory>.</outputDirectory>
1919
<includes>
20-
<include>LICENSE-AspectJ.html</include>
20+
<include>LICENSE-AspectJ.adoc</include>
2121
</includes>
2222
</fileSet>
2323

‎aspectjweaver/aspectjweaver-assembly.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
<fileSets>
2525
<fileSet>
26-
<directory>../docs/dist</directory>
26+
<directory>../docs</directory>
2727
<outputDirectory>.</outputDirectory>
2828
<includes>
29-
<include>LICENSE-AspectJ.html</include>
29+
<include>LICENSE-AspectJ.adoc</include>
3030
</includes>
3131
</fileSet>
3232
<fileSet>

‎aspectjweaver/aspectjweaver-sources-assembly.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
<fileSets>
1515
<fileSet>
16-
<directory>../docs/dist</directory>
16+
<directory>../docs</directory>
1717
<outputDirectory>.</outputDirectory>
1818
<includes>
19-
<include>LICENSE-AspectJ.html</include>
19+
<include>LICENSE-AspectJ.adoc</include>
2020
</includes>
2121
</fileSet>
2222
<fileSet>

‎docs/README-AspectJ.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ binaries,
1414
programming and development environment guides, instructions for the Ant
1515
tasks, a README for 1.1 changes, and a quick reference, all linked from
1616
the link:doc/index.html[index] page.
17-
* this README-AspectJ.html, and
18-
* the LICENSE-AspectJ.html applying to this distribution.
17+
* this README-AspectJ.adoc, and
18+
* the LICENSE-AspectJ.adoc applying to this distribution.
1919

2020
'''''
2121

‎installer/aspectjinstaller-assembly.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
<fileSets>
1414
<fileSet>
15-
<directory>../docs/dist</directory>
15+
<directory>../docs</directory>
1616
<outputDirectory>.</outputDirectory>
1717
<includes>
18-
<include>LICENSE-AspectJ.html</include>
18+
<include>LICENSE-AspectJ.adoc</include>
1919
</includes>
2020
</fileSet>
2121
<fileSet>

‎installer/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<artifactId>build</artifactId>
8282
<version>${project.version}</version>
8383
</dependency>
84-
<!-- AspectJ documentation, created by Ant job in aj-build/dist/docs -->
84+
<!-- AspectJ documentation, created by Asciidoctor in aj-build/dist/docs -->
8585
<dependency>
8686
<groupId>org.aspectj</groupId>
8787
<artifactId>docs</artifactId>

0 commit comments

Comments
 (0)