From 1c92111fc409e56bcdb59355ac4dc7225d5e0dc9 Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Wed, 24 Jul 2024 21:20:16 -0300 Subject: [PATCH] Ignore toolchains plugin when running openrewrite Signed-off-by: Marvin Froeder --- .github/workflows/receive-pr.yml | 2 +- pom.xml | 154 ++++++++++++++++++++----------- 2 files changed, 99 insertions(+), 57 deletions(-) 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..f4ec318ff 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 @@ -961,43 +924,122 @@ org.openrewrite.maven rewrite-maven-plugin - 5.35.0 - - - - org.openrewrite.java.testing.hamcrest.MigrateHamcrestToAssertJ - org.openrewrite.java.testing.assertj.JUnitToAssertj - org.openrewrite.java.testing.assertj.Assertj - org.openrewrite.java.migrate.UpgradeToJava21 - - - **/src/main/java/** - **/pom.xml - - + 5.36.0 org.openrewrite.recipe rewrite-testing-frameworks - 2.13.0 + 2.14.0 org.openrewrite.recipe rewrite-migrate-java - 2.19.0 + 2.20.0 + tests runNoFork verify + + true + + org.openrewrite.java.testing.hamcrest.MigrateHamcrestToAssertJ + org.openrewrite.java.testing.assertj.JUnitToAssertj + org.openrewrite.java.testing.assertj.Assertj + org.openrewrite.java.migrate.UpgradeToJava21 + + + **/src/main/java/** + pom.xml + + + + + sources + + runNoFork + + verify + + true + + org.openrewrite.java.migrate.UpgradeToJava8 + + + + + + + + + + + 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} + + +