diff --git a/projects/spring-ldap/Dockerfile b/projects/spring-ldap/Dockerfile
new file mode 100644
index 000000000..3c576b32e
--- /dev/null
+++ b/projects/spring-ldap/Dockerfile
@@ -0,0 +1,31 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+FROM gcr.io/oss-fuzz-base/base-builder-jvm
+
+RUN curl -L https://dlcdn.apache.org/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.zip -o maven.zip && \
+    unzip maven.zip -d $SRC/maven && \
+    rm -rf maven.zip
+
+ENV MVN $SRC/maven/apache-maven-3.8.6/bin/mvn
+
+RUN apt update && apt install -y openjdk-17-jdk
+
+RUN git clone --depth 1 https://github.com/spring-projects/spring-ldap.git
+
+COPY build.sh $SRC/
+COPY *Fuzzer.java $SRC/
+WORKDIR $SRC/spring-ldap
\ No newline at end of file
diff --git a/projects/spring-ldap/LdapQueryBuilderFuzzer.java b/projects/spring-ldap/LdapQueryBuilderFuzzer.java
new file mode 100644
index 000000000..a9f8b4380
--- /dev/null
+++ b/projects/spring-ldap/LdapQueryBuilderFuzzer.java
@@ -0,0 +1,43 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in co  mpliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//////////////////////////////////////////////////////////////////////////////////
+
+
+import com.code_intelligence.jazzer.api.FuzzedDataProvider;
+
+import org.springframework.ldap.InvalidNameException;
+
+import static org.springframework.ldap.query.LdapQueryBuilder.query;
+import org.springframework.ldap.query.LdapQuery;
+import org.springframework.ldap.query.SearchScope;
+
+
+public class LdapQueryBuilderFuzzer {
+    public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+        try {
+            LdapQuery query = query()
+				.base(data.consumeString(100))
+				.searchScope(SearchScope.ONELEVEL)
+				.timeLimit(30)
+				.countLimit(60)
+				.where(data.consumeString(100))
+                .is(data.consumeString(100))
+                .and(data.consumeString(100))
+                .is(data.consumeRemainingAsString());
+        } catch (InvalidNameException e) {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/projects/spring-ldap/build.sh b/projects/spring-ldap/build.sh
new file mode 100755
index 000000000..175ab9200
--- /dev/null
+++ b/projects/spring-ldap/build.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+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 > add-shadow.diff <<- EOM
+diff --git a/core/build.gradle b/core/build.gradle
+index d6119e9..1ffa9a1 100644
+--- a/core/build.gradle
++++ b/core/build.gradle
+@@ -1,6 +1,7 @@
+ plugins {
+     id 'io.spring.convention.spring-module'
+     id 'com.intershop.gradle.javacc'
++    id 'com.github.johnrengelman.shadow' version '7.0.0'
+ }
+ 
+ javacc {
+@@ -54,4 +55,4 @@ compileTestJava {
+ 
+ test {
+     jvmArgs '--add-exports', 'java.naming/com.sun.jndi.ldap=ALL-UNNAMED'
+-}
+\ No newline at end of file
++}
+EOM
+
+git apply add-shadow.diff
+
+./gradlew shadowJar -p core -x test -x javadoc -x :checkstyleNohttp
+CURRENT_VERSION=$(./gradlew properties --no-daemon --console=plain | sed -nr "s/^version:\ (.*)/\1/p")
+cp "core/build/libs/spring-ldap-core-$CURRENT_VERSION-all.jar" "$OUT/spring-ldap-core.jar"
+
+ALL_JARS="spring-ldap-core.jar"
+
+# The classpath at build-time includes the project jars in $OUT as well as the
+# Jazzer API.
+BUILD_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "$OUT/%s:"):$JAZZER_API_PATH
+
+# All .jar and .class files lie in the same directory as the fuzzer at runtime.
+RUNTIME_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "\$this_dir/%s:"):\$this_dir
+
+for fuzzer in $(find $SRC -name '*Fuzzer.java'); do
+  fuzzer_basename=$(basename -s .java $fuzzer)
+  javac -cp $BUILD_CLASSPATH $fuzzer --release 17
+  cp $SRC/$fuzzer_basename.class $OUT/
+
+  # Create an execution wrapper that executes Jazzer with the correct arguments.
+  echo "#!/bin/sh
+# LLVMFuzzerTestOneInput for fuzzer detection.
+this_dir=\$(dirname \"\$0\")
+JAVA_HOME=\"\$this_dir/open-jdk-17/\" \
+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 \
+--jvm_args=\"-Xmx2048m\" \
+\$@" > $OUT/$fuzzer_basename
+  chmod u+x $OUT/$fuzzer_basename
+done
\ No newline at end of file
diff --git a/projects/spring-ldap/project.yaml b/projects/spring-ldap/project.yaml
new file mode 100644
index 000000000..5be57b290
--- /dev/null
+++ b/projects/spring-ldap/project.yaml
@@ -0,0 +1,18 @@
+homepage: "https://github.com/spring-projects/spring-ldap.git"
+language: jvm
+main_repo: "https://github.com/spring-projects/spring-ldap.git"
+fuzzing_engines:
+  - libfuzzer
+sanitizers:
+  - address
+primary_contact: "pwebb@vmware.com"
+auto_ccs:
+  - "wilkinsona@vmware.com"
+vendor_ccs:
+  - "wagner@code-intelligence.com"
+  - "yakdan@code-intelligence.com"
+  - "glendowne@code-intelligence.com"
+  - "patrice.salathe@code-intelligence.com"
+  - "hlin@code-intelligence.com"
+  - "jacek.trossen@code-intelligence.com"
+  - "peter.samarin@code-intelligence.com"
\ No newline at end of file