diff --git a/.github/workflows/receive-pr.yml b/.github/workflows/receive-pr.yml index eeb201ebd..5a709c329 100644 --- a/.github/workflows/receive-pr.yml +++ b/.github/workflows/receive-pr.yml @@ -42,7 +42,7 @@ jobs: # Execute recipes - name: Apply OpenRewrite recipes - run: mvn --activate-profiles openrewrite org.openrewrite.maven:rewrite-maven-plugin:run + run: ./mvnw -Dtoolchain.skip=true -Dlicense.skip=true -DskipTests=true -P openrewrite clean install # Capture the diff - name: Create patch diff --git a/pom.xml b/pom.xml index 8f8dee75e..5a452c53f 100644 --- a/pom.xml +++ b/pom.xml @@ -479,9 +479,6 @@ true false ${jvm.options} - - ${latest.java.version} - @@ -492,49 +489,12 @@ true false - - ${latest.java.version} - - - org.apache.maven.plugins - maven-toolchains-plugin - 3.2.0 - - - - toolchain - - - - - ${main.java.version} - - - - - - test - generate-test-sources - - toolchain - - - - - ${latest.java.version} - - - - - - - org.moditect moditect-maven-plugin @@ -667,6 +627,9 @@ etc/header.txt **/.idea/** **/target/** + **/scripts/** + **/src/config/** + **/codequality/** LICENSE NOTICE OSSMETADATA @@ -972,7 +935,7 @@ **/src/main/java/** - **/pom.xml + pom.xml @@ -1001,7 +964,72 @@ - + + + toolchain + + + !toolchain.skip + + + + + + + org.apache.maven.plugins + maven-toolchains-plugin + 3.2.0 + + + + toolchain + + + + + ${main.java.version} + + + + + + test + + toolchain + + generate-test-sources + + + + ${latest.java.version} + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${latest.java.version} + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + ${latest.java.version} + + + + + + +