diff --git a/CHANGELOG b/CHANGELOG index 2042707..c0c8c1a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,14 @@ CHANGELOG ========= +2.1.3 +----- + +* Change required pom dependency +* Only apply checks to code in: src/main/java +* Replace parent pom with kemitix-parent:2.4.0 +* Remove dependency on kemitix-checkstyle-ruleset-maven-plugin for builder module + 2.1.2 ----- diff --git a/builder/pom.xml b/builder/pom.xml index 5c7fdc3..d76d9c6 100644 --- a/builder/pom.xml +++ b/builder/pom.xml @@ -6,13 +6,13 @@ net.kemitix - kemitix-spring-parent - 2.2.0 + kemitix-parent + 2.4.0 kemitix-checkstyle-ruleset-builder - 2.1.2 + 2.1.3 jar Kemitix Checkstyle Ruleset Builder @@ -41,7 +41,7 @@ 1.16.12 3.6.2 2.3.5 - 1.0.0 + 1.0.0 4.3.0 @@ -90,17 +90,12 @@ me.andrz map-builder - ${mapbuilder.version} + ${map-builder.version} test - - net.kemitix - kemitix-checkstyle-ruleset-maven-plugin - ${project.version} - org.springframework.boot spring-boot-maven-plugin diff --git a/plugin-sample/pom.xml b/plugin-sample/pom.xml index 0ebc78b..fe764fb 100644 --- a/plugin-sample/pom.xml +++ b/plugin-sample/pom.xml @@ -8,7 +8,7 @@ net.kemitix kemitix-checkstyle-ruleset-plugin-sample - 2.1.2 + 2.1.3 Kemitix Checkstyle Ruleset Plugin Sample Sample usage of the Kemitix Checkstyle Ruleset Plugin diff --git a/plugin/pom.xml b/plugin/pom.xml index 42a428d..a227ab3 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -7,7 +7,7 @@ net.kemitix kemitix-checkstyle-ruleset-parent - 2.1.2 + 2.1.3 kemitix-checkstyle-ruleset-maven-plugin @@ -30,11 +30,6 @@ 2.2.0 1.16.12 1.0.0 - - 1.0.0 - 2.17 - 7.5.1 - 1.23.0 diff --git a/plugin/src/main/java/net/kemitix/checkstyle/ruleset/plugin/AbstractCheckMojo.java b/plugin/src/main/java/net/kemitix/checkstyle/ruleset/plugin/AbstractCheckMojo.java index f09b608..b3a3102 100644 --- a/plugin/src/main/java/net/kemitix/checkstyle/ruleset/plugin/AbstractCheckMojo.java +++ b/plugin/src/main/java/net/kemitix/checkstyle/ruleset/plugin/AbstractCheckMojo.java @@ -71,6 +71,8 @@ abstract class AbstractCheckMojo extends AbstractMojo { private static final String CONFIG_LOCATION = "configLocation"; + private static final String SOURCE_DIR = "sourceDirectory"; + private String rulesetVersion; @Setter @@ -110,7 +112,9 @@ abstract class AbstractCheckMojo extends AbstractMojo { // configure val checkstylePlugin = getPlugin(pluginVersion, checkstyleVersion, sevntuVersion); val configuration = MojoExecutor.configuration( - MojoExecutor.element(CONFIG_LOCATION, String.format("net/kemitix/checkstyle-%s.xml", level))); + MojoExecutor.element(CONFIG_LOCATION, String.format("net/kemitix/checkstyle-%s.xml", level)), + MojoExecutor.element(SOURCE_DIR, mavenProject.getBuild().getSourceDirectory()) + ); val environment = MojoExecutor.executionEnvironment(mavenProject, mavenSession, pluginManager); // run @@ -139,7 +143,7 @@ abstract class AbstractCheckMojo extends AbstractMojo { private Properties getProperties() throws MojoFailureException { // load properties from the plugin pom.xml - val pluginArtifactId = KEMITIX_ARTIFACTID + "-maven-plugin"; + val pluginArtifactId = KEMITIX_ARTIFACTID + "-parent"; val pluginArtifact = new DefaultArtifact(KEMITIX_GROUPID, pluginArtifactId, rulesetVersion, null, "", null, new DefaultArtifactHandler("pom") ); diff --git a/pom.xml b/pom.xml index e84871a..1d75051 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.kemitix kemitix-checkstyle-ruleset-parent - 2.1.2 + 2.1.3 pom Kemitix Checkstyle Ruleset (Parent) @@ -19,6 +19,10 @@ 3.0.1 1.6 2.8.2 + + 2.17 + 7.5.1 + 1.23.0 diff --git a/ruleset/pom.xml b/ruleset/pom.xml index 95105a9..1a9d912 100644 --- a/ruleset/pom.xml +++ b/ruleset/pom.xml @@ -7,11 +7,11 @@ net.kemitix kemitix-checkstyle-ruleset-parent - 2.1.2 + 2.1.3 kemitix-checkstyle-ruleset - 2.1.2 + 2.1.3 jar Kemitix Checkstyle Ruleset