From 17b3e7e2d7538dd708ffb90401ca932c329d9c4b Mon Sep 17 00:00:00 2001
From: Jacek Trossen <112926677+JTrossen@users.noreply.github.com>
Date: Mon, 10 Oct 2022 15:22:19 +0200
Subject: [PATCH] [spring-integration -shell] Fix issues 52119 52225 (#8729)

Fix two build issues for spring-integration and spring-shell

- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=52119
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=52225
---
 projects/spring-integration/Dockerfile | 7 -------
 projects/spring-integration/build.sh   | 4 +++-
 projects/spring-shell/Dockerfile       | 6 ------
 projects/spring-shell/build.sh         | 5 +++--
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/projects/spring-integration/Dockerfile b/projects/spring-integration/Dockerfile
index 5e0e9a074..e9ecdbc65 100644
--- a/projects/spring-integration/Dockerfile
+++ b/projects/spring-integration/Dockerfile
@@ -16,15 +16,8 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
-ARG java_home="/out/open-jdk-17"
-RUN mkdir -p $java_home
-
 RUN apt update && apt install -y openjdk-17-jdk
-ENV JAVA_HOME $java_home
-ENV PATH "${java_home}:${PATH}"
-ENV JVM_LD_LIBRARY_PATH "$java_home/lib/server"
 
-RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/spring-projects/spring-integration spring-integration     # or use other version control
 
 RUN git clone --depth 1 https://github.com/google/fuzzing && \
diff --git a/projects/spring-integration/build.sh b/projects/spring-integration/build.sh
index 62b04952f..9b3dba832 100755
--- a/projects/spring-integration/build.sh
+++ b/projects/spring-integration/build.sh
@@ -15,8 +15,10 @@
 #
 ################################################################################
 
+export JAVA_HOME="$OUT/open-jdk-17"
 mkdir -p $JAVA_HOME
-cp -rL "/usr/lib/jvm/java-17-openjdk-amd64/." "$JAVA_HOME" || true
+rsync -aL --exclude=*.zip "/usr/lib/jvm/java-17-openjdk-amd64/" "$JAVA_HOME"
+JVM_LD_LIBRARY_PATH="${JAVA_HOME}/lib/server"
 
 git apply $SRC/*.patch
 
diff --git a/projects/spring-shell/Dockerfile b/projects/spring-shell/Dockerfile
index 832bb17c6..120ec9d76 100644
--- a/projects/spring-shell/Dockerfile
+++ b/projects/spring-shell/Dockerfile
@@ -16,13 +16,7 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
-ARG java_home="/out/open-jdk-17"
-RUN mkdir -p $java_home
-
 RUN apt update && apt install -y openjdk-17-jdk
-ENV JAVA_HOME $java_home
-ENV PATH "${java_home}:${PATH}"
-ENV JVM_LD_LIBRARY_PATH "$java_home/lib/server"
 
 RUN git clone --depth 1 https://github.com/spring-projects/spring-shell.git spring-shell     # or use other version control
 COPY add-shadow-*.patch $SRC/
diff --git a/projects/spring-shell/build.sh b/projects/spring-shell/build.sh
index e3e957730..a30952a00 100755
--- a/projects/spring-shell/build.sh
+++ b/projects/spring-shell/build.sh
@@ -15,8 +15,10 @@
 #
 ################################################################################
 
+export JAVA_HOME="$OUT/open-jdk-17"
 mkdir -p $JAVA_HOME
-cp -rL "/usr/lib/jvm/java-17-openjdk-amd64/." "$JAVA_HOME" || true
+rsync -aL --exclude=*.zip "/usr/lib/jvm/java-17-openjdk-amd64/" "$JAVA_HOME"
+JVM_LD_LIBRARY_PATH="${JAVA_HOME}/lib/server"
 
 CURRENT_VERSION=$(./gradlew properties --no-daemon --console=plain | sed -nr "s/^version:\ (.*)/\1/p")
 
@@ -56,7 +58,6 @@ function create_fuzz_targets() {
     \$this_dir/jazzer_driver --agent_path=\$this_dir/jazzer_agent_deploy.jar \
     --cp=$RUNTIME_CLASSPATH \
     --target_class=$fuzzer_basename \
-    --instrumentation_excludes=org.aspectj.weaver.** \
     --jvm_args=\"-Xmx2048m\" \
     \$@" > $OUT/$fuzzer_basename
     chmod u+x $OUT/$fuzzer_basename