From 309ace6c76a7c93adcab64e9042d54756a4da542 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 6 Jan 2018 19:45:18 +0000
Subject: [PATCH 1/8] Specify lombok version in parent pom

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

diff --git a/builder/pom.xml b/builder/pom.xml
index 9bf41e3..14958c7 100644
--- a/builder/pom.xml
+++ b/builder/pom.xml
@@ -3,9 +3,6 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <lombok.version>1.16.18</lombok.version>
-    </properties>
 
     <parent>
         <groupId>net.kemitix</groupId>
@@ -38,7 +35,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 73c88e1..f0f0723 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
 
         <spring-platform.version>Brussels-SR3</spring-platform.version>
         <spring-boot.version>1.5.4.RELEASE</spring-boot.version>
+        <lombok.version>1.16.18</lombok.version>
         <mapstream.version>2.3.5</mapstream.version>
         <map-builder.version>1.0.0</map-builder.version>
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
@@ -88,6 +89,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.speedment.common</groupId>
                 <artifactId>mapstream</artifactId>

From 0399d8c0f36077d04d2f8bd13dc068f13aa41412 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 6 Jan 2018 19:45:32 +0000
Subject: [PATCH 2/8] Upgrade kemitix-tiles to 0.2.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f0f0723..f2d68f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
-        <kemitix-tiles.version>0.1.1</kemitix-tiles.version>
+        <kemitix-tiles.version>0.2.0</kemitix-tiles.version>
         <java.version>1.8</java.version>
 
         <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>

From 023717a29379ec069c3991f939c2d3338d537484 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 6 Jan 2018 19:45:53 +0000
Subject: [PATCH 3/8] Upgrade checkstyle to 8.7

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f2d68f3..dda6be8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,8 @@
         <java.version>1.8</java.version>
 
         <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
-        <checkstyle.version>8.0</checkstyle.version>
         <sevntu.version>1.24.1</sevntu.version>
+        <checkstyle.version>8.7</checkstyle.version>
 
         <spring-platform.version>Brussels-SR3</spring-platform.version>
         <spring-boot.version>1.5.4.RELEASE</spring-boot.version>

From 51f6025271b67869f0879765b7dfdc7f30373af3 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 6 Jan 2018 19:46:12 +0000
Subject: [PATCH 4/8] Upgrade sevntu to 1.26.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dda6be8..331233a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,8 @@
         <java.version>1.8</java.version>
 
         <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
-        <sevntu.version>1.24.1</sevntu.version>
         <checkstyle.version>8.7</checkstyle.version>
+        <sevntu.version>1.26.0</sevntu.version>
 
         <spring-platform.version>Brussels-SR3</spring-platform.version>
         <spring-boot.version>1.5.4.RELEASE</spring-boot.version>

From 2fb22ec10b1a2c52d0e0c0891464a4befbb1a4aa Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 6 Jan 2018 19:46:27 +0000
Subject: [PATCH 5/8] Upgrade Spring Platform to Burssels-SR6 (Spring Boot
 1.5.9)

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

diff --git a/pom.xml b/pom.xml
index 331233a..1b291e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,9 @@
         <checkstyle.version>8.7</checkstyle.version>
         <sevntu.version>1.26.0</sevntu.version>
 
-        <spring-platform.version>Brussels-SR3</spring-platform.version>
-        <spring-boot.version>1.5.4.RELEASE</spring-boot.version>
         <lombok.version>1.16.18</lombok.version>
+        <spring-platform.version>Brussels-SR6</spring-platform.version>
+        <spring-boot.version>1.5.9.RELEASE</spring-boot.version>
         <mapstream.version>2.3.5</mapstream.version>
         <map-builder.version>1.0.0</map-builder.version>
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>

From 9326227a29562f5f583fd7521e9ca65309ddd5a7 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 6 Jan 2018 19:46:55 +0000
Subject: [PATCH 6/8] Upgrade mockito to 2.13.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1b291e4..a4f4a9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,8 @@
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
         <immutables-value.version>2.5.6</immutables-value.version>
 
