From c7cb59044a16fbf80dcc09f95292c51db6f0fd3e Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Wed, 30 Sep 2020 09:10:00 -0500
Subject: [PATCH] Fix android checkstyle

---
 android-core/pom.xml        | 14 ++++++++++++++
 android-integration/pom.xml | 14 ++++++++++++++
 android/pom.xml             |  9 +++++++++
 pom.xml                     |  2 --
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/android-core/pom.xml b/android-core/pom.xml
index c77b55e4b..878619d7c 100644
--- a/android-core/pom.xml
+++ b/android-core/pom.xml
@@ -28,6 +28,20 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <configuration>
+            <configLocation>../src/checkstyle/checkstyle.xml</configLocation>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
   <parent>
     <groupId>com.google.zxing</groupId>
     <artifactId>zxing-parent</artifactId>
diff --git a/android-integration/pom.xml b/android-integration/pom.xml
index b6d19288a..cc942dd56 100644
--- a/android-integration/pom.xml
+++ b/android-integration/pom.xml
@@ -28,6 +28,20 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <configuration>
+            <configLocation>../src/checkstyle/checkstyle.xml</configLocation>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
   <parent>
     <groupId>com.google.zxing</groupId>
     <artifactId>zxing-parent</artifactId>
diff --git a/android/pom.xml b/android/pom.xml
index 0e49be55c..e9522a4b4 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -64,6 +64,15 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <configLocation>../src/checkstyle/checkstyle.xml</configLocation>
+          <!-- Android generated files -->
+          <excludes>**/R.java,**/BuildConfig.java,**/Manifest.java</excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index 314f049fb..ef35ad5e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -428,8 +428,6 @@
           <version>3.1.1</version>
           <configuration>
             <configLocation>src/checkstyle/checkstyle.xml</configLocation>
-            <!-- Android generated files -->
-            <excludes>**/R.java,**/BuildConfig.java,**/Manifest.java</excludes>
             <includeTestSourceDirectory>true</includeTestSourceDirectory>
           </configuration>
           <executions>