From 1f4aaad628576d32ec281edc0e64f4b5e18c2b92 Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Thu, 25 Oct 2018 07:43:26 -0500
Subject: [PATCH] Minor dependency and inspection changes

---
 .travis.yml                                   |  8 ++--
 .../decoder/DecodedBitStreamParser.java       |  1 +
 pom.xml                                       | 40 ++++++++++++-------
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e75c5c451..17111cde0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: java
 sudo: false
-install: mvn -Ptravis -DskipTests=true -B -V install
+install: mvn -Ptravis -DskipTests=true -nsu -B install
 script:
-  - mvn -Ptravis ${JACOCO} test
+  - mvn -Ptravis ${JACOCO} -nsu -B test
   - find $HOME/.m2/repository/com/google/zxing -path "*SNAPSHOT/*" -delete
   - find $HOME/.m2/repository/com/google/zxing -name "*SNAPSHOT" -type d -delete
 matrix:
@@ -10,8 +10,8 @@ matrix:
    # Covers Java 7, Open JDK, and code coverage
    - jdk: openjdk7
      env: JACOCO=-Pjacoco
-   # Covers Java 8, Oracle JDK, Android apps
-   - jdk: oraclejdk8
+   # Covers Java 8, Android apps
+   - jdk: openjdk8
      env: ANDROID_HOME=$HOME/android-sdk-linux
      before_install: if [ ! -d $HOME/android-sdk-linux/platforms ]; then curl -s https://storage.googleapis.com/zxing-build/android-sdk-linux.tar.bz2 | bunzip2 | tar xf - -C $HOME; else ls -l $HOME/android-sdk-linux; fi
    # Covers Java 9
diff --git a/core/src/main/java/com/google/zxing/pdf417/decoder/DecodedBitStreamParser.java b/core/src/main/java/com/google/zxing/pdf417/decoder/DecodedBitStreamParser.java
index d4dc585b3..c0511d590 100644
--- a/core/src/main/java/com/google/zxing/pdf417/decoder/DecodedBitStreamParser.java
+++ b/core/src/main/java/com/google/zxing/pdf417/decoder/DecodedBitStreamParser.java
@@ -164,6 +164,7 @@ final class DecodedBitStreamParser {
     return decoderResult;
   }
 
+  @SuppressWarnings("deprecation")
   static int decodeMacroBlock(int[] codewords, int codeIndex, PDF417ResultMetadata resultMetadata)
       throws FormatException {
     if (codeIndex + NUMBER_OF_SEQUENCE_CODEWORDS > codewords[0]) {
diff --git a/pom.xml b/pom.xml
index b4e4005a2..1183a57ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,15 +127,13 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <!-- 3.0.0-M2 has a regression re: plugin versions -->
-          <version>3.0.0-M1</version>
+          <version>3.0.0-M2</version>
           <executions>
             <execution>
               <id>enforce</id>
               <configuration>
                 <rules>
                   <requireModuleConvergence />
-                  <requirePluginVersions />
                   <requireUpperBoundDeps />
                   <dependencyConvergence />
                   <requireMavenVersion>
@@ -197,14 +195,6 @@
               </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.8</version>
-            </dependency>
-          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -227,7 +217,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>3.0.0-M1</version>
           <configuration>
             <createChecksum>true</createChecksum>
           </configuration>
@@ -300,7 +290,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version>
+          <version>3.0.0-M1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -332,7 +322,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.0</version>
+          <version>2.22.1</version>
           <configuration>
             <forkCount>0.5C</forkCount>
             <systemPropertyVariables>
@@ -470,7 +460,7 @@
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>8.12</version>
+              <version>8.14</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -847,6 +837,26 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>javadoc-9</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <configuration combine.children="append">
+                <!-- Choose HTML5 output over deprecated HTML 4.01 -->
+                <additionalOptions>-html5</additionalOptions>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
   </profiles>
 
 </project>