diff --git a/projects/javassist/Dockerfile b/projects/javassist/Dockerfile index 30741bb18..ca66349ab 100644 --- a/projects/javassist/Dockerfile +++ b/projects/javassist/Dockerfile @@ -26,4 +26,5 @@ RUN git clone --depth 1 https://github.com/jboss-javassist/javassist.git COPY build.sh $SRC/ COPY ClassFuzzer.java $SRC/ +COPY pom.xml.diff $SRC/javassist WORKDIR $SRC/javassist diff --git a/projects/javassist/build.sh b/projects/javassist/build.sh index b7c44e187..b4890d069 100644 --- a/projects/javassist/build.sh +++ b/projects/javassist/build.sh @@ -15,6 +15,13 @@ # ################################################################################ +git apply pom.xml.diff +mv ./src/main ./src/java +mkdir ./src/main +mv ./src/java ./src/main/java +mv ./src/test ./src/java +mkdir ./src/test +mv ./src/java ./src/test/java MAVEN_ARGS="-Djavac.src.version=15 -Djavac.target.version=15 -DskipTests" $MVN package org.apache.maven.plugins:maven-shade-plugin:3.2.4:shade $MAVEN_ARGS diff --git a/projects/javassist/pom.xml.diff b/projects/javassist/pom.xml.diff new file mode 100644 index 000000000..8e3c6c12f --- /dev/null +++ b/projects/javassist/pom.xml.diff @@ -0,0 +1,15 @@ +diff --git a/pom.xml b/pom.xml +index a604e16..52c8a7b 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -138,8 +138,8 @@ + + + +- src/main/ +- src/test/ ++ src/main/java/ ++ src/test/java/ + + + src/test/resources