Fix #4604 "java.lang.ClassCastException: class org.orbeon.private.apa…

…che.http.client.utils.URIUtils$UriFlag not an enum" - also upgraded Proguard
orbeon · Jul 17, 2020 · 6f7903c · 6f7903c
1 parent f8d2a83
commit 6f7903c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/build.xml b/build.xml
@@ -44,8 +44,8 @@
 
     <taskdef resource="proguard/ant/task.properties">
         <classpath>
-            <pathelement location="lib_ant/proguard-6.1.1.jar"/>
-            <pathelement location="lib_ant/proguard-annotations-6.1.1.jar"/>
+            <pathelement location="lib_ant/proguard-6.2.2.jar"/>
+            <pathelement location="lib_ant/proguard-annotations-6.2.2.jar"/>
         </classpath>
     </taskdef>
 
@@ -183,6 +183,22 @@
             -keep public class org.apache.commons.logging.impl.Jdk14Logger {
                 public *;
             }
+            <!-- https://github.com/orbeon/orbeon-forms/issues/4604 -->
+            -keep public enum org.apache.http.client.utils.URIUtils$** {
+                **[] $VALUES;
+                public *;
+            }
+
+            <!-- https://www.guardsquare.com/en/products/proguard/manual/examples#serializable -->
+            -keepnames class * implements java.io.Serializable
+
+            -keepclassmembers class * implements java.io.Serializable {
+                private static final java.io.ObjectStreamField[] serialPersistentFields;
+                private void writeObject(java.io.ObjectOutputStream);
+                private void readObject(java.io.ObjectInputStream);
+                java.lang.Object writeReplace();
+                java.lang.Object readResolve();
+            }
         </proguard>
         <jarjar jarfile="build/lib/orbeon-embedding.jar">
             <zipfileset src="${temp.jar}"/>
@@ -236,6 +252,22 @@
             -keep public class org.apache.commons.logging.impl.Jdk14Logger {
                 public *;
             }
+            <!-- https://github.com/orbeon/orbeon-forms/issues/4604 -->
+            -keep public enum org.apache.http.client.utils.URIUtils$** {
+                **[] $VALUES;
+                public *;
+            }
+
+            <!-- https://www.guardsquare.com/en/products/proguard/manual/examples#serializable -->
+            -keepnames class * implements java.io.Serializable
+
+            -keepclassmembers class * implements java.io.Serializable {
+                private static final java.io.ObjectStreamField[] serialPersistentFields;
+                private void writeObject(java.io.ObjectOutputStream);
+                private void readObject(java.io.ObjectInputStream);
+                java.lang.Object writeReplace();
+                java.lang.Object readResolve();
+            }
         </proguard>
         <jarjar jarfile="build/lib/orbeon-proxy-portlet.jar">
             <zipfileset src="${temp.jar}"/>

diff --git a/lib_ant/proguard-6.1.1.jar → lib_ant/proguard-6.2.2.jar b/lib_ant/proguard-6.1.1.jar → lib_ant/proguard-6.2.2.jar
diff --git a/lib_ant/proguard-annotations-6.1.1.jar b/lib_ant/proguard-annotations-6.1.1.jar
diff --git a/lib_ant/proguard-annotations-6.2.2.jar b/lib_ant/proguard-annotations-6.2.2.jar