Update to Dropwizard 4

Author: eager-signal

api-doc/pom.xml

@@ -22,7 +22,7 @@
     <plugins>
       <plugin>
         <groupId>io.swagger.core.v3</groupId>
-        <artifactId>swagger-maven-plugin</artifactId>
+        <artifactId>swagger-maven-plugin-jakarta</artifactId>
         <version>${swagger.version}</version>
         <configuration>
           <outputFileName>signal-server-openapi</outputFileName>

api-doc/src/main/java/org/signal/openapi/OpenApiExtension.java

@@ -13,14 +13,14 @@
 import io.swagger.v3.jaxrs2.ext.AbstractOpenAPIExtension;
 import io.swagger.v3.jaxrs2.ext.OpenAPIExtension;
 import io.swagger.v3.oas.models.Components;
+import jakarta.ws.rs.Consumes;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.Set;
-import javax.ws.rs.Consumes;
 import org.whispersystems.textsecuregcm.auth.AuthenticatedDevice;
 
 /**

api-doc/src/main/java/org/signal/openapi/OpenApiReader.java

@@ -15,11 +15,11 @@
 import io.swagger.v3.jaxrs2.ResolvedParameter;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
+import jakarta.ws.rs.Consumes;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.List;
-import javax.ws.rs.Consumes;
 
 /**
  * One of the extension mechanisms of Swagger Core library (OpenAPI processor) is via custom implementations

integration-tests/src/main/java/org/signal/integration/Operations.java

@@ -10,6 +10,9 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.io.Resources;
 import com.google.common.net.HttpHeaders;
+import io.dropwizard.configuration.ConfigurationValidationException;
+import io.dropwizard.jersey.validation.Validators;
+import jakarta.validation.ConstraintViolation;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.net.URI;
@@ -26,8 +29,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Executors;
-import io.dropwizard.configuration.ConfigurationValidationException;
-import io.dropwizard.jersey.validation.Validators;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.tuple.Pair;
@@ -52,7 +53,6 @@
 import org.whispersystems.textsecuregcm.util.HeaderUtils;
 import org.whispersystems.textsecuregcm.util.HttpUtils;
 import org.whispersystems.textsecuregcm.util.SystemMapper;
-import javax.validation.ConstraintViolation;
 
 public final class Operations {
 

integration-tests/src/main/java/org/signal/integration/config/Config.java

@@ -5,9 +5,9 @@
 
 package org.signal.integration.config;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import org.whispersystems.textsecuregcm.configuration.DynamoDbClientFactory;
 
 public record Config(@NotBlank String domain,

integration-tests/src/main/java/org/signal/integration/config/DynamoDbTables.java

@@ -5,7 +5,7 @@
 
 package org.signal.integration.config;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 public record DynamoDbTables(@NotBlank String registrationRecovery,
                              @NotBlank String verificationSessions) {

pom.xml

@@ -41,9 +41,10 @@
     <braintree.version>3.37.0</braintree.version>
     <commons-csv.version>1.12.0</commons-csv.version>
     <commons-io.version>2.17.0</commons-io.version>
-    <dropwizard.version>3.0.10</dropwizard.version>
+    <dropwizard.version>4.0.10</dropwizard.version>
     <dropwizard-metrics-datadog.version>1.1.13</dropwizard-metrics-datadog.version>
-    <dynamodblocal.version>1.23.0</dynamodblocal.version>
+    <!-- can be updated to latest version with Dropwizard 5 (Jetty 12) -->
+    <dynamodblocal.version>2.2.1</dynamodblocal.version>
     <google-cloud-libraries.version>26.50.0</google-cloud-libraries.version>
     <grpc.version>1.61.1</grpc.version> <!-- should be kept in sync with the value from Google libraries-bom -->
     <gson.version>2.11.0</gson.version>
@@ -318,9 +319,8 @@
     </dependency>
     <dependency>
       <groupId>org.wiremock</groupId>
-      <!-- use standalone until Dropwizard 4 + jakarta.* -->
-      <artifactId>wiremock-standalone</artifactId>
-      <version>3.3.1</version>
+      <artifactId>wiremock</artifactId>
+      <version>3.9.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

service/pom.xml

@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
-      <artifactId>swagger-jaxrs2</artifactId>
+      <artifactId>swagger-jaxrs2-jakarta</artifactId>
       <version>${swagger.version}</version>
     </dependency>
     <dependency>

service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java

@@ -6,13 +6,13 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.core.Configuration;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import org.whispersystems.textsecuregcm.attachments.TusConfiguration;
 import org.whispersystems.textsecuregcm.configuration.ApnConfiguration;
 import org.whispersystems.textsecuregcm.configuration.AppleAppStoreConfiguration;
@@ -30,8 +30,8 @@
 import org.whispersystems.textsecuregcm.configuration.DynamoDbClientFactory;
 import org.whispersystems.textsecuregcm.configuration.DynamoDbTables;
 import org.whispersystems.textsecuregcm.configuration.ExternalRequestFilterConfiguration;
-import org.whispersystems.textsecuregcm.configuration.FaultTolerantRedisClusterFactory;
 import org.whispersystems.textsecuregcm.configuration.FaultTolerantRedisClientFactory;
+import org.whispersystems.textsecuregcm.configuration.FaultTolerantRedisClusterFactory;
 import org.whispersystems.textsecuregcm.configuration.FcmConfiguration;
 import org.whispersystems.textsecuregcm.configuration.GcpAttachmentsConfiguration;
 import org.whispersystems.textsecuregcm.configuration.GenericZkConfig;

service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java

@@ -33,6 +33,9 @@
 import io.netty.resolver.ResolvedAddressTypes;
 import io.netty.resolver.dns.DnsNameResolver;
 import io.netty.resolver.dns.DnsNameResolverBuilder;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.ServletRegistration;
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.net.http.HttpClient;
@@ -59,11 +62,6 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.ServletRegistration;
-import org.eclipse.jetty.servlets.CrossOriginFilter;
 import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.glassfish.jersey.server.ServerProperties;
 import org.signal.i18n.HeaderControlledResourceBundleLookup;
@@ -194,13 +192,13 @@
 import org.whispersystems.textsecuregcm.push.FcmSender;
 import org.whispersystems.textsecuregcm.push.MessageSender;
 import org.whispersystems.textsecuregcm.push.ProvisioningManager;
-import org.whispersystems.textsecuregcm.push.WebSocketConnectionEventManager;
 import org.whispersystems.textsecuregcm.push.PushNotificationManager;
 import org.whispersystems.textsecuregcm.push.PushNotificationScheduler;
 import org.whispersystems.textsecuregcm.push.ReceiptSender;
+import org.whispersystems.textsecuregcm.push.WebSocketConnectionEventManager;
 import org.whispersystems.textsecuregcm.redis.ConnectionEventLogger;
-import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClusterClient;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClient;
+import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClusterClient;
 import org.whispersystems.textsecuregcm.registration.RegistrationServiceClient;
 import org.whispersystems.textsecuregcm.s3.PolicySigner;
 import org.whispersystems.textsecuregcm.s3.PostPolicyGenerator;