From 1cdf43adf4b2471f5824267b18335232d9d301e7 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Thu, 9 Feb 2017 09:30:03 +0000
Subject: [PATCH 1/8] pom.xml: version set to 2.2.0-SNAPSHOT

---
 builder/pom.xml       | 2 +-
 plugin-sample/pom.xml | 2 +-
 plugin/pom.xml        | 2 +-
 pom.xml               | 2 +-
 ruleset/pom.xml       | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/builder/pom.xml b/builder/pom.xml
index fae7ef6..1a07416 100644
--- a/builder/pom.xml
+++ b/builder/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <artifactId>kemitix-checkstyle-ruleset-builder</artifactId>
-    <version>2.1.1</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Kemitix Checkstyle Ruleset Builder</name>
diff --git a/plugin-sample/pom.xml b/plugin-sample/pom.xml
index 20eb3fe..f8785db 100644
--- a/plugin-sample/pom.xml
+++ b/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.1</version>
+    <version>2.2.0-SNAPSHOT</version>
 
     <name>Kemitix Checkstyle Ruleset Plugin Sample</name>
     <description>Sample usage of the Kemitix Checkstyle Ruleset Plugin</description>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 8208852..d3b24d5 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.kemitix</groupId>
         <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kemitix-checkstyle-ruleset-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index ad63965..496da4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.kemitix</groupId>
     <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-    <version>2.1.1</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Kemitix Checkstyle Ruleset (Parent)</name>
diff --git a/ruleset/pom.xml b/ruleset/pom.xml
index 5e42e90..265309e 100644
--- a/ruleset/pom.xml
+++ b/ruleset/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>net.kemitix</groupId>
         <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-        <version>2.1.1</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kemitix-checkstyle-ruleset</artifactId>
-    <version>2.1.1</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Kemitix Checkstyle Ruleset</name>

From 93ac9f74df810f1dd2dccdb4f187bd90f1baa243 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 26 Feb 2017 14:39:10 +0000
Subject: [PATCH 2/8] plugin: pom.xml: add dependency upon parent pom (for
 version properties)

Moved version properties to parent pom (i.e. a pom that isn't itself)
---
 plugin/pom.xml                                               | 5 -----
 .../kemitix/checkstyle/ruleset/plugin/AbstractCheckMojo.java | 2 +-
 pom.xml                                                      | 4 ++++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index d3b24d5..0e23bdf 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -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>
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..a99607d 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
@@ -139,7 +139,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 496da4f..d294662 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>

From c5dfdc7c1c4066a4a05bb82566f14e3493bd5344 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 26 Feb 2017 17:39:57 +0000
Subject: [PATCH 3/8] plugin: AbstractCheckMojo: Only apply checks to code in
 source directory

Prevents attempt to apply checks to generated code.
---
 .../checkstyle/ruleset/plugin/AbstractCheckMojo.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

From 7134a476a23039664e749d480cfa6ce3268a963f Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 26 Feb 2017 17:40:34 +0000
Subject: [PATCH 4/8] builder: pom.xml: kemitix-spring-parent replaced with
 kemitix-parent:2.4.0

---
 builder/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builder/pom.xml b/builder/pom.xml
index 1a07416..72e3a55 100644
--- a/builder/pom.xml
+++ b/builder/pom.xml
@@ -6,8 +6,8 @@
 
     <parent>
         <groupId>net.kemitix</groupId>
-        <artifactId>kemitix-spring-parent</artifactId>
-        <version>2.2.0</version>
+        <artifactId>kemitix-parent</artifactId>
+        <version>2.4.0</version>
         <relativePath/>
     </parent>
 

From eebe90b44b2e7505c018f9493325722ed71ac2a6 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 26 Feb 2017 17:41:24 +0000
Subject: [PATCH 5/8] builder: pom.xml: rename map-builder property for
 consistency

---
 builder/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builder/pom.xml b/builder/pom.xml
index 72e3a55..e980476 100644
--- a/builder/pom.xml
+++ b/builder/pom.xml
@@ -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,7 +90,7 @@
         <dependency>
             <groupId>me.andrz</groupId>
             <artifactId>map-builder</artifactId>
-            <version>${mapbuilder.version}</version>
+            <version>${map-builder.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From 0e2f762cd0230b192840fec1cbbc073f1410a5c9 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 26 Feb 2017 17:42:08 +0000
Subject: [PATCH 6/8] builder: pom.xml: remove dependency on plugin

The checkstyle plugin wouldn't have been installed yet.
---
 builder/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/builder/pom.xml b/builder/pom.xml
index e980476..37dfc68 100644
--- a/builder/pom.xml
+++ b/builder/pom.xml
@@ -96,11 +96,6 @@
     </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>

From dc757d6e3a9a231f34667a19f868cd5f89ca47d1 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 26 Feb 2017 18:32:22 +0000
Subject: [PATCH 7/8] pom.xml: version set to 2.1.3

---
 builder/pom.xml       | 2 +-
 plugin-sample/pom.xml | 2 +-
 plugin/pom.xml        | 2 +-
 pom.xml               | 2 +-
 ruleset/pom.xml       | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/builder/pom.xml b/builder/pom.xml
index 37dfc68..d76d9c6 100644
--- a/builder/pom.xml
+++ b/builder/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <artifactId>kemitix-checkstyle-ruleset-builder</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.1.3</version>
     <packaging>jar</packaging>
 
     <name>Kemitix Checkstyle Ruleset Builder</name>
diff --git a/plugin-sample/pom.xml b/plugin-sample/pom.xml
index f8785db..fe764fb 100644
--- a/plugin-sample/pom.xml
+++ b/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.2.0-SNAPSHOT</version>
+    <version>2.1.3</version>
 
     <name>Kemitix Checkstyle Ruleset Plugin Sample</name>
     <description>Sample usage of the Kemitix Checkstyle Ruleset Plugin</description>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 0e23bdf..a227ab3 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.kemitix</groupId>
         <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.3</version>
     </parent>
 
     <artifactId>kemitix-checkstyle-ruleset-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index d294662..1d75051 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.kemitix</groupId>
     <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.1.3</version>
     <packaging>pom</packaging>
 
     <name>Kemitix Checkstyle Ruleset (Parent)</name>
diff --git a/ruleset/pom.xml b/ruleset/pom.xml
index 265309e..1a9d912 100644
--- a/ruleset/pom.xml
+++ b/ruleset/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>net.kemitix</groupId>
         <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.3</version>
     </parent>
 
     <artifactId>kemitix-checkstyle-ruleset</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.1.3</version>
     <packaging>jar</packaging>
 
     <name>Kemitix Checkstyle Ruleset</name>

From e75a1b924e73c0e31cfa4fc2d5224ef65002a82b Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 26 Feb 2017 18:34:05 +0000
Subject: [PATCH 8/8] CHANGELOG

---
 CHANGELOG | 8 ++++++++
 1 file changed, 8 insertions(+)

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