From f3f73b47d377aae30ef068ab2433cc8d1bb216fc Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Thu, 17 Feb 2022 14:10:00 -0600
Subject: [PATCH] Update to 3.5.0-SNAPSHOT for next release; deps updates

---
 android-core/pom.xml        |  4 +--
 android-integration/pom.xml |  4 +--
 android/pom.xml             |  2 +-
 core/pom.xml                |  6 ++---
 javase/pom.xml              |  6 ++---
 pom.xml                     | 54 +++++++++----------------------------
 zxing.appspot.com/pom.xml   |  4 +--
 zxingorg/pom.xml            |  6 ++---
 8 files changed, 29 insertions(+), 57 deletions(-)

diff --git a/android-core/pom.xml b/android-core/pom.xml
index 03ca57b6b..ad3351955 100644
--- a/android-core/pom.xml
+++ b/android-core/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>android-core</artifactId>
-  <version>3.4.2-SNAPSHOT</version>
+  <version>3.5.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -43,7 +43,7 @@
   <parent>
     <groupId>com.google.zxing</groupId>
     <artifactId>zxing-parent</artifactId>
-    <version>3.4.2-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <name>ZXing Android Core</name>
diff --git a/android-integration/pom.xml b/android-integration/pom.xml
index 285c06daf..86c789f32 100644
--- a/android-integration/pom.xml
+++ b/android-integration/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>android-integration</artifactId>
-  <version>3.4.2-SNAPSHOT</version>
+  <version>3.5.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -43,7 +43,7 @@
   <parent>
     <groupId>com.google.zxing</groupId>
     <artifactId>zxing-parent</artifactId>
-    <version>3.4.2-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <name>ZXing Android Integration lib</name>
diff --git a/android/pom.xml b/android/pom.xml
index 9fe31c097..51b709055 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -40,7 +40,7 @@
   <parent>
     <groupId>com.google.zxing</groupId>
     <artifactId>zxing-parent</artifactId>
-    <version>3.4.2-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/core/pom.xml b/core/pom.xml
index 29c1b91a1..b96e1fe1d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>core</artifactId>
-  <version>3.4.2-SNAPSHOT</version>
+  <version>3.5.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -32,7 +32,7 @@
   <parent>
     <groupId>com.google.zxing</groupId>
     <artifactId>zxing-parent</artifactId>
-    <version>3.4.2-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <name>ZXing Core</name>
@@ -63,7 +63,7 @@
       <plugin>
         <groupId>biz.aQute.bnd</groupId>
         <artifactId>bnd-maven-plugin</artifactId>
-        <version>6.0.0</version>
+        <version>6.1.0</version>
         <executions>
           <execution>
             <goals>
diff --git a/javase/pom.xml b/javase/pom.xml
index 14126cadf..0efecada4 100644
--- a/javase/pom.xml
+++ b/javase/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>javase</artifactId>
-  <version>3.4.2-SNAPSHOT</version>
+  <version>3.5.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.beust</groupId>
       <artifactId>jcommander</artifactId>
-      <version>1.81</version>
+      <version>1.82</version>
     </dependency>
     <dependency>
       <groupId>com.github.jai-imageio</groupId>
@@ -47,7 +47,7 @@
   <parent>
     <groupId>com.google.zxing</groupId>
     <artifactId>zxing-parent</artifactId>
-    <version>3.4.2-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/pom.xml b/pom.xml
index 42773a95e..3b7334d91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 
   <groupId>com.google.zxing</groupId>
   <artifactId>zxing-parent</artifactId>
-  <version>3.4.2-SNAPSHOT</version>
+  <version>3.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <dependencyManagement>
@@ -66,10 +66,9 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>1.8</java.version>
     <android.home>${env.ANDROID_HOME}</android.home>
-    <proguard.version>7.1.1</proguard.version>
-    <proguard.plugin.version>2.4.0</proguard.plugin.version>
+    <proguard.plugin.version>2.5.3</proguard.plugin.version>
     <!-- This can't reference project.version as some subprojects version differently -->
