This is an automated email from the ASF dual-hosted git repository. olamy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git
The following commit(s) were added to refs/heads/master by this push: new 1f343ee Fix javadoc:jar generation and add it in the verify goals (#115) 1f343ee is described below commit 1f343ee8c561c97adbee1db2f840e1d9d12088b7 Author: Olivier Lamy <ol...@apache.org> AuthorDate: Mon Nov 27 11:30:09 2023 +1000 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 <ol...@apache.org> --- .github/workflows/maven-verify-3.9.x.yml | 8 ++++---- .github/workflows/maven-verify.yml | 7 +++---- src/main/mdo/build-cache-config.mdo | 16 +++++++--------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.github/workflows/maven-verify-3.9.x.yml b/.github/workflows/maven-verify-3.9.x.yml index 78a7f26..10dab2d 100644 --- a/.github/workflows/maven-verify-3.9.x.yml +++ b/.github/workflows/maven-verify-3.9.x.yml @@ -28,7 +28,7 @@ jobs: with: maven-args: '-D"maven.test.redirectTestOutputToFile=false -Pmaven3"' maven-matrix: '[ "3.9.5", "4.0.0-alpha-8" ]' - matrix-exclude: > - [ - {"jdk": "8"} - ] + jdk-matrix: '[ "11", "17" ]' + ff-goal: '-P run-its verify javadoc:jar' + verify-goal: '-P run-its verify javadoc:jar' + diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 906491d..0665f5c 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -28,7 +28,6 @@ jobs: with: maven-args: '-D"maven.test.redirectTestOutputToFile=false"' maven-matrix: '[ "3.9.5", "4.0.0-alpha-8" ]' - matrix-exclude: > - [ - {"jdk": "8"} - ] + jdk-matrix: '[ "11", "17" ]' + ff-goal: '-P run-its verify javadoc:jar' + verify-goal: '-P run-its verify javadoc:jar' \ No newline at end of file diff --git a/src/main/mdo/build-cache-config.mdo b/src/main/mdo/build-cache-config.mdo index f55af5d..9f8b2ab 100644 --- a/src/main/mdo/build-cache-config.mdo +++ b/src/main/mdo/build-cache-config.mdo @@ -816,15 +816,14 @@ under the License. </class> <class> <name>Exclude</name> - <description><![CDATA[A file or a directory path to exclude from the checksum computation. Relative path are relative to each module basedir.<br/> + <description><![CDATA[<p>A file or a directory path to exclude from the checksum computation. Relative path are relative to each module basedir.</p> When referring to a directory, additional properties help adjust the scope of the exclusion: <ul> <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> <li>entryType - type of entries excluded from the scan</li> <li>matcherType - entry property on which the glob matching is applied</li> </ul> - By default, targeting a directory excludes everything underneath it.<br/> - <br/> + <p>By default, targeting a directory excludes everything underneath it.</p> Examples : <ul> <li><code><exclude>src/main/doc</exclude></code> : excludes everything under : ${project.basedir}/src/main/doc</li> @@ -832,10 +831,9 @@ under the License. <li><code><exclude glob="package-info.java"></exclude></code> : excludes all the files named package-info.java</li> <li><code><exclude glob="src/main/resources/**.txt" entryType="FILE" matcherType="PATH" ></exclude></code> : excludes all the text files located under the "resources" folder</li> </ul> - <br/> - Exclude elements can also be added per project with the use of <a href="parameters.html#project-level-properties">maven properties.</a><br/> - <br/><br/> - + <p> + Exclude elements can also be added per project with the use of <a href="parameters.html#project-level-properties">maven properties.</a> + </p> ]]></description> <fields> <field xml.content="true"> @@ -865,8 +863,8 @@ under the License. </class> <class> <name>Include</name> - <description><![CDATA[A file or a directory path to add to checksum computation. Relative path are relative to each module basedir.<br/><br/> - Include elements can also be added per project with the use of <a href="parameters.html#project-level-properties">maven properties.</a><br/><br/> + <description><![CDATA[A <p>file or a directory path to add to checksum computation. Relative path are relative to each module basedir.</p> + <p>Include elements can also be added per project with the use of <a href="parameters.html#project-level-properties">maven properties.</a></p> ]]></description> <fields> <field xml.content="true">