Merge branch 'develop' into ci/gh-pages

soot-oss · Feb 28, 2025 · 28ec975 · 28ec975
2 parents 02eebcc + caf1143
commit 28ec975
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <packaging>pom</packaging>
     <groupId>org.soot-oss</groupId>
     <artifactId>sootup</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>SootUp</name>
     <description>A new version of Soot with a completely overhauled architecture</description>
     <url>https://soot-oss.github.io/SootUp</url>
@@ -90,8 +90,8 @@
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
-        <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
-	      <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+        <maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
+        <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
         <licence-check.failOnMissingHeader>true</licence-check.failOnMissingHeader>
         <reactorRootsTarget>${basedir}/target</reactorRootsTarget>
     </properties>
@@ -143,6 +143,10 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
                         <version>${maven-gpg-plugin.version}</version>
+                        <configuration>
+                            <bestPractices>true</bestPractices>
+                            <passphraseEnvName>GPG_PRIVATE_KEY_PASSPHRASE</passphraseEnvName>
+                        </configuration>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

diff --git a/sootup.analysis.interprocedural/pom.xml b/sootup.analysis.interprocedural/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.soot-oss</groupId>
         <artifactId>sootup</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/sootup.analysis.intraprocedural/pom.xml b/sootup.analysis.intraprocedural/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.soot-oss</groupId>
         <artifactId>sootup</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/sootup.apk.frontend/pom.xml b/sootup.apk.frontend/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.soot-oss</groupId>
         <artifactId>sootup</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <name>SootUp APK Frontend</name>

diff --git a/sootup.callgraph/pom.xml b/sootup.callgraph/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.soot-oss</groupId>
 		<artifactId>sootup</artifactId>
-		<version>2.0.0</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>

diff --git a/sootup.codepropertygraph/pom.xml b/sootup.codepropertygraph/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sootup</artifactId>
         <groupId>org.soot-oss</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sootup.core/pom.xml b/sootup.core/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.soot-oss</groupId>
 		<artifactId>sootup</artifactId>
-		<version>2.0.0</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>

diff --git a/sootup.examples/pom.xml b/sootup.examples/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.soot-oss</groupId>
         <artifactId>sootup</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/sootup.interceptors/pom.xml b/sootup.interceptors/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.soot-oss</groupId>
         <artifactId>sootup</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sootup.interceptors</artifactId>

diff --git a/sootup.java.bytecode.frontend/pom.xml b/sootup.java.bytecode.frontend/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.soot-oss</groupId>
 		<artifactId>sootup</artifactId>
-		<version>2.0.0</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>

diff --git a/sootup.java.core/pom.xml b/sootup.java.core/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.soot-oss</groupId>
     <artifactId>sootup</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
     <dependencies>

diff --git a/sootup.java.sourcecode.frontend/pom.xml b/sootup.java.sourcecode.frontend/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.soot-oss</groupId>
 		<artifactId>sootup</artifactId>
-		<version>2.0.0</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>

diff --git a/sootup.jimple.frontend/pom.xml b/sootup.jimple.frontend/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.soot-oss</groupId>
         <artifactId>sootup</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/sootup.qilin/pom.xml b/sootup.qilin/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.soot-oss</groupId>
         <artifactId>sootup</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -61,23 +61,13 @@
 
     <build>
         <plugins>
-            <!--            <plugin>
-                            <groupId>org.sonatype.plugins</groupId>
-                            <artifactId>nexus-staging-maven-plugin</artifactId>
-                            <version>${nexus-staging-maven-plugin.version}</version>
-                            <configuration>
-                                <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-                            </configuration>
-                        </plugin>
-                        -->
-            <!-- <plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
+                <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <skip>true</skip>
                 </configuration>
-            </plugin> -->
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>

diff --git a/sootup.report/pom.xml b/sootup.report/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.soot-oss</groupId>
         <artifactId>sootup</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <build>

diff --git a/sootup.tests/pom.xml b/sootup.tests/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.soot-oss</groupId>
 		<artifactId>sootup</artifactId>
-		<version>2.0.0</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>