diff options
| author |  psy <patrice.salathe@code-intelligence.com> | 2022-07-01 11:58:51 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-07-01 11:58:51 +0200 |
| commit | adad4c2dbefc8d266c1b00fbc24722e7a823cff9 (patch) | |
| tree | c36426fa48bef7d169434b9da9a0111117b162dd | |
| parent | 7bcd9edc36083a85b12fdbef54a984032575ca2d (diff) | |
spring-framework: Fix build failure (#7934)
Fix build failure
| -rw-r--r-- | projects/spring-framework/Dockerfile | 6 | ||||
| -rwxr-xr-x | projects/spring-framework/build.sh | 8 | ||||
| -rw-r--r-- | projects/spring-framework/project.yaml | 1 |
3 files changed, 6 insertions, 9 deletions
diff --git a/projects/spring-framework/Dockerfile b/projects/spring-framework/Dockerfile index 26fa52d5..3c0343e3 100644 --- a/projects/spring-framework/Dockerfile +++ b/projects/spring-framework/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-framework diff --git a/projects/spring-framework/build.sh b/projects/spring-framework/build.sh index b2f34e76..d13126c0 100755 --- a/projects/spring-framework/build.sh +++ b/projects/spring-framework/build.sh @@ -15,7 +15,9 @@ # ################################################################################ -cp -r "/usr/lib/jvm/java-17-openjdk-amd64/." "$JAVA_HOME" || true +export JAVA_HOME="$OUT/open-jdk-17" +mkdir -p $JAVA_HOME +rsync -aL --exclude=*.zip "/usr/lib/jvm/java-17-openjdk-amd64/" "$JAVA_HOME" cat > patch.diff <<- EOM diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle @@ -37,7 +39,7 @@ git apply patch.diff CURRENT_VERSION=$(./gradlew properties --console=plain | sed -nr "s/^version:\ (.*)/\1/p") ./gradlew build -x test -i -x javadoc -./gradlew shadowJar --build-file spring-core/spring-core.gradle -x javadoc +./gradlew shadowJar --build-file spring-core/spring-core.gradle -x javadoc -x test cp "spring-core/build/libs/spring-core-$CURRENT_VERSION-all.jar" "$OUT/spring-core.jar" cp "spring-web/build/libs/spring-web-$CURRENT_VERSION.jar" "$OUT/spring-web.jar" @@ -60,7 +62,7 @@ for fuzzer in $(find $SRC -name '*Fuzzer.java'); do # LLVMFuzzerTestOneInput for fuzzer detection. this_dir=\$(dirname \"\$0\") JAVA_HOME=\"\$this_dir/open-jdk-17/\" \ -LD_LIBRARY_PATH=\"$JVM_LD_LIBRARY_PATH\":\$this_dir \ +LD_LIBRARY_PATH=\"\$this_dir/open-jdk-17/lib/server\":\$this_dir \ \$this_dir/jazzer_driver --agent_path=\$this_dir/jazzer_agent_deploy.jar \ --cp=$RUNTIME_CLASSPATH \ --target_class=$fuzzer_basename \ diff --git a/projects/spring-framework/project.yaml b/projects/spring-framework/project.yaml index 6c63e722..fe1808f9 100644 --- a/projects/spring-framework/project.yaml +++ b/projects/spring-framework/project.yaml @@ -10,3 +10,4 @@ vendor_ccs: - "yakdan@code-intelligence.com" - "glendowne@code-intelligence.com" - "patrice.salathe@code-intelligence.com" + - "hlin@code-intelligence.com"
\ No newline at end of file |