Skip to content

Commit 915a481

Browse files
filip-debrickedfilip-debricked
authored
Merge pull request #68 from debricked/0-callgraph-v4-fix
Create different java version profiles
2 parents 1f920bc + 9730e9f commit 915a481

File tree

4 files changed

+79
-10
lines changed

4 files changed

+79
-10
lines changed

‎java/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM maven:3-jdk-11-slim AS package
1+
FROM maven:3-eclipse-temurin-21-alpine AS package
22

33
COPY java/common /vulnfunc/java/common
4-
RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package
4+
RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package -DskipTests
55

6-
FROM openjdk:11-jre-slim
6+
FROM openjdk:21-slim
77
RUN apt-get update ; apt-get install --no-install-recommends -y zip
88
COPY --from=package /vulnfunc/java/common/target/SootWrapper.jar /vulnfunc/java/common/
99
COPY java/common/*.sh /vulnfunc/java/common/

‎java/common/pom.xml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,73 @@
8585
</plugins>
8686
</build>
8787

88+
<profiles>
89+
<!-- Profile for Java 11 -->
90+
<profile>
91+
<id>java11</id>
92+
<activation>
93+
<activeByDefault>false</activeByDefault>
94+
</activation>
95+
<properties>
96+
<maven.compiler.source>11</maven.compiler.source>
97+
<maven.compiler.target>11</maven.compiler.target>
98+
<finalName>SootWrapper-java11</finalName>
99+
</properties>
100+
<build>
101+
<plugins>
102+
<plugin>
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-compiler-plugin</artifactId>
105+
<version>3.11.0</version>
106+
</plugin>
107+
</plugins>
108+
</build>
109+
</profile>
110+
111+
<!-- Profile for Java 17 -->
112+
<profile>
113+
<id>java17</id>
114+
<activation>
115+
<activeByDefault>false</activeByDefault>
116+
</activation>
117+
<properties>
118+
<maven.compiler.source>17</maven.compiler.source>
119+
<maven.compiler.target>17</maven.compiler.target>
120+
<finalName>SootWrapper-java17</finalName>
121+
</properties>
122+
<build>
123+
<plugins>
124+
<plugin>
125+
<groupId>org.apache.maven.plugins</groupId>
126+
<artifactId>maven-compiler-plugin</artifactId>
127+
<version>3.11.0</version>
128+
</plugin>
129+
</plugins>
130+
</build>
131+
</profile>
132+
133+
<!-- Profile for Java 21 -->
134+
<profile>
135+
<id>java21</id>
136+
<activation>
137+
<activeByDefault>false</activeByDefault>
138+
</activation>
139+
<properties>
140+
<maven.compiler.source>21</maven.compiler.source>
141+
<maven.compiler.target>21</maven.compiler.target>
142+
<finalName>SootWrapper-java21</finalName>
143+
</properties>
144+
<build>
145+
<plugins>
146+
<plugin>
147+
<groupId>org.apache.maven.plugins</groupId>
148+
<artifactId>maven-compiler-plugin</artifactId>
149+
<version>3.11.0</version>
150+
</plugin>
151+
</plugins>
152+
</build>
153+
</profile>
154+
</profiles>
155+
156+
88157
</project>

‎java/gradle/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM maven:3-jdk-11-slim AS package
1+
FROM maven:3-eclipse-temurin-21-alpine AS package
22

33
COPY java/common /vulnfunc/java/common
4-
RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package
4+
RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package -DskipTests
55

6-
FROM gradle:jre11
6+
FROM gradle:jdk21
77
RUN apt-get update ; apt-get install --no-install-recommends -y zip
88
COPY --from=package /vulnfunc/java/common/target/SootWrapper.jar /vulnfunc/java/common/
99
COPY java/common/*.sh /vulnfunc/java/common/

‎java/maven/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM maven:3-jdk-11-slim AS package
1+
FROM maven:3-eclipse-temurin-21-alpine AS package
22

33
COPY java/common /vulnfunc/java/common
4-
RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package
4+
RUN mvn -f /vulnfunc/java/common --batch-mode --update-snapshots package -DskipTests
55

6-
FROM maven:3-jdk-11-slim
7-
RUN apt-get update ; apt-get install --no-install-recommends -y zip
6+
FROM maven:3-eclipse-temurin-21-alpine
7+
RUN apk add --no-cache zip
88
COPY --from=package /vulnfunc/java/common/target/SootWrapper.jar /vulnfunc/java/common/
99
COPY java/common/*.sh /vulnfunc/java/common/
1010
COPY java/maven/*.sh /vulnfunc/java/maven/

0 commit comments

Comments
 (0)