Merge pull request #68 from debricked/0-callgraph-v4-fix

Create different java version profiles
debricked · Jan 14, 2025 · 915a481 · 915a481
2 parents 1f920bc + 9730e9f
commit 915a481
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 10 deletions.
diff --git a/java/Dockerfile b/java/Dockerfile
@@ -1,9 +1,9 @@
-FROM maven:3-jdk-11-slim AS package
+FROM maven:3-eclipse-temurin-21-alpine AS package
 
 COPY java/common /vulnfunc/java/common
-RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package
+RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package -DskipTests
 
-FROM openjdk:11-jre-slim
+FROM openjdk:21-slim
 RUN apt-get update ; apt-get install --no-install-recommends -y zip
 COPY --from=package /vulnfunc/java/common/target/SootWrapper.jar /vulnfunc/java/common/
 COPY java/common/*.sh /vulnfunc/java/common/

diff --git a/java/common/pom.xml b/java/common/pom.xml
@@ -85,4 +85,73 @@
         </plugins>
     </build>
 
+    <profiles>
+        <!-- Profile for Java 11 -->
+        <profile>
+            <id>java11</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <maven.compiler.source>11</maven.compiler.source>
+                <maven.compiler.target>11</maven.compiler.target>
+                <finalName>SootWrapper-java11</finalName>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.11.0</version>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- Profile for Java 17 -->
+        <profile>
+            <id>java17</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <maven.compiler.source>17</maven.compiler.source>
+                <maven.compiler.target>17</maven.compiler.target>
+                <finalName>SootWrapper-java17</finalName>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.11.0</version>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- Profile for Java 21 -->
+        <profile>
+            <id>java21</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <maven.compiler.source>21</maven.compiler.source>
+                <maven.compiler.target>21</maven.compiler.target>
+                <finalName>SootWrapper-java21</finalName>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.11.0</version>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+
 </project>
diff --git a/java/gradle/Dockerfile b/java/gradle/Dockerfile
@@ -1,9 +1,9 @@
-FROM maven:3-jdk-11-slim AS package
+FROM maven:3-eclipse-temurin-21-alpine AS package
 
 COPY java/common /vulnfunc/java/common
-RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package
+RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package -DskipTests
 
-FROM gradle:jre11
+FROM gradle:jdk21
 RUN apt-get update ; apt-get install --no-install-recommends -y zip
 COPY --from=package /vulnfunc/java/common/target/SootWrapper.jar /vulnfunc/java/common/
 COPY java/common/*.sh /vulnfunc/java/common/

diff --git a/java/maven/Dockerfile b/java/maven/Dockerfile
@@ -1,10 +1,10 @@
-FROM maven:3-jdk-11-slim AS package
+FROM maven:3-eclipse-temurin-21-alpine AS package
 
 COPY java/common /vulnfunc/java/common
-RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package
+RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package -DskipTests
 
-FROM maven:3-jdk-11-slim
-RUN apt-get update ; apt-get install --no-install-recommends -y zip
+FROM maven:3-eclipse-temurin-21-alpine
+RUN apk add --no-cache zip
 COPY --from=package /vulnfunc/java/common/target/SootWrapper.jar /vulnfunc/java/common/
 COPY java/common/*.sh /vulnfunc/java/common/
 COPY java/maven/*.sh /vulnfunc/java/maven/