From 20c15618667aa776c1edd9351bb499030eac2211 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Fri, 29 Dec 2023 23:16:34 +0530 Subject: [PATCH 01/11] test: Added a blank test class for Checkstyle Properties --- .../maven/CheckstylePropertiesTest.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java diff --git a/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java b/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java new file mode 100644 index 00000000..6ecded1a --- /dev/null +++ b/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java @@ -0,0 +1,20 @@ +/* + * Copyright 2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.openrewrite.maven; + +class CheckstylePropertiesTest { + +} From e29924c13b436e18d7fd837fddecca67f0280ace Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Wed, 3 Jan 2024 18:01:53 +0530 Subject: [PATCH 02/11] feat: Added checkstyle config files and created a test method for the same --- .../maven/CheckstylePropertiesTest.java | 16 ++- .../.checkstyle/checkstyle.xml | 127 ++++++++++++++++++ .../.checkstyle/import-control.xml | 8 ++ .../checkstyle_properties/pom.xml | 67 +++++++++ .../main/java/sample/ImportOrderSample.java | 24 ++++ 5 files changed, 241 insertions(+), 1 deletion(-) create mode 100644 src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle.xml create mode 100644 src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/import-control.xml create mode 100644 src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml create mode 100644 src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/src/main/java/sample/ImportOrderSample.java diff --git a/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java b/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java index 6ecded1a..b285ea46 100644 --- a/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java +++ b/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java @@ -15,6 +15,20 @@ */ package org.openrewrite.maven; -class CheckstylePropertiesTest { +import com.soebes.itf.jupiter.extension.*; +import com.soebes.itf.jupiter.maven.MavenExecutionResult; + +import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat; +@MavenJupiterExtension +@MavenOption(MavenCLIOptions.NO_TRANSFER_PROGRESS) +@MavenOption(MavenCLIExtra.MUTE_PLUGIN_VALIDATION_WARNING) +@MavenGoal("${project.groupId}:${project.artifactId}:${project.version}:run") +class CheckstylePropertiesTest { + @MavenTest + void checkstyleProperties(MavenExecutionResult result) { +// assertThat(result) +// .isSuccessful() +// .out(); + } } diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle.xml new file mode 100644 index 00000000..e349fcd9 --- /dev/null +++ b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/import-control.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/import-control.xml new file mode 100644 index 00000000..8ea83633 --- /dev/null +++ b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/import-control.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml new file mode 100644 index 00000000..bbee4dea --- /dev/null +++ b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml @@ -0,0 +1,67 @@ + + + 4.0.0 + + org.openrewrite.maven + checkstyle_properties + 1.0 + jar + CheckstylePropertiesTest#checkstyle_properties + + + 1.8 + 1.8 + UTF-8 + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + org.openrewrite.staticanalysis.CodeCleanup + + + + + org.openrewrite.recipe + rewrite-static-analysis + 1.1.4 + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.7 + + + + + validate + validate + + .checkstyle/checkstyle.xml + true + true + importControlFile=${project.basedir}/.checkstyle/import-control.xml + + + check + + + + + + + \ No newline at end of file diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/src/main/java/sample/ImportOrderSample.java b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/src/main/java/sample/ImportOrderSample.java new file mode 100644 index 00000000..99b666d9 --- /dev/null +++ b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/src/main/java/sample/ImportOrderSample.java @@ -0,0 +1,24 @@ +package sample; + +import java.net.URL; +import java.util.ArrayList; + +public class ImportOrderSample { + public void useUtilPackage() { + ArrayList list = new ArrayList<>(); + list.add("Hello"); + list.add("World"); + for (String s : list) { + System.out.println(s); + } + } + + public void useNetPackage() { + try { + URL url = new URL("https://github.com"); + url.openConnection(); + } catch (Exception e) { + System.out.println("Failed to connect to github.com! " + e.getMessage()); + } + } +} From 63899e0bc3e87b07810726c269cab5e2a83302b7 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Tue, 16 Jan 2024 22:58:06 +0100 Subject: [PATCH 03/11] Update src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java --- .../java/org/openrewrite/maven/CheckstylePropertiesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java b/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java index b285ea46..4c6c6ae7 100644 --- a/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java +++ b/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java @@ -26,7 +26,7 @@ @MavenGoal("${project.groupId}:${project.artifactId}:${project.version}:run") class CheckstylePropertiesTest { @MavenTest - void checkstyleProperties(MavenExecutionResult result) { + void checkstyle_properties(MavenExecutionResult result) { // assertThat(result) // .isSuccessful() // .out(); From 7752c02903fe99b036bba0542f4e694821c1652b Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Tue, 16 Jan 2024 23:13:41 +0100 Subject: [PATCH 04/11] Ensure build is successful --- .../java/org/openrewrite/maven/CheckstylePropertiesTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java b/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java index 4c6c6ae7..4f01348d 100644 --- a/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java +++ b/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java @@ -27,8 +27,7 @@ class CheckstylePropertiesTest { @MavenTest void checkstyle_properties(MavenExecutionResult result) { -// assertThat(result) -// .isSuccessful() -// .out(); + assertThat(result) + .isSuccessful(); } } From 74b3256e06883b1f400b815698af3f5b476701f1 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Tue, 16 Jan 2024 23:15:55 +0100 Subject: [PATCH 05/11] Rename to CheckstylePropertiesIT --- ...heckstylePropertiesTest.java => CheckstylePropertiesIT.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/test/java/org/openrewrite/maven/{CheckstylePropertiesTest.java => CheckstylePropertiesIT.java} (97%) diff --git a/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java b/src/test/java/org/openrewrite/maven/CheckstylePropertiesIT.java similarity index 97% rename from src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java rename to src/test/java/org/openrewrite/maven/CheckstylePropertiesIT.java index 4f01348d..261b2c9b 100644 --- a/src/test/java/org/openrewrite/maven/CheckstylePropertiesTest.java +++ b/src/test/java/org/openrewrite/maven/CheckstylePropertiesIT.java @@ -24,7 +24,7 @@ @MavenOption(MavenCLIOptions.NO_TRANSFER_PROGRESS) @MavenOption(MavenCLIExtra.MUTE_PLUGIN_VALIDATION_WARNING) @MavenGoal("${project.groupId}:${project.artifactId}:${project.version}:run") -class CheckstylePropertiesTest { +class CheckstylePropertiesIT { @MavenTest void checkstyle_properties(MavenExecutionResult result) { assertThat(result) From cd835fcd11d3b148733747cb1a94694c4fc72252 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Tue, 16 Jan 2024 23:20:50 +0100 Subject: [PATCH 06/11] Use RELEASE for rewrite-static-analysis version --- .../CheckstylePropertiesTest/checkstyle_properties/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml index bbee4dea..483f44b9 100644 --- a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml +++ b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml @@ -31,7 +31,7 @@ org.openrewrite.recipe rewrite-static-analysis - 1.1.4 + RELEASE From a3050d87af1530e6e8e405e0799f720e98e6ae43 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Sun, 28 Jan 2024 17:00:46 +0530 Subject: [PATCH 07/11] fix: Added suppressions file --- .../.checkstyle/checkstyle-suppressions.xml | 7 +++++++ .../CheckstylePropertiesTest/checkstyle_properties/pom.xml | 1 + 2 files changed, 8 insertions(+) create mode 100644 src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle-suppressions.xml diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle-suppressions.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle-suppressions.xml new file mode 100644 index 00000000..a2573be0 --- /dev/null +++ b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle-suppressions.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml index 483f44b9..49215592 100644 --- a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml +++ b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml @@ -55,6 +55,7 @@ true true importControlFile=${project.basedir}/.checkstyle/import-control.xml + .checkstyle/checkstyle-suppressions.xml check From 11bca1e6e1c14adc8004e4dd4f5952a189259795 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Sat, 13 Apr 2024 00:11:29 +0530 Subject: [PATCH 08/11] feat: Added methods to extract and replace Checkstyle Properties from pom file --- .../maven/ConfigurableRewriteMojo.java | 27 ++++++++++++++++++- .../checkstyle_properties/pom.xml | 3 +++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/openrewrite/maven/ConfigurableRewriteMojo.java b/src/main/java/org/openrewrite/maven/ConfigurableRewriteMojo.java index 1eb0e45b..a5951f81 100644 --- a/src/main/java/org/openrewrite/maven/ConfigurableRewriteMojo.java +++ b/src/main/java/org/openrewrite/maven/ConfigurableRewriteMojo.java @@ -29,6 +29,7 @@ import org.openrewrite.style.NamedStyles; import java.io.InputStream; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; @@ -102,6 +103,17 @@ public abstract class ConfigurableRewriteMojo extends AbstractMojo { @Parameter(property = "rewrite.checkstyleDetectionEnabled", alias = "checkstyleDetectionEnabled", defaultValue = "true") protected boolean checkstyleDetectionEnabled; + @Nullable + @Parameter(property = "rewrite.checkstyleProperties", alias = "checkstyleProperties") + private LinkedHashSet checkstyleProperties; + /** + * @deprecated Use {@code rewrite.checkstyleProperties} instead. + */ + @Nullable + @Parameter(property = "checkstyleProperties") + @Deprecated + private LinkedHashSet deprecatedCheckstyleProperties; + @Nullable @Parameter(property = "rewrite.exclusions") private LinkedHashSet exclusions; @@ -117,6 +129,10 @@ protected Set getExclusions() { return getMergedAndCleaned(exclusions, deprecatedExclusions); } + protected Set getCheckstyleProperties() { + return getMergedAndCleaned(checkstyleProperties, deprecatedCheckstyleProperties); + } + @Nullable @Parameter(property = "rewrite.plainTextMasks") private LinkedHashSet plainTextMasks; @@ -248,7 +264,16 @@ protected List loadStyles(MavenProject project, Environment env) { try { Plugin checkstylePlugin = project.getPlugin("org.apache.maven.plugins:maven-checkstyle-plugin"); if (checkstyleConfigFile != null && !checkstyleConfigFile.isEmpty()) { - styles.add(CheckstyleConfigLoader.loadCheckstyleConfig(Paths.get(checkstyleConfigFile), emptyMap())); + // Convert the checkstyle config file contents to a String + String checkstyleConfig = new String(Files.readAllBytes(Paths.get(checkstyleConfigFile))); + Set checkstyleProperties = getCheckstyleProperties(); + if (!checkstyleProperties.isEmpty()) { + checkstyleConfig = checkstyleProperties.stream() + .map(s -> "-P" + s) + .collect(Collectors.joining("\n", "", "\n")) + checkstyleConfig; + } + styles.add(CheckstyleConfigLoader.loadCheckstyleConfig(checkstyleConfig, emptyMap())); +// styles.add(CheckstyleConfigLoader.loadCheckstyleConfig(Paths.get(checkstyleConfigFile), emptyMap())); } else if (checkstyleDetectionEnabled && checkstylePlugin != null) { Object checkstyleConfRaw = checkstylePlugin.getConfiguration(); if (checkstyleConfRaw instanceof Xpp3Dom) { diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml index 49215592..c47258eb 100644 --- a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml +++ b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml @@ -26,6 +26,9 @@ org.openrewrite.staticanalysis.CodeCleanup + + + From b8fa2099bc60e5539f9b9d0db30d27c795808ee2 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Thu, 25 Apr 2024 13:22:25 +0200 Subject: [PATCH 09/11] Rename resources-its folder to match test class --- .../checkstyle_properties/.checkstyle/checkstyle-suppressions.xml | 0 .../checkstyle_properties/.checkstyle/checkstyle.xml | 0 .../checkstyle_properties/.checkstyle/import-control.xml | 0 .../checkstyle_properties/pom.xml | 0 .../src/main/java/sample/ImportOrderSample.java | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename src/test/resources-its/org/openrewrite/maven/{CheckstylePropertiesTest => CheckstylePropertiesIT}/checkstyle_properties/.checkstyle/checkstyle-suppressions.xml (100%) rename src/test/resources-its/org/openrewrite/maven/{CheckstylePropertiesTest => CheckstylePropertiesIT}/checkstyle_properties/.checkstyle/checkstyle.xml (100%) rename src/test/resources-its/org/openrewrite/maven/{CheckstylePropertiesTest => CheckstylePropertiesIT}/checkstyle_properties/.checkstyle/import-control.xml (100%) rename src/test/resources-its/org/openrewrite/maven/{CheckstylePropertiesTest => CheckstylePropertiesIT}/checkstyle_properties/pom.xml (100%) rename src/test/resources-its/org/openrewrite/maven/{CheckstylePropertiesTest => CheckstylePropertiesIT}/checkstyle_properties/src/main/java/sample/ImportOrderSample.java (100%) diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle-suppressions.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/.checkstyle/checkstyle-suppressions.xml similarity index 100% rename from src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle-suppressions.xml rename to src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/.checkstyle/checkstyle-suppressions.xml diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/.checkstyle/checkstyle.xml similarity index 100% rename from src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/checkstyle.xml rename to src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/.checkstyle/checkstyle.xml diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/import-control.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/.checkstyle/import-control.xml similarity index 100% rename from src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/.checkstyle/import-control.xml rename to src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/.checkstyle/import-control.xml diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/pom.xml similarity index 100% rename from src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/pom.xml rename to src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/pom.xml diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/src/main/java/sample/ImportOrderSample.java b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/src/main/java/sample/ImportOrderSample.java similarity index 100% rename from src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesTest/checkstyle_properties/src/main/java/sample/ImportOrderSample.java rename to src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/src/main/java/sample/ImportOrderSample.java From 8c148bee12dc831eef810b473879e25080747d03 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Mon, 20 May 2024 19:01:22 +0200 Subject: [PATCH 10/11] Do not fail test project build on known violation --- .../maven/CheckstylePropertiesIT/checkstyle_properties/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/pom.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/pom.xml index c47258eb..5b25e4f1 100644 --- a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/pom.xml +++ b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/pom.xml @@ -56,7 +56,7 @@ .checkstyle/checkstyle.xml true - true + false importControlFile=${project.basedir}/.checkstyle/import-control.xml .checkstyle/checkstyle-suppressions.xml From 3471a252108059ab9a30daa97af6c89bd46f3a91 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Mon, 20 May 2024 19:13:38 +0200 Subject: [PATCH 11/11] Use configuration instead of execution in test pom.xml --- .../checkstyle_properties/pom.xml | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/pom.xml b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/pom.xml index 5b25e4f1..50593387 100644 --- a/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/pom.xml +++ b/src/test/resources-its/org/openrewrite/maven/CheckstylePropertiesIT/checkstyle_properties/pom.xml @@ -42,6 +42,13 @@ org.apache.maven.plugins maven-checkstyle-plugin 3.3.1 + + .checkstyle/checkstyle.xml + true + false + importControlFile=${project.basedir}/.checkstyle/import-control.xml + .checkstyle/checkstyle-suppressions.xml + com.puppycrawl.tools @@ -49,22 +56,6 @@ 10.12.7 - - - validate - validate - - .checkstyle/checkstyle.xml - true - false - importControlFile=${project.basedir}/.checkstyle/import-control.xml - .checkstyle/checkstyle-suppressions.xml - - - check - - -