From f1f90313fc22c122a28716e7ecac1543e6fa253e Mon Sep 17 00:00:00 2001
From: Marcono1234 <Marcono1234@users.noreply.github.com>
Date: Sat, 18 Sep 2021 02:19:50 +0200
Subject: [PATCH] Improve Maven build (#1964)

- Specify missing plugin versions
- Fix or suppress ProGuard notes and warnings
---
 gson/pom.xml                                  | 31 ++++++++++++-------
 .../test/resources/testcases-proguard.conf    |  5 ++-
 pom.xml                                       |  1 +
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/gson/pom.xml b/gson/pom.xml
index dcdbe84637..856908ae7c 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -10,27 +10,25 @@
   <artifactId>gson</artifactId>
   <name>Gson</name>
 
+  <properties>
+    <proguardVersion>7.1.1</proguardVersion>
+  </properties>
+
   <licenses>
     <license>
       <name>Apache-2.0</name>
       <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
     </license>
   </licenses>
-  
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.github.wvengen</groupId>
-      <artifactId>proguard-maven-plugin</artifactId>
-      <version>2.4.0</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
- 
+
   <build>
     <plugins>
       <plugin>
@@ -111,14 +109,17 @@
       <plugin>
         <groupId>com.github.wvengen</groupId>
         <artifactId>proguard-maven-plugin</artifactId>
+        <version>2.4.0</version>
         <executions>
           <execution>
             <phase>process-test-classes</phase>
-            <goals><goal>proguard</goal></goals>
+            <goals>
+              <goal>proguard</goal>
+            </goals>
           </execution>
         </executions>
         <configuration>
-          <proguardVersion>6.2.2</proguardVersion>
+          <proguardVersion>${proguardVersion}</proguardVersion>
           <obfuscate>true</obfuscate>
           <injar>test-classes-obfuscated-injar</injar>
           <outjar>test-classes-obfuscated-outjar</outjar>
@@ -131,9 +132,15 @@
         </configuration>
         <dependencies>
           <dependency>
-            <groupId>net.sf.proguard</groupId>
+            <groupId>com.guardsquare</groupId>
+            <artifactId>proguard-core</artifactId>
+            <version>${proguardVersion}</version>
+            <scope>runtime</scope>
+          </dependency>
+          <dependency>
+            <groupId>com.guardsquare</groupId>
             <artifactId>proguard-base</artifactId>
-            <version>6.2.2</version>
+            <version>${proguardVersion}</version>
             <scope>runtime</scope>
           </dependency>
         </dependencies>
diff --git a/gson/src/test/resources/testcases-proguard.conf b/gson/src/test/resources/testcases-proguard.conf
index d42da0abef..19def61b00 100644
--- a/gson/src/test/resources/testcases-proguard.conf
+++ b/gson/src/test/resources/testcases-proguard.conf
@@ -3,6 +3,8 @@
 -optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
 -optimizationpasses 5
 -allowaccessmodification
+# On Windows mixed case class names might cause problems
+-dontusemixedcaseclassnames
 -keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
 -keepclassmembers enum * {
   public static **[] values();
@@ -17,4 +19,5 @@
 
 -dontwarn com.google.gson.functional.EnumWithObfuscatedTest
 -dontwarn junit.framework.TestCase
-
+# Ignore notes about duplicate JDK classes
+-dontnote module-info,jdk.internal.**
diff --git a/pom.xml b/pom.xml
index f36f0b0574..19a6569823 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>