diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 206731e5519..441a90dcba0 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -93,9 +93,8 @@ dependencies {
   implementation("org.apache.maven", "maven-aether-provider", "3.3.9")
 
   implementation("com.github.zafarkhaja:java-semver:0.10.2")
-  implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
+  implementation(libs.javaparser.symbol.solver)
 
-  implementation("com.google.guava", "guava", "20.0")
   implementation(libs.asm)
   implementation(libs.asm.tree)
 
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java
index 44b32c3bf87..666a460a3d1 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/TypeResolver.java
@@ -1,6 +1,6 @@
 package datadog.trace.plugin.csi;
 
-import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
+import com.github.javaparser.resolution.TypeSolver;
 import datadog.trace.plugin.csi.HasErrors.HasErrorsException;
 import datadog.trace.plugin.csi.util.MethodType;
 import java.lang.reflect.Executable;
diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java
index 0cfa4eadf9b..f1d5159a46a 100644
--- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java
+++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/TypeResolverPool.java
@@ -3,9 +3,9 @@
 import static datadog.trace.plugin.csi.util.CallSiteUtils.classNameToType;
 import static datadog.trace.plugin.csi.util.CallSiteUtils.repeat;
 
+import com.github.javaparser.resolution.TypeSolver;
 import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
-import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
-import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
+import com.github.javaparser.resolution.model.SymbolReference;
 import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFactory;
 import datadog.trace.plugin.csi.HasErrors.Failure;
 import datadog.trace.plugin.csi.TypeResolver;
@@ -147,7 +147,13 @@ public SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveType(final St
       final Class<?> clazz = resolveType(type);
       return SymbolReference.solved(ReflectionFactory.typeDeclarationFor(clazz, getRoot()));
     } catch (final Throwable e) {
-      return SymbolReference.unsolved(ResolvedReferenceTypeDeclaration.class);
+      return SymbolReference.unsolved();
     }
   }
+
+  @Override
+  public SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveTypeInModule(
+      String qualifiedModuleName, String simpleTypeName) {
+    return tryToSolveType(simpleTypeName);
+  }
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile
index 174cd83af29..245eff58e71 100644
--- a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile
+++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile
@@ -13,8 +13,8 @@ com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileCla
 com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath
 com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.24.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.javaparser:javaparser-core:3.25.6=codenarc
+com.github.javaparser:javaparser-core:3.28.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jffi:1.3.15=latestDepTestRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-constants:0.10.4=latestDepTestRuntimeClasspath,testRuntimeClasspath
diff --git a/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile b/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile
index 03f8831845c..e8480656f44 100644
--- a/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile
+++ b/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile
@@ -20,8 +20,8 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.0=compileClasspath
 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.0=compileClasspath
 com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.0=compileClasspath
 com.fasterxml:classmate:1.3.4=compileClasspath
-com.github.javaparser:javaparser-core:3.24.4=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.github.javaparser:javaparser-core:3.25.6=codenarc
+com.github.javaparser:javaparser-core:3.28.2=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jffi:1.3.15=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-constants:0.10.4=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
diff --git a/dd-smoke-tests/springboot-java-17/gradle.lockfile b/dd-smoke-tests/springboot-java-17/gradle.lockfile
index 9edefd1e028..c5cef077ac3 100644
--- a/dd-smoke-tests/springboot-java-17/gradle.lockfile
+++ b/dd-smoke-tests/springboot-java-17/gradle.lockfile
@@ -13,8 +13,8 @@ com.datadoghq:dd-instrument-java:0.0.4=testCompileClasspath,testRuntimeClasspath
 com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath
 com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath
 com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.24.4=testRuntimeClasspath
 com.github.javaparser:javaparser-core:3.25.6=codenarc
+com.github.javaparser:javaparser-core:3.28.2=testRuntimeClasspath
 com.github.jnr:jffi:1.3.15=testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=testRuntimeClasspath
 com.github.jnr:jnr-constants:0.10.4=testRuntimeClasspath
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 601f72be16e..2fa5b467c0c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -53,7 +53,7 @@ cafe_crypto = "0.1.0"
 # Common utils
 commons = "3.2"
 guava = "[16.0,20.0]" # Last version to support Java 7
-javaparser = "3.24.4"
+javaparser = "3.28.2"
 jctools = "4.0.6"
 lz4 = "1.11.0"