From 274159117ac631ef8d48913f22ec48b0bb8d7543 Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Fri, 23 Mar 2018 11:05:23 -0500
Subject: [PATCH] Plugin updates, including ones that enable Java 10 build
 compatibility

---
 pom.xml          | 14 +++++++++++---
 zxingorg/pom.xml |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4f139d129..e54ac74f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>1.7</java.version>
-    <proguard.version>5.3.3</proguard.version>
+    <proguard.version>6.0.1</proguard.version>
     <proguard.plugin.version>2.0.14</proguard.plugin.version>
     <slf4j.version>1.7.25</slf4j.version>
     <!-- This can't reference project.version as some subprojects version differently -->
@@ -193,6 +193,14 @@
               </goals>
             </execution>
           </executions>
+          <dependencies>
+            <!-- For Java 10 compatibility until javadoc-plugin updates this after 3.0.0 -->
+            <dependency>
+              <groupId>org.apache.commons</groupId>
+              <artifactId>commons-lang3</artifactId>
+              <version>3.7</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -320,7 +328,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.20.1</version>
+          <version>2.21.0</version>
           <configuration>
             <forkCount>0.5C</forkCount>
             <systemPropertyVariables>
@@ -517,7 +525,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.0</version>
+          <version>0.8.1</version>
           <executions>
             <execution>
               <goals>
diff --git a/zxingorg/pom.xml b/zxingorg/pom.xml
index 57944b682..8b6a70e46 100644
--- a/zxingorg/pom.xml
+++ b/zxingorg/pom.xml
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>23.6-android</version>
+      <version>24.1-android</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>