diff --git a/java/pom.xml b/java/pom.xml
index 799d43869..4d0a3ed41 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -13,7 +13,6 @@
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <jetty.version>9.4.51.v20230217</jetty.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -28,7 +27,7 @@
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>4.0.4</version>
+      <version>6.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -48,31 +47,18 @@
     </dependency>
 
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8</artifactId>
-      <version>2.35.1</version>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock</artifactId>
+      <version>3.13.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${jetty.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${jetty.version}</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>test</scope>
+      <artifactId>jetty-bom</artifactId>
+      <version>12.0.8</version>
+      <type>pom</type>
+      <scope>import</scope>
     </dependency>
   </dependencies>
 
diff --git a/java/src/main/java/com/coinbase/x402/server/PaymentFilter.java b/java/src/main/java/com/coinbase/x402/server/PaymentFilter.java
index 4b8d881af..3a2db67d8 100644
--- a/java/src/main/java/com/coinbase/x402/server/PaymentFilter.java
+++ b/java/src/main/java/com/coinbase/x402/server/PaymentFilter.java
@@ -10,13 +10,13 @@
 import com.coinbase.x402.model.SettlementResponseHeader;
 import com.coinbase.x402.util.Json;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
diff --git a/java/src/test/java/com/coinbase/x402/integration/FilterIntegrationTest.java b/java/src/test/java/com/coinbase/x402/integration/FilterIntegrationTest.java
index ec71ac28b..aa7ffd64b 100644
--- a/java/src/test/java/com/coinbase/x402/integration/FilterIntegrationTest.java
+++ b/java/src/test/java/com/coinbase/x402/integration/FilterIntegrationTest.java
@@ -4,9 +4,9 @@
 import com.coinbase.x402.client.VerificationResponse;
 import com.coinbase.x402.model.PaymentPayload;
 import com.coinbase.x402.server.PaymentFilter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
diff --git a/java/src/test/java/com/coinbase/x402/server/PaymentFilterTest.java b/java/src/test/java/com/coinbase/x402/server/PaymentFilterTest.java
index b5a2b6163..34aa9aa51 100644
--- a/java/src/test/java/com/coinbase/x402/server/PaymentFilterTest.java
+++ b/java/src/test/java/com/coinbase/x402/server/PaymentFilterTest.java
@@ -6,11 +6,11 @@
 import com.coinbase.x402.model.Authorization;
 import com.coinbase.x402.model.ExactSchemePayload;
 import com.coinbase.x402.model.PaymentPayload;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;