-        <mockito.version>2.8.47</mockito.version>
         <assertj.version>3.8.0</assertj.version>
+        <mockito.version>2.13.0</mockito.version>
     </properties>
 
     <modules>

From 1c714e4b53680c0edc33d0bb4f961494d387eec5 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 6 Jan 2018 19:47:07 +0000
Subject: [PATCH 7/8] Upgrade assertj to 3.9.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a4f4a9b..264263b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,8 @@
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
         <immutables-value.version>2.5.6</immutables-value.version>
 
-        <assertj.version>3.8.0</assertj.version>
         <mockito.version>2.13.0</mockito.version>
+        <assertj.version>3.9.0</assertj.version>
     </properties>
 
     <modules>

From e8452d8c19e1318a038ee47351d899903752f3ce Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 7 Jan 2018 19:29:36 +0000
Subject: [PATCH 8/8] Make modules independant of root pom

* Revert kemitix-maven-tiles to 0.1.1 until release
* Move pom details from root to ruleset pom
---
 builder/pom.xml     |  84 ++++++++++++++++++++++-----------
 pom.xml             | 111 +-------------------------------------------
 regressions/pom.xml |  15 ++++--
 ruleset/pom.xml     |  39 ++++++++++++++--
 4 files changed, 103 insertions(+), 146 deletions(-)

diff --git a/builder/pom.xml b/builder/pom.xml
index 14958c7..25caf35 100644
--- a/builder/pom.xml
+++ b/builder/pom.xml
@@ -6,36 +6,59 @@
 
     <parent>
         <groupId>net.kemitix</groupId>
-        <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <artifactId>kemitix-parent</artifactId>
+        <version>5.0.3</version>
+        <relativePath/>
     </parent>
 
-    <artifactId>kemitix-checkstyle-ruleset-builder</artifactId>
+    <groupId>net.kemitix.checkstyle</groupId>
+    <artifactId>ruleset-builder</artifactId>
     <packaging>jar</packaging>
+    <version>3.4.0-SNAPSHOT</version>
 
-    <name>Kemitix Checkstyle :: Ruleset :: Builder</name>
-    <description>Builder for the Kemitix Checkstyle Ruleset</description>
+    <properties>
+        <java.version>1.8</java.version>
+        <tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
+        <kemitix-tiles.version>0.1.1</kemitix-tiles.version>
 
-    <issueManagement>
-        <url>https://github.com/kemitix/kemitix-checkstyle-ruleset/issues</url>
-        <system>GitHub Issues</system>
-    </issueManagement>
+        <checkstyle.version>8.7</checkstyle.version>
+        <sevntu.version>1.26.0</sevntu.version>
+        <lombok.version>1.16.18</lombok.version>
+        <spring-platform.version>Brussels-SR6</spring-platform.version>
+        <spring-boot.version>1.5.9.RELEASE</spring-boot.version>
+        <mapstream.version>2.3.5</mapstream.version>
+        <map-builder.version>1.0.0</map-builder.version>
+        <mockito.version>2.13.0</mockito.version>
+        <assertj.version>3.9.0</assertj.version>
+    </properties>
 
