Merge branch 'release/2.1.3'

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
 -----
 

builder/pom.xml

@@ -6,13 +6,13 @@
 
     <parent>
         <groupId>net.kemitix</groupId>
-        <artifactId>kemitix-spring-parent</artifactId>
+        <artifactId>kemitix-parent</artifactId>
-        <version>2.2.0</version>
+        <version>2.4.0</version>
         <relativePath/>
     </parent>
 
     <artifactId>kemitix-checkstyle-ruleset-builder</artifactId>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
     <packaging>jar</packaging>
 
     <name>Kemitix Checkstyle Ruleset Builder</name>
@@ -41,7 +41,7 @@
         <lombok.version>1.16.12</lombok.version>
         <assertj.version>3.6.2</assertj.version>
         <mapstream.version>2.3.5</mapstream.version>
-        <mapbuilder.version>1.0.0</mapbuilder.version>
+        <map-builder.version>1.0.0</map-builder.version>
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
     </properties>
 
@@ -90,17 +90,12 @@
         <dependency>
             <groupId>me.andrz</groupId>
             <artifactId>map-builder</artifactId>
-            <version>${mapbuilder.version}</version>
+            <version>${map-builder.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>net.kemitix</groupId>
-                <artifactId>kemitix-checkstyle-ruleset-maven-plugin</artifactId>
-                <version>${project.version}</version>
-            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

plugin-sample/pom.xml

@@ -8,7 +8,7 @@
     <!-- don't use parent to avoid using grandparent's checkstyle configuration -->
     <groupId>net.kemitix</groupId>
     <artifactId>kemitix-checkstyle-ruleset-plugin-sample</artifactId>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
 
     <name>Kemitix Checkstyle Ruleset Plugin Sample</name>
     <description>Sample usage of the Kemitix Checkstyle Ruleset Plugin</description>

plugin/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.kemitix</groupId>
         <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3</version>
     </parent>
 
     <artifactId>kemitix-checkstyle-ruleset-maven-plugin</artifactId>
@@ -30,11 +30,6 @@
         <mojo-executor.version>2.2.0</mojo-executor.version>
         <lombok.version>1.16.12</lombok.version>
         <map-builder.version>1.0.0</map-builder.version>
-
-        <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
-        <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
-        <checkstyle.version>7.5.1</checkstyle.version>
-        <sevntu.version>1.23.0</sevntu.version>
     </properties>
 
     <dependencies>

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")
         );

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.kemitix</groupId>
     <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
     <packaging>pom</packaging>
 
     <name>Kemitix Checkstyle Ruleset (Parent)</name>
@@ -19,6 +19,10 @@
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
+
+        <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
+        <checkstyle.version>7.5.1</checkstyle.version>
+        <sevntu.version>1.23.0</sevntu.version>
     </properties>
 
     <modules>

ruleset/pom.xml

@@ -7,11 +7,11 @@
     <parent>
         <groupId>net.kemitix</groupId>
         <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3</version>
     </parent>
 
     <artifactId>kemitix-checkstyle-ruleset</artifactId>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
     <packaging>jar</packaging>
 
     <name>Kemitix Checkstyle Ruleset</name>