Skip to content

Commit 1f343ee

Browse files
authored
Fix javadoc:jar generation and add it in the verify goals (#115)
* add javadoc:jar verify goal * build with java11 * fix javadoc generation --------- Signed-off-by: Olivier Lamy <olamy@apache.org>
1 parent 18a51cd commit 1f343ee

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

.github/workflows/maven-verify-3.9.x.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
maven-args: '-D"maven.test.redirectTestOutputToFile=false -Pmaven3"'
3030
maven-matrix: '[ "3.9.5", "4.0.0-alpha-8" ]'
31-
matrix-exclude: >
32-
[
33-
{"jdk": "8"}
34-
]
31+
jdk-matrix: '[ "11", "17" ]'
32+
ff-goal: '-P run-its verify javadoc:jar'
33+
verify-goal: '-P run-its verify javadoc:jar'
34+

.github/workflows/maven-verify.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
with:
2929
maven-args: '-D"maven.test.redirectTestOutputToFile=false"'
3030
maven-matrix: '[ "3.9.5", "4.0.0-alpha-8" ]'
31-
matrix-exclude: >
32-
[
33-
{"jdk": "8"}
34-
]
31+
jdk-matrix: '[ "11", "17" ]'
32+
ff-goal: '-P run-its verify javadoc:jar'
33+
verify-goal: '-P run-its verify javadoc:jar'

src/main/mdo/build-cache-config.mdo

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -816,26 +816,24 @@ under the License.
816816
</class>
817817
<class>
818818
<name>Exclude</name>
819-
<description><![CDATA[A file or a directory path to exclude from the checksum computation. Relative path are relative to each module basedir.<br/>
819+
<description><![CDATA[<p>A file or a directory path to exclude from the checksum computation. Relative path are relative to each module basedir.</p>
820820
When referring to a directory, additional properties help adjust the scope of the exclusion:
821821
<ul>
822822
<li>glob - only entries matching this <a href="https://docs.oracle.com/javase/tutorial/essential/io/fileOps.html#glob">glob pattern</a> are excluded</li>
823823
<li>entryType - type of entries excluded from the scan</li>
824824
<li>matcherType - entry property on which the glob matching is applied</li>
825825
</ul>
826-
By default, targeting a directory excludes everything underneath it.<br/>
827-
<br/>
826+
<p>By default, targeting a directory excludes everything underneath it.</p>
828827
Examples :
829828
<ul>
830829
<li><code>&lt;exclude&gt;src/main/doc&lt;/exclude&gt;</code> : excludes everything under : ${project.basedir}/src/main/doc</li>
831830
<li><code>&lt;exclude&gt;src/main/java/package-info.java&lt;/exclude&gt;</code> : excludes this file : ${project.basedir}/src/main/java/package-info.java</li>
832831
<li><code>&lt;exclude glob="package-info.java"&gt;&lt;/exclude&gt;</code> : excludes all the files named package-info.java</li>
833832
<li><code>&lt;exclude glob="src/main/resources&#x2F;**.txt" entryType="FILE" matcherType="PATH" &gt;&lt;/exclude&gt;</code> : excludes all the text files located under the "resources" folder</li>
834833
</ul>
835-
<br/>
836-
Exclude elements can also be added per project with the use of <a href="parameters.html#project-level-properties">maven properties.</a><br/>
837-
<br/><br/>
838-
834+
<p>
835+
Exclude elements can also be added per project with the use of <a href="parameters.html#project-level-properties">maven properties.</a>
836+
</p>
839837
]]></description>
840838
<fields>
841839
<field xml.content="true">
@@ -865,8 +863,8 @@ under the License.
865863
</class>
866864
<class>
867865
<name>Include</name>
868-
<description><![CDATA[A file or a directory path to add to checksum computation. Relative path are relative to each module basedir.<br/><br/>
869-
Include elements can also be added per project with the use of <a href="parameters.html#project-level-properties">maven properties.</a><br/><br/>
866+
<description><![CDATA[A <p>file or a directory path to add to checksum computation. Relative path are relative to each module basedir.</p>
867+
<p>Include elements can also be added per project with the use of <a href="parameters.html#project-level-properties">maven properties.</a></p>
870868
]]></description>
871869
<fields>
872870
<field xml.content="true">

0 commit comments

Comments
 (0)