-    <scm>
-        <url>https://github.com/kemitix/kemitix-checkstyle-ruleset</url>
-        <connection>scm:git:git://github.com/kemitix/kemitix-checkstyle-ruleset.git</connection>
-        <developerConnection>scm:git:git@github.com:kemitix/kemitix-checkstyle-ruleset.git</developerConnection>
-    </scm>
-
-    <url>https://github.com/kemitix/kemitix-checkstyle-ruleset</url>
-
-    <inceptionYear>2016</inceptionYear>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.spring.platform</groupId>
+                <artifactId>platform-bom</artifactId>
+                <version>${spring-platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>provided</scope>
+            <version>${lombok.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -59,6 +82,7 @@
         <dependency>
             <groupId>com.speedment.common</groupId>
             <artifactId>mapstream</artifactId>
+            <version>${mapstream.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -68,16 +92,19 @@
         <dependency>
             <groupId>me.andrz</groupId>
             <artifactId>map-builder</artifactId>
+            <version>${map-builder.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
+            <version>${checkstyle.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.sevntu-checkstyle</groupId>
             <artifactId>sevntu-checks</artifactId>
+            <version>${sevntu.version}</version>
         </dependency>
     </dependencies>
 
@@ -90,7 +117,15 @@
                 <extensions>true</extensions>
                 <configuration>
                     <tiles>
-                        <tile>net.kemitix.tiles:all-tiles:${kemitix-tiles.version}</tile>
+                        <tile>net.kemitix.tiles:maven-plugins-tile:${kemitix-tiles.version}</tile>
+                        <tile>net.kemitix.tiles:enforcer-tile:${kemitix-tiles.version}</tile>
+                        <tile>net.kemitix.tiles:compiler-tile:${kemitix-tiles.version}</tile>
+                        <!--<tile>net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version}</tile>-->
+                        <tile>net.kemitix.tiles:huntbugs-tile:${kemitix-tiles.version}</tile>
+                        <tile>net.kemitix.tiles:pmd-tile:${kemitix-tiles.version}</tile>
+                        <tile>net.kemitix.tiles:testing-tile:${kemitix-tiles.version}</tile>
+                        <tile>net.kemitix.tiles:coverage-tile:${kemitix-tiles.version}</tile>
+                        <tile>net.kemitix.tiles:pitest-tile:${kemitix-tiles.version}</tile>
                     </tiles>
                 </configuration>
             </plugin>
@@ -104,18 +139,11 @@
                 <executions>
                     <execution>
                         <goals>
-                            <goal>
-                                repackage
-                            </goal>
+                            <goal>repackage</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-                <version>${coveralls-maven-plugin.version}</version>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 264263b..4738877 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,122 +4,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>net.kemitix</groupId>
-    <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
+    <groupId>net.kemitix.checkstyle</groupId>
+    <artifactId>ruleset-root</artifactId>
     <version>3.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>Kemitix Checkstyle :: Ruleset :: Parent</name>
-    <description>Parent POM for the Kemitix Checkstyle Ruleset and it's Builder</description>
-
-    <properties>
-        <tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
-        <kemitix-tiles.version>0.2.0</kemitix-tiles.version>
-        <java.version>1.8</java.version>
-
-        <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
-        <checkstyle.version>8.7</checkstyle.version>
-        <sevntu.version>1.26.0</sevntu.version>
-
-        <lombok.version>1.16.18</lombok.version>
-        <spring-platform.version>Brussels-SR6</spring-platform.version>
-        <spring-boot.version>1.5.9.RELEASE</spring-boot.version>
-        <mapstream.version>2.3.5</mapstream.version>
-        <map-builder.version>1.0.0</map-builder.version>
-        <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
-        <immutables-value.version>2.5.6</immutables-value.version>
-
-        <mockito.version>2.13.0</mockito.version>
-        <assertj.version>3.9.0</assertj.version>
-    </properties>
-
     <modules>
         <module>builder</module>
         <module>ruleset</module>
         <module>regressions</module>
     </modules>
 
-    <issueManagement>
-        <url>https://github.com/kemitix/kemitix-checkstyle-ruleset/issues</url>
-        <system>GitHub Issues</system>
-    </issueManagement>
-
-    <scm>
-        <connection>scm:git:git@github.com:kemitix/kemitix-checkstyle-ruleset.git</connection>
-        <developerConnection>scm:git:git@github.com:kemitix/kemitix-checkstyle-ruleset.git</developerConnection>
-        <url>git@github.com:kemitix/kemitix-checkstyle-ruleset.git</url>
-    </scm>
-
-    <url>https://github.com/kemitix/kemitix-checkstyle-ruleset</url>
-
-    <inceptionYear>2016</inceptionYear>
-
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>https://opensource.org/licenses/MIT</url>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>Paul Campbell</name>
-            <email>pcampbell@kemitix.net</email>
-            <organization>Kemitix</organization>
-            <organizationUrl>https://github.com/kemitix/</organizationUrl>
-        </developer>
-    </developers>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.puppycrawl.tools</groupId>
-                <artifactId>checkstyle</artifactId>
-                <version>${checkstyle.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.sevntu-checkstyle</groupId>
-                <artifactId>sevntu-checks</artifactId>
-                <version>${sevntu.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.spring.platform</groupId>
-                <artifactId>platform-bom</artifactId>
-                <version>${spring-platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>${lombok.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.speedment.common</groupId>
-                <artifactId>mapstream</artifactId>
-                <version>${mapstream.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>${mockito.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.assertj</groupId>
-                <artifactId>assertj-core</artifactId>
-                <version>${assertj.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>me.andrz</groupId>
-                <artifactId>map-builder</artifactId>
-                <version>${map-builder.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.immutables</groupId>
-                <artifactId>value</artifactId>
-                <version>${immutables-value.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
 </project>
diff --git a/regressions/pom.xml b/regressions/pom.xml
index 6af0db7..fd4f078 100644
--- a/regressions/pom.xml
+++ b/regressions/pom.xml
@@ -5,14 +5,19 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>net.kemitix</groupId>
-        <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <artifactId>kemitix-parent</artifactId>
+        <version>5.0.3</version>
+        <relativePath/>
     </parent>
 
-    <artifactId>kemitix-checkstyle-ruleset-regressions</artifactId>
-    <name>Kemitix Checkstyle :: Ruleset :: Regression Tests</name>
+    <groupId>net.kemitix.checkstyle</groupId>
+    <artifactId>ruleset-regressions</artifactId>
+    <version>3.4.0-SNAPSHOT</version>
 
     <properties>
+        <tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
+        <kemitix-tiles.version>0.1.1</kemitix-tiles.version>
+
         <!-- use the disabled ruleset for normal builds. comment out the following line to check that conditions are caught -->
         <ruleset.level>0-disabled</ruleset.level>
         <digraph-dependency.basePackage>net.kemitix.checkstyle.regressions</digraph-dependency.basePackage>
@@ -38,7 +43,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <tiles>
-                        <tile>net.kemitix.tiles:all-tiles:${kemitix-tiles.version}</tile>
+                        <tile>net.kemitix.tiles:checkstyle-tile:${kemitix-tiles.version}</tile>
                     </tiles>
                 </configuration>
             </plugin>
diff --git a/ruleset/pom.xml b/ruleset/pom.xml
index 978c095..aa275de 100644
--- a/ruleset/pom.xml
+++ b/ruleset/pom.xml
@@ -6,15 +6,45 @@
 
     <parent>
         <groupId>net.kemitix</groupId>
-        <artifactId>kemitix-checkstyle-ruleset-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <artifactId>kemitix-parent</artifactId>
+        <version>5.0.3</version>
+        <relativePath/>
     </parent>
 
     <artifactId>kemitix-checkstyle-ruleset</artifactId>
+    <version>3.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>Kemitix Checkstyle :: Ruleset</name>
-    <description>Checkstyle Ruleset for use by packages derived from kemitix-parent</description>
+    <name>Kemitix Checkstyle Ruleset</name>
+    <description>A Checkstyle Ruleset</description>
+    <url>https://github.com/kemitix/kemitix-checkstyle-ruleset</url>
+
+    <properties>
+        <tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
+        <kemitix-tiles.version>0.1.1</kemitix-tiles.version>
+    </properties>
+
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>https://opensource.org/licenses/MIT</url>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Paul Campbell</name>
+            <email>pcampbell@kemitix.net</email>
+            <organization>Kemitix</organization>
+            <organizationUrl>https://github.com/kemitix/</organizationUrl>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:git@github.com:kemitix/kemitix-checkstyle-ruleset.git</connection>
+        <developerConnection>scm:git:git@github.com:kemitix/kemitix-checkstyle-ruleset.git</developerConnection>
+        <url>git@github.com:kemitix/kemitix-checkstyle-ruleset.git</url>
+    </scm>
 
     <build>
         <plugins>
@@ -33,4 +63,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>