From aa5c18e8fffe2cd0f22e25e61520cb723767045d Mon Sep 17 00:00:00 2001
From: filip <filip.heden@debricked.com>
Date: Tue, 14 Jan 2025 10:18:29 +0100
Subject: [PATCH 1/3] Set different java version profiles

---
 java/common/pom.xml | 69 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/java/common/pom.xml b/java/common/pom.xml
index 75f191a..39cfc2d 100644
--- 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>

From 4550fd83054e8fdd84a12f23a49d2e0a003a8e2b Mon Sep 17 00:00:00 2001
From: filip <filip.heden@debricked.com>
Date: Tue, 14 Jan 2025 10:36:22 +0100
Subject: [PATCH 2/3] update images

---
 java/Dockerfile        | 6 +++---
 java/gradle/Dockerfile | 6 +++---
 java/maven/Dockerfile  | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/java/Dockerfile b/java/Dockerfile
index 5eee66e..051c27b 100644
--- 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/gradle/Dockerfile b/java/gradle/Dockerfile
index dc98b66..26ff3a6 100644
--- 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
index 075df46..34ebc9a 100644
--- 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 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/

From 9730e9fc78ce3e613f12cd6dcc8547025f6b890d Mon Sep 17 00:00:00 2001
From: filip-debricked <135233582+filip-debricked@users.noreply.github.com>
Date: Tue, 14 Jan 2025 11:16:30 +0100
Subject: [PATCH 3/3] Update java/maven/Dockerfile

Co-authored-by: Oscar Reimer <oscar.reimer@debricked.com>
---
 java/maven/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/maven/Dockerfile b/java/maven/Dockerfile
index 34ebc9a..646331d 100644
--- a/java/maven/Dockerfile
+++ b/java/maven/Dockerfile
@@ -4,7 +4,7 @@ COPY java/common /vulnfunc/java/common
 RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package -DskipTests
 
 FROM maven:3-eclipse-temurin-21-alpine
-RUN apk add zip
+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/