Fix the 'Bad type on operand stack' verification errors with the all-…

…in-one jar built by Java 11 or later (#230)
ebourg · Jun 28, 2024 · 14c9a8e · 14c9a8e
1 parent 41866b1
commit 14c9a8e
Showing 1 changed file with 43 additions and 11 deletions.
diff --git a/jsign/pom.xml b/jsign/pom.xml
@@ -196,18 +196,15 @@
                 <option>-keepclassmembers class * extends java.lang.Enum { *; }</option>
               </options>
               <injar>${project.build.finalName}.jar</injar>
-              <includeDependency>false</includeDependency>
-              <libs>
-                <lib>${proguard.bootclasspath}</lib>
-              </libs>
+              <includeDependency>true</includeDependency>
             </configuration>
           </execution>
         </executions>
         <dependencies>
           <dependency>
             <groupId>com.guardsquare</groupId>
             <artifactId>proguard-base</artifactId>
-            <version>7.4.2</version>
+            <version>7.5.0</version>
           </dependency>
           <dependency>
             <groupId>com.guardsquare</groupId>
@@ -357,19 +354,54 @@
       <activation>
         <jdk>(,1.8]</jdk>
       </activation>
-      <properties>
-        <proguard.bootclasspath>${java.home}/lib/rt.jar</proguard.bootclasspath>
-      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.wvengen</groupId>
+            <artifactId>proguard-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>proguard-minimizing</id>
+                <configuration>
+                  <libs>
+                    <lib>${java.home}/lib/rt.jar</lib>
+                  </libs>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
 
     <profile>
       <id>proguard-bootclasspath-post-java9</id>
       <activation>
         <jdk>[9,)</jdk>
       </activation>
-      <properties>
-        <proguard.bootclasspath>${java.home}/jmods/java.base.jmod</proguard.bootclasspath>
-      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.wvengen</groupId>
+            <artifactId>proguard-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>proguard-minimizing</id>
+                <configuration>
+                  <libs>
+                    <lib>${java.home}/jmods/java.base.jmod</lib>
+                    <lib>${java.home}/jmods/java.logging.jmod</lib>
+                    <lib>${java.home}/jmods/java.smartcardio.jmod</lib>
+                    <lib>${java.home}/jmods/java.sql.jmod</lib>
+                    <lib>${java.home}/jmods/java.xml.jmod</lib>
+                    <lib>${java.home}/jmods/jdk.crypto.cryptoki.jmod</lib>
+                  </libs>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
 
     <profile>