From ebba0760c476fe7976bedbf867305fdd5b28860b Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Mon, 25 Jan 2016 12:11:21 +0000
Subject: [PATCH 1/3] pom.xml: switch parent to kemitix-parent

Need to specify versions for junit and mockito-core ourselves now.
---
 pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2676c00..e5c43e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,8 +30,8 @@
 
     <parent>
         <groupId>net.kemitix</groupId>
-        <artifactId>kemitix-spring-parent</artifactId>
-        <version>1.2.1</version>
+        <artifactId>kemitix-parent</artifactId>
+        <version>0.6.1</version>
     </parent>
 
     <dependencies>
@@ -48,13 +48,14 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <version>1.10.19</version>
             <scope>test</scope>
-            <type>jar</type>
         </dependency>
     </dependencies>
 

From 911c0dd3b348cc6a9f8d945f05d4193fd53aa93d Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Mon, 25 Jan 2016 12:11:42 +0000
Subject: [PATCH 2/3] WiserAssertionsTest: fix line wrapping

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
---
 .../java/net/kemitix/wiser/assertions/WiserAssertionsTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/net/kemitix/wiser/assertions/WiserAssertionsTest.java b/src/test/java/net/kemitix/wiser/assertions/WiserAssertionsTest.java
index 891f608..ce9e22c 100644
--- a/src/test/java/net/kemitix/wiser/assertions/WiserAssertionsTest.java
+++ b/src/test/java/net/kemitix/wiser/assertions/WiserAssertionsTest.java
@@ -209,7 +209,8 @@ public class WiserAssertionsTest {
         //given
         final String fragment = "foo";
         //when
-        sendMimeMultipartMessage("from", "to", "subject " + fragment + " tail", "body");
+        sendMimeMultipartMessage(
+                "from", "to", "subject " + fragment + " tail", "body");
         //then
         getAssertions().withSubjectContains(fragment);
     }

From 8aa0f2c1c554f9a7bbd2cb4a53071a5803fb6e90 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Mon, 25 Jan 2016 12:16:57 +0000
Subject: [PATCH 3/3] checkstyle.xml: updated to be slightly less strict

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
---
 checkstyle.xml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index 9706c65..ba1e682 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -78,15 +78,19 @@
 
     <module name="TreeWalker">
 
-		<!-- Support @SuppressWarnings annotation -->
-		<!-- See http://checkstyle.sourceforge.net/config.html -->
-		<module name="SuppressWarningsHolder"/>
+        <!-- Support @SuppressWarnings annotation -->
+        <!-- See http://checkstyle.sourceforge.net/config.html -->
+        <module name="SuppressWarningsHolder"/>
+
+        <module name="FileContentsHolder"/>
 
         <!-- Checks for Javadoc comments.                     -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <module name="JavadocMethod"/>
+        <module name="JavadocMethod">
+            <property name="scope" value="public"/>
+        </module>
         <module name="JavadocType"/>
-        <module name="JavadocVariable"/>
+        <!--<module name="JavadocVariable"/>-->
         <module name="JavadocStyle"/>
 
 
@@ -113,12 +117,7 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <!-- Allow for long imports for Spring Batch     -->
-            <!-- EnableBatchProcessing, JobBuilderFactory   -->
-            <!-- and StepBuilderFactory                     -->
-            <property name="ignorePattern" value="^import"/>
-        </module>
+        <module name="LineLength"/>
         <module name="MethodLength"/>
         <module name="ParameterNumber"/>
 
@@ -157,7 +156,11 @@
         <module name="AvoidInlineConditionals"/>
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
-        <module name="HiddenField"/>
+        <module name="HiddenField">
+            <property name="ignoreConstructorParameter" value="true"/>
+            <property name="ignoreSetter" value="true"/>
+            <property name="setterCanReturnItsClass" value="true"/>
+        </module>
         <module name="IllegalInstantiation"/>
         <module name="InnerAssignment"/>
         <module name="MagicNumber"/>
@@ -183,6 +186,7 @@
 
     </module>
 
-	<module name="SuppressWarningsFilter"/>
+    <module name="SuppressWarningsFilter"/>
+    <module name="SuppressionCommentFilter"/>
 
 </module>