From efc76a5c54e232490c418d72ae70b26254fd799b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 3 May 2022 10:13:24 +1000 Subject: [PATCH 1/2] use shared gh action from ASF Signed-off-by: Olivier Lamy --- .github/workflows/maven.yml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index efd04be8..d0724b86 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,25 +21,5 @@ on: [push, pull_request] jobs: build: - - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] - java: [8, 11, 17] - fail-fast: false - - runs-on: ${{ matrix.os }} - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up JDK - uses: actions/setup-java@v3.1.1 - with: - java-version: ${{ matrix.java }} - distribution: temurin - cache: maven - - - name: Build with Maven - run: ./mvnw verify -e -B -V -P run-its + name: Verify + uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2 From 2afbb981efe5803c60459e89a963abdc36ed2531 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 3 May 2022 10:37:29 +1000 Subject: [PATCH 2/2] fix javadoc with jdk11 Signed-off-by: Olivier Lamy --- src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java index 4042f6cf..84e6ad83 100644 --- a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java +++ b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java @@ -98,7 +98,8 @@ * of the original POM with the focus to contain only the important information for consuming it. Therefore information * that is only required for maintenance by developers and to build the project artifact(s) are stripped. Starting from * here we specify how the flattened POM is created from the original POM and its project:
- * + *
+ * * * *
ElementTransformation