-    <zxing.version>3.4.2-SNAPSHOT</zxing.version>
+    <zxing.version>3.5.0-SNAPSHOT</zxing.version>
     <android.platform>22</android.platform>
   </properties>
 
@@ -140,7 +139,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.10.0</version>
           <configuration>
             <source>${java.version}</source>
             <target>${java.version}</target>
@@ -166,7 +165,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.3.1</version>
+          <version>3.3.2</version>
           <configuration>
             <source>${java.version}</source>
             <quiet>true</quiet>
@@ -215,7 +214,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.2.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -252,7 +251,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>3.0.0-M4</version>
+          <version>3.0.0-M5</version>
           <configuration>
             <mavenExecutorId>forked-path</mavenExecutorId>
             <tagNameFormat>zxing-@{project.version}</tagNameFormat>
@@ -263,12 +262,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-plugin</artifactId>
-          <version>1.12.0</version>
+          <version>1.12.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.0.0-M1</version>
+          <version>3.0.0-M2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -278,7 +277,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.1.2</version>
+          <version>3.2.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -355,18 +354,6 @@
             <nativeLibrariesDirectory>libs</nativeLibrariesDirectory>
             <disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
           </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>com.guardsquare</groupId>
-              <artifactId>proguard-base</artifactId>
-              <version>${proguard.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>com.guardsquare</groupId>
-              <artifactId>proguard-core</artifactId>
-              <version>${proguard.version}</version>
-            </dependency>
-          </dependencies>
         </plugin>
         <plugin>
           <groupId>com.github.wvengen</groupId>
@@ -381,7 +368,6 @@
             </execution>
           </executions>
           <configuration>
-            <proguardVersion>${proguard.version}</proguardVersion>
             <addMavenDescriptor>true</addMavenDescriptor>
             <obfuscate>false</obfuscate>
             <options>
@@ -395,31 +381,17 @@
               <lib>${java.home}/lib/rt.jar</lib>
             </libs>
           </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>com.guardsquare</groupId>
-              <artifactId>proguard-base</artifactId>
-              <version>${proguard.version}</version>
-              <scope>runtime</scope>
-            </dependency>
-            <dependency>
-              <groupId>com.guardsquare</groupId>
-              <artifactId>proguard-core</artifactId>
-              <version>${proguard.version}</version>
-              <scope>runtime</scope>
-            </dependency>
-          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.9.1</version>
+          <version>3.11.0</version>
           <inherited>false</inherited>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -442,7 +414,7 @@
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>9.0.1</version>
+              <version>9.3</version>
             </dependency>
           </dependencies>
         </plugin>
diff --git a/zxing.appspot.com/pom.xml b/zxing.appspot.com/pom.xml
index dc5c1910a..79211c7e2 100644
--- a/zxing.appspot.com/pom.xml
+++ b/zxing.appspot.com/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>zxing.appspot.com</artifactId>
-  <version>3.4.2-SNAPSHOT</version>
+  <version>3.5.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
   <dependencies>
@@ -33,7 +33,7 @@
   <parent>
     <groupId>com.google.zxing</groupId>
     <artifactId>zxing-parent</artifactId>
-    <version>3.4.2-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/zxingorg/pom.xml b/zxingorg/pom.xml
index 3f7aaaaa9..6245d178e 100644
--- a/zxingorg/pom.xml
+++ b/zxingorg/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>zxingorg</artifactId>
-  <version>3.4.2-SNAPSHOT</version>
+  <version>3.5.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
   <dependencies>
@@ -69,11 +69,11 @@
   <parent>
     <groupId>com.google.zxing</groupId>
     <artifactId>zxing-parent</artifactId>
-    <version>3.4.2-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <properties>
-    <spring.version>5.3.10</spring.version>
+    <spring.version>5.3.16</spring.version>
   </properties>
 
   <build>