spring-security: Fix build failure, remove unused dict file & skip more tests (#7933)

* Fix build failure, remove unused dict file & skip more tests

* Update project.yaml

3 files changed, 7 insertions, 19 deletions

diff --git a/projects/spring-security/Dockerfile b/projects/spring-security/Dockerfile
index ac7d1749..f2b52986 100644
--- a/projects/spring-security/Dockerfile
+++ b/projects/spring-security/Dockerfile
@@ -16,21 +16,7 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
-RUN git clone --depth 1 https://github.com/google/fuzzing && \
-    mv fuzzing/dictionaries/json.dict $SRC/BasicJsonParserFuzzer.dict && \
-    rm -rf fuzzing
-
-RUN git clone --depth 1 https://github.com/dvyukov/go-fuzz-corpus && \
-    zip -j $SRC/BasicJsonParserFuzzer_seed_corpus.zip go-fuzz-corpus/json/corpus/* && \
-    rm -rf go-fuzz-corpus
-
-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-security
 RUN git clone --depth 1 https://github.com/spring-projects/spring-ldap spring-ldap
diff --git a/projects/spring-security/build.sh b/projects/spring-security/build.sh
index 74cdfb4b..e4103550 100755
--- a/projects/spring-security/build.sh
+++ b/projects/spring-security/build.sh
@@ -15,8 +15,9 @@
 #
 ################################################################################
 
+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"
 
 cat > patch.diff <<- EOM
 diff --git a/ldap/spring-security-ldap.gradle b/ldap/spring-security-ldap.gradle
@@ -49,8 +50,8 @@ git apply patch.diff
 
 CURRENT_VERSION=$(./gradlew properties --no-daemon --console=plain | sed -nr "s/^version:\ (.*)/\1/p")
 
-./gradlew build -x test -i -x javadoc -x :spring-security-docs:api -x :spring-security-itest-ldap-embedded-none:integrationTest
-./gradlew shadowJar --build-file ldap/spring-security-ldap.gradle -x javadoc -x :spring-security-itest-ldap-embedded-none:integrationTest
+./gradlew build -PbuildSrc.skipTests -x test -i -x javadoc -x :spring-security-docs:api -x :spring-security-itest-ldap-embedded-none:integrationTest -x :spring-security-config:integrationTest
+./gradlew shadowJar --build-file ldap/spring-security-ldap.gradle -PbuildSrc.skipTests -x test -x javadoc -x :spring-security-itest-ldap-embedded-none:integrationTest
 cp "core/build/libs/spring-security-core-$CURRENT_VERSION.jar" "$OUT/spring-security-core.jar"
 cp "ldap/build/libs/spring-security-ldap-$CURRENT_VERSION-all.jar" "$OUT/spring-security-ldap.jar"
 cp "build/libs/spring-security-$CURRENT_VERSION.jar" "$OUT/spring-security.jar"
@@ -76,7 +77,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 \
 --instrumentation_excludes=com.unboundid.ldap.**:org.springframework.ldap.** \
 --cp=$RUNTIME_CLASSPATH \
diff --git a/projects/spring-security/project.yaml b/projects/spring-security/project.yaml
index 8c37bb5d..dad546ea 100644
--- a/projects/spring-security/project.yaml
+++ b/projects/spring-security/project.yaml
@@ -9,4 +9,5 @@ vendor_ccs:
   - "wagner@code-intelligence.com"
   - "yakdan@code-intelligence.com"
   - "glendowne@code-intelligence.com"
-  - "patrice.salathe@code-intelligence.com"
\ No newline at end of file
+  - "patrice.salathe@code-intelligence.com"
+  - "hlin@code-intelligence.com"
\ No newline at end of file