From e636f9b7fcfe5f61693023eaa952c38e89fcf2fa Mon Sep 17 00:00:00 2001
From: Tom Anderson <twic@urchin.earth.li>
Date: Sun, 30 Oct 2016 23:04:53 +0000
Subject: [PATCH 1/2] Add Checkstyle to report on and enforce conformance to
 the Google style guide (#1350)

---
 pom.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pom.xml b/pom.xml
index 38d502d049e1..a3147bdafb39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@
         <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
         <arguments />
         <gpg.keyname>67893CC4</gpg.keyname>
+        <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
     </properties>
 
     <dependencies>
@@ -379,6 +380,22 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.7</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.17</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <violationSeverity>error</violationSeverity> <!-- change to 'warning' to enforce strictly -->
+                    <violationIgnore>indentation</violationIgnore>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -452,6 +469,11 @@
                     </reportSet>
                 </reportSets>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.17</version>
+            </plugin>
         </plugins>
     </reporting>
 

From 846d9a39e30fcd291e897e9d2e07b5e33b9a2149 Mon Sep 17 00:00:00 2001
From: Tom Anderson <twic@urchin.earth.li>
Date: Sun, 30 Oct 2016 23:36:21 +0000
Subject: [PATCH 2/2] Add the Google Formatter plugin, as a discretionary step
 (#1350)

---
 pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pom.xml b/pom.xml
index a3147bdafb39..965a9471be80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -396,6 +396,15 @@
                     <violationIgnore>indentation</violationIgnore>
                 </configuration>
             </plugin>
+            <plugin>
+                <!--
+                To apply: mvn googleformatter:format
+                To repair indentation (BSD/Mac sed): git status -s | sed -En 's/^ M (src.*\.java)$/\1/p' | xargs sed -Ei '' 's/^( *)/\1\1/'
+                -->
+                <groupId>com.theoryinpractise</groupId>
+                <artifactId>googleformatter-maven-plugin</artifactId>
+                <version>1.0.6</version>
+            </plugin>
         </plugins>
     </build>