From 6ffb40e1fda3b439bcb78cfdb1cad359daaf8762 Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Sun, 12 Jun 2016 18:10:45 +0100
Subject: [PATCH] Update plugins; fix logging of uploaded file name

---
 pom.xml                                       | 20 +++----------------
 .../com/google/zxing/web/DecodeServlet.java   |  3 ++-
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index de67ae979..766566f5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.3</version>
+          <version>2.10.4</version>
           <configuration>
             <javadocVersion>${java.version}</javadocVersion>
           </configuration>
@@ -242,7 +242,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.0.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -469,7 +469,7 @@
         <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
-          <version>0.11</version>
+          <version>0.12</version>
           <configuration>
             <excludes>
               <exclude>**/.*</exclude>
@@ -503,20 +503,6 @@
               </goals>
             </execution>
           </executions>
-          <!-- workaround for Xerces warnings -->
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-core</artifactId>
-              <version>1.6</version>
-              <exclusions>
-                <exclusion>
-                  <groupId>xerces</groupId>
-                  <artifactId>xercesImpl</artifactId>
-                </exclusion>
-              </exclusions>
-            </dependency>
-          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
diff --git a/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java
index 20364e64f..7c7a1fd76 100644
--- a/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java
@@ -279,7 +279,8 @@ public final class DecodeServlet extends HttpServlet {
       log.info("File upload was not multipart");
       errorResponse(request, response, "badimage");
     } else {
-      log.info("Decoding uploaded file " + fileUploadPart);
+      log.info("Decoding uploaded file " + fileUploadPart.getName() + " " +
+               fileUploadPart.getSubmittedFileName());
       try (InputStream is = fileUploadPart.getInputStream()) {
         processStream(is, request, response);
       }