Merge branch 'develop' into develop

soot-oss · Nov 22, 2024 · 7fc1485 · 7fc1485
2 parents de73d0a + 8eaa58e
commit 7fc1485
Show file tree

Hide file tree

Showing 524 changed files with 28,674 additions and 21,768 deletions.
diff --git a/.classpath b/.classpath
@@ -6,7 +6,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/generated/protobuf"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/generated/protobuf">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" output="target/systemTest-target-classes" path="src/systemTest/targets"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
@@ -44,7 +49,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,18 +20,18 @@ jobs:
       - name: Stylecheck
         if: always()
         run: |
-          mvn -B clean checkstyle:check -Dcheckstyle.failOnViolation=true
+          mvn -B --no-transfer-progress clean checkstyle:check -Dcheckstyle.failOnViolation=true
       - name: Licensecheck
         if: always()
         run: |
-          mvn -B clean license:check-file-header -Dlicence-check.failOnMissingHeader=true
+          mvn -B --no-transfer-progress clean license:check-file-header -Dlicence-check.failOnMissingHeader=true
     
   BuildAndTest:
     name: Build and Test with java ${{ matrix.java_version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java_version: ['8', '9', '11']
+        java_version: ['11', '17', '21']
 
     steps:
     - name: Checkout
@@ -42,7 +42,7 @@ jobs:
         java-version: ${{ matrix.java_version }}
     - name: Build and test Java ${{ matrix.java_version }}
       run: |
-        mvn -B clean test -PJava${{ matrix.java_version }}
+        mvn -B --no-transfer-progress clean test -PJava${{ matrix.java_version }}
 
         
   DeployArtifacts:
@@ -53,10 +53,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Use Java 8
+      - name: Use Java 11
         uses: actions/setup-java@v1
         with:
-          java-version: '8'
+          java-version: '11'
       - name: Deploy artifacts
         uses: samuelmeuli/action-maven-publish@v1
         with:

diff --git a/README.md b/README.md
@@ -109,8 +109,6 @@ If you cannot work with the prebuild versions and need to build Soot on your own
 
 Soot follows the git-flow convention. Releases and hotfixes are maintained in the master branch.
 Development happens in the develop branch. To catch the bleeding edge of Soot, check out the latter.
-In case of any questions, please consult the Soot
-mailing list at: http://www.sable.mcgill.ca/mailman/listinfo/soot-list/
 
 # How do I contribute to Soot?
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.soot-oss</groupId>
     <artifactId>soot</artifactId>
     <name>Soot - a J*va Optimization Framework</name>
-    <version>4.6.0-SNAPSHOT</version>
+    <version>4.7.0-SNAPSHOT</version>
     <description>A Java Optimization Framework</description>
     <url>https://soot-oss.github.io/soot</url>
     <organization>
@@ -52,8 +52,8 @@
         <url>https://github.com/soot-oss/soot</url>
     </scm>
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <xml-maven-plugin.version>1.1.0</xml-maven-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
@@ -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>
@@ -305,6 +305,14 @@
                     <reuseForks>false</reuseForks>
                     <forkCount>1</forkCount>
                     <excludedGroups>${testcase.groups.excluded}</excludedGroups>
+                    <argLine>
+                        --add-opens=java.base/java.lang=ALL-UNNAMED
+                        --add-opens=java.base/java.util=ALL-UNNAMED
+                        --add-opens=java.base/java.util.regex=ALL-UNNAMED
+                        --add-opens=java.base/java.util.stream=ALL-UNNAMED
+                        --add-opens=java.base/java.io=ALL-UNNAMED
+                        --add-opens=java.base/java.net=ALL-UNNAMED
+                    </argLine>
                 </configuration>
                 <executions>
                     <execution>
@@ -437,7 +445,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 +475,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 +486,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 +518,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 +568,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>