Merge branch 'develop' into cg

Author: MarcMil

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java_version: ['8', '9', '11']
+        java_version: ['11', '17', '21']
 
     steps:
     - name: Checkout

pom.xml

@@ -63,10 +63,10 @@
         <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
         <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
         <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
-        <maven-nexus-staging-plugin.version>1.6.13</maven-nexus-staging-plugin.version>
-        <maven-gpg-plugin.version>3.2.2</maven-gpg-plugin.version>
+        <maven-nexus-staging-plugin.version>1.7.0</maven-nexus-staging-plugin.version>
+        <maven-gpg-plugin.version>3.2.6</maven-gpg-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
+        <maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
         <checkstyle.version>8.18</checkstyle.version>
         <checkstyle.dir.path>${basedir}/codingstyle</checkstyle.dir.path>
         <checkstyle.file.path>${checkstyle.dir.path}/soot_checkstyle_checks.xml</checkstyle.file.path>
@@ -437,7 +437,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.smali</groupId>
@@ -467,7 +467,7 @@
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.28.0-GA</version>
+            <version>3.30.2-GA</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -478,7 +478,7 @@
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <version>1.10.11</version>
+            <version>1.10.15</version>
             <scope>provided</scope>
         </dependency>
         <!-- Local dependencies -->
@@ -510,12 +510,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.16</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.16</version>
             <scope>test</scope>
         </dependency>
         <!-- Testing dependencies -->
@@ -560,28 +560,28 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>2.1.1</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>3.0.0</version>
+            <version>4.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>3.0.0</version>
+            <version>4.0.5</version>
         </dependency>
         <!-- Dotnet Dependencies -->
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>3.25.3</version>
+            <version>3.25.5</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java-util</artifactId>
-            <version>3.25.3</version>
+            <version>3.25.5</version>
         </dependency>
     </dependencies>
 

src/main/java/soot/FastHierarchy.java

@@ -125,6 +125,11 @@ public boolean isSubrange(Interval potentialSubrange) {
       return (potentialSubrange == this)
           || (potentialSubrange != null && this.lower <= potentialSubrange.lower && this.upper >= potentialSubrange.upper);
     }
+
+    @Override
+    public String toString() {
+      return String.format("%d - %d", lower, upper);
+    }
   }
 
   protected int dfsVisit(int start, SootClass c) {

src/main/xml/options/make-soot-options.xsl

@@ -146,7 +146,7 @@ public class Options extends OptionsBase {
     <xsl:template mode="parse" match="boolopt">
             else if (false<xsl:text/>
         <xsl:choose>
-            <xsl:when test="default='true'">
+            <xsl:when test="child::default='true'">
                 <xsl:for-each select="alias">
                     || option.equals("no-<xsl:value-of select="."/>")<xsl:text/>
                 </xsl:for-each>

src/test/java/soot/baf/ASMBackendMockingTest.java

@@ -22,7 +22,6 @@
  * #L%
  */
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 import static org.objectweb.asm.Opcodes.*;
 import static org.powermock.api.mockito.PowerMockito.doCallRealMethod;