Bump dependencies

browserup-proxy-core/build.gradle

@@ -96,7 +96,7 @@ dependencies {
     testImplementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
     testImplementation "org.eclipse.jetty:jetty-servlets:${jettyVersion}"
     testImplementation "org.hamcrest:hamcrest:${hamcrestVersion}"
-    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.0'
+    testImplementation 'org.wiremock:wiremock:3.0.4'
     testImplementation 'org.mockito:mockito-core:5.15.2'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
 }

browserup-proxy-core/src/test/groovy/com/browserup/bup/mitmproxy/NewHarTest.groovy

@@ -27,7 +27,10 @@ import java.text.SimpleDateFormat
 import java.util.concurrent.TimeUnit
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*
-import static org.hamcrest.Matchers.*
+import static org.hamcrest.Matchers.empty
+import static org.hamcrest.Matchers.greaterThan
+import static org.hamcrest.Matchers.hasSize
+import static org.hamcrest.Matchers.not
 import static org.hamcrest.MatcherAssert.assertThat
 import static org.junit.Assert.*
 import static org.mockito.Mockito.mock

browserup-proxy-dist/src/main/java/com/browserup/bup/proxy/Main.java

@@ -15,7 +15,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextEvent;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;

browserup-proxy-rest-clients/build.gradle

@@ -133,7 +133,7 @@ dependencies {
     testImplementation "org.seleniumhq.selenium:selenium-api:${seleniumVersion}"
     testImplementation 'org.awaitility:awaitility:4.2.2'
     testImplementation "io.github.littleproxy:littleproxy:${littleProxyVersion}"
-    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.0'
+    testImplementation 'org.wiremock:wiremock:3.0.4'
     testImplementation 'org.testcontainers:testcontainers:1.20.4'
 }
 

browserup-proxy-rest-clients/src/test/groovy/com/browserup/bup/WithRunningProxyRestTest.groovy

@@ -22,7 +22,7 @@ import org.junit.Rule
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-import javax.servlet.ServletContextEvent
+import jakarta.servlet.ServletContextEvent
 import java.util.concurrent.TimeUnit
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*

browserup-proxy-rest/build.gradle

@@ -80,11 +80,11 @@ dependencies {
     implementation "org.glassfish.jersey.inject:jersey-hk2:${jerseyVersion}"
     implementation "org.glassfish.jersey.ext:jersey-bean-validation:${jerseyVersion}"
 
-    implementation "io.swagger.core.v3:swagger-jaxrs2:${swaggerVersion}"
-    implementation "io.swagger.core.v3:swagger-core:${swaggerVersion}"
-    implementation "io.swagger.core.v3:swagger-integration:${swaggerVersion}"
-    implementation "io.swagger.core.v3:swagger-jaxrs2-servlet-initializer:${swaggerVersion}"
-    implementation "io.swagger.core.v3:swagger-models:${swaggerVersion}"
+    implementation "io.swagger.core.v3:swagger-jaxrs2-jakarta:${swaggerVersion}"
+    implementation "io.swagger.core.v3:swagger-core-jakarta:${swaggerVersion}"
+    implementation "io.swagger.core.v3:swagger-integration-jakarta:${swaggerVersion}"
+    implementation "io.swagger.core.v3:swagger-jaxrs2-servlet-initializer-jakarta:${swaggerVersion}"
+    implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerVersion}"
 
     testImplementation project(':browserup-proxy-mitm')
 
@@ -99,7 +99,7 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:5.15.2'
     testImplementation "org.seleniumhq.selenium:selenium-api:${seleniumVersion}"
     testImplementation 'org.awaitility:awaitility:4.2.2'
-    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.0'
+    testImplementation 'org.wiremock:wiremock:3.0.4'
 }
 
 signing {

browserup-proxy-rest/src/main/java/com/browserup/bup/proxy/guice/JettyServerProvider.java

@@ -13,6 +13,8 @@
 import java.util.EnumSet;
 
 import io.swagger.v3.jaxrs2.integration.resources.OpenApiResource;
+import jakarta.servlet.DispatcherType;
+
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
@@ -24,8 +26,6 @@
 import org.glassfish.jersey.server.ServerProperties;
 import org.glassfish.jersey.servlet.ServletContainer;
 
-import javax.servlet.DispatcherType;
-
 public class JettyServerProvider implements Provider<Server> {
     public static final String OPENAPI_CONFIG_YAML = "openapi-config.yaml";
     public static final String OPENAPI_PACKAGE = "com.browserup.bup.rest.resource";

browserup-proxy-rest/src/main/java/com/browserup/bup/rest/filter/LoggingFilter.java

@@ -3,8 +3,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
 
 public class LoggingFilter implements ContainerRequestFilter {
     private static final Logger LOG = LoggerFactory.getLogger(LoggingFilter.class);

browserup-proxy-rest/src/main/java/com/browserup/bup/rest/openapi/CustomOpenApiReader.java

@@ -16,9 +16,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Method;

browserup-proxy-rest/src/main/java/com/browserup/bup/rest/resource/entries/EntriesProxyResource.java

@@ -24,14 +24,14 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.Collection;
 import java.util.regex.Pattern;
 

browserup-proxy-rest/src/main/java/com/browserup/bup/rest/resource/mostrecent/MostRecentEntryProxyResource.java

@@ -19,13 +19,13 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
 import java.util.regex.Pattern;
 
 import static com.browserup.bup.rest.openapi.DocConstants.*;

browserup-proxy-rest/src/main/java/com/browserup/bup/rest/validation/HttpStatusCodeConstraint.java

@@ -3,10 +3,10 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

browserup-proxy-rest/src/main/java/com/browserup/bup/rest/validation/LongPositiveConstraint.java

@@ -3,10 +3,10 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
 
 import com.browserup.bup.rest.validation.util.MessageSanitizer;
 import org.slf4j.Logger;

browserup-proxy-rest/src/main/java/com/browserup/bup/rest/validation/NotBlankConstraint.java

@@ -3,10 +3,10 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
 
 import com.browserup.bup.rest.validation.util.MessageSanitizer;
 import org.apache.commons.lang3.StringUtils;

browserup-proxy-rest/src/main/java/com/browserup/bup/rest/validation/NotNullConstraint.java

@@ -3,10 +3,10 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

browserup-proxy-rest/src/main/java/com/browserup/bup/rest/validation/PatternConstraint.java

@@ -4,10 +4,10 @@
 import java.lang.annotation.RetentionPolicy;
 import java.util.regex.Pattern;
 
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
 
 import com.browserup.bup.rest.validation.util.MessageSanitizer;
 import org.apache.commons.lang3.StringUtils;

browserup-proxy-rest/src/main/java/com/browserup/bup/rest/validation/PortWithExistingProxyConstraint.java

@@ -3,11 +3,11 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
-import javax.ws.rs.core.Context;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
+import jakarta.ws.rs.core.Context;
 
 import com.browserup.bup.proxy.MitmProxyManager;
 

browserup-proxy-rest/src/main/java/com/browserup/bup/rest/validation/mapper/ConstraintViolationExceptionMapper.java

@@ -3,11 +3,11 @@
 import com.browserup.bup.rest.validation.mapper.model.ConstraintsErrors;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
 
 public class ConstraintViolationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
     private static final String PARAMETER_NAME_ATTRIBUTE = "paramName";

browserup-proxy-rest/src/test/groovy/com/browserup/bup/proxy/mitmproxy/WithRunningProxyRestTest.groovy

@@ -23,7 +23,7 @@ import org.junit.Rule
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-import javax.servlet.ServletContextEvent
+import jakarta.servlet.ServletContextEvent
 import java.util.concurrent.TimeUnit
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*

browserup-proxy-rest/src/test/groovy/com/browserup/bup/proxy/mitmproxy/validation/HttpStatusCodeConstraintTest.groovy

@@ -5,7 +5,7 @@ import org.junit.Assert
 import org.junit.Test
 import org.mockito.Mockito
 
-import javax.validation.ConstraintValidatorContext
+import jakarta.validation.ConstraintValidatorContext
 
 import static org.mockito.ArgumentMatchers.any
 import static org.mockito.Mockito.mock

browserup-proxy-rest/src/test/groovy/com/browserup/bup/proxy/mitmproxy/validation/LongPositiveConstraintTest.groovy

@@ -5,7 +5,7 @@ import org.junit.Assert
 import org.junit.Test
 import org.mockito.Mockito
 
-import javax.validation.ConstraintValidatorContext
+import jakarta.validation.ConstraintValidatorContext
 
 import static org.mockito.ArgumentMatchers.any
 import static org.mockito.Mockito.mock

browserup-proxy-rest/src/test/groovy/com/browserup/bup/proxy/mitmproxy/validation/PatternConstraintTest.groovy

@@ -5,7 +5,7 @@ import org.junit.Assert
 import org.junit.Test
 import org.mockito.Mockito
 
-import javax.validation.ConstraintValidatorContext
+import jakarta.validation.ConstraintValidatorContext
 
 import static org.mockito.ArgumentMatchers.any
 import static org.mockito.Mockito.mock

browserup-proxy-rest/src/test/groovy/com/browserup/bup/proxy/mitmproxy/validation/PortWithExistingProxyConstraintTest.groovy

@@ -6,7 +6,7 @@ import com.browserup.bup.rest.validation.PortWithExistingProxyConstraint
 import org.junit.Assert
 import org.junit.Test
 
-import javax.validation.ConstraintValidatorContext
+import jakarta.validation.ConstraintValidatorContext
 
 import static org.mockito.ArgumentMatchers.*
 import static org.mockito.Mockito.mock

build.gradle

@@ -10,10 +10,10 @@ subprojects {
 
     ext {
         bcpVersion = '1.80'
-        guiceVersion = '6.0.0'
+        guiceVersion = '7.0.0'
         jacksonVersion = '2.18.2'
-        jerseyVersion = '2.46'
-        jettyVersion = '9.4.57.v20241219'
+        jerseyVersion = '3.0.0'
+        jettyVersion = '11.0.24'
         log4jVersion = '2.24.3'
         nettyVersion = '4.1.117.Final'
         littleProxyVersion = '2.4.0'