Merge pull request #1501 from alphagov/PP-13658-upgrade_modules_to_dropwizard_4

PP-13658 upgrade modules to dropwizard 4

Author: SandorArpa

.github/dependabot.yml

@@ -7,21 +7,13 @@ updates:
       interval: daily
       time: "03:00"
     ignore:
-      - dependency-name: "io.dropwizard:dropwizard-dependencies"
-        # Dropwizard 4.x only works with Jakarta EE and not Java EE
-        versions:
-          - ">= 4"
       - dependency-name: "org.dhatim:dropwizard-sentry"
         # We essentially forked Dropwizard Sentry because it did not support
         # Dropwizard 3.x — there is now a Dropwizard Sentry 4.x, which supports
         # Dropwizard 4.x (and maybe Dropwizard 3.x), but we’d need to do work
         # to go back to using an unmodified version
         versions:
           - ">= 4"
-      - dependency-name: "com.google.inject:guice-bom"
-        # Guice 7.x only works with Jakarta EE and not Java EE
-        versions:
-          - ">= 7"
     open-pull-requests-limit: 10
     labels:
       - dependencies

pom.xml

@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>io.dropwizard</groupId>
                 <artifactId>dropwizard-dependencies</artifactId>
-                <version>3.0.13</version>
+                <version>4.0.13</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -47,7 +47,7 @@
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice-bom</artifactId>
-                <version>6.0.0</version>
+                <version>7.0.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -74,12 +74,6 @@
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.inject</groupId>
-                    <artifactId>jakarta.inject-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>
@@ -96,12 +90,6 @@
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.inject</groupId>
-                    <artifactId>jakarta.inject-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.inject.extensions</groupId>
@@ -144,7 +132,7 @@
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
-            <artifactId>simpleclient_servlet</artifactId>
+            <artifactId>simpleclient_servlet_jakarta</artifactId>
             <version>${prometheus.version}</version>
         </dependency>
         <dependency>
@@ -154,7 +142,7 @@
         </dependency>
         <dependency>
             <groupId>com.vladmihalcea</groupId>
-            <artifactId>hibernate-types-55</artifactId>
+            <artifactId>hibernate-types-60</artifactId>
             <version>2.21.1</version>
         </dependency>
         <dependency>
@@ -164,17 +152,17 @@
         </dependency>
         <dependency>
             <groupId>uk.gov.service.payments</groupId>
-            <artifactId>utils</artifactId>
+            <artifactId>utils-dropwizard-4</artifactId>
             <version>${pay-java-commons.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.service.payments</groupId>
-            <artifactId>model</artifactId>
+            <artifactId>model-dropwizard-4</artifactId>
             <version>${pay-java-commons.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.service.payments</groupId>
-            <artifactId>logging-dropwizard-3</artifactId>
+            <artifactId>logging-dropwizard-4</artifactId>
             <version>${pay-java-commons.version}</version>
         </dependency>
         <dependency>
@@ -258,7 +246,7 @@
         </dependency>
         <dependency>
             <groupId>uk.gov.service.payments</groupId>
-            <artifactId>testing</artifactId>
+            <artifactId>testing-dropwizard-4</artifactId>
             <version>${pay-java-commons.version}</version>
             <scope>test</scope>
         </dependency>
@@ -381,7 +369,7 @@
             </plugin>
             <plugin>
                 <groupId>io.swagger.core.v3</groupId>
-                <artifactId>swagger-maven-plugin</artifactId>
+                <artifactId>swagger-maven-plugin-jakarta</artifactId>
                 <version>${swagger-version}</version>
                 <configuration>
                     <outputPath>openapi</outputPath>

src/main/java/uk/gov/pay/webhooks/app/IdleConnectionMonitor.java

@@ -6,7 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 

src/main/java/uk/gov/pay/webhooks/app/InternalRestClientConfig.java

@@ -1,6 +1,6 @@
 package uk.gov.pay.webhooks.app;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 public class InternalRestClientConfig {
     @Valid

src/main/java/uk/gov/pay/webhooks/app/InternalRestClientFactory.java

@@ -3,8 +3,8 @@
 import uk.gov.service.payments.logging.RestClientLoggingFilter;
 
 import javax.net.ssl.SSLContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 

src/main/java/uk/gov/pay/webhooks/app/QueueMessageReceiverConfig.java

@@ -2,8 +2,8 @@
 
 import io.dropwizard.core.Configuration;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 public class QueueMessageReceiverConfig extends Configuration {
 

src/main/java/uk/gov/pay/webhooks/app/SqsConfig.java

@@ -2,8 +2,8 @@
 
 import io.dropwizard.core.Configuration;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.NotNull;
 
 public class SqsConfig extends Configuration {
 

src/main/java/uk/gov/pay/webhooks/app/WebhookMessageDeletionConfig.java

@@ -1,7 +1,7 @@
 package uk.gov.pay.webhooks.app;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 public class WebhookMessageDeletionConfig {
 

src/main/java/uk/gov/pay/webhooks/app/WebhookMessageSendingQueueProcessorConfig.java

@@ -3,8 +3,8 @@
 import io.dropwizard.core.Configuration;
 import io.dropwizard.util.Duration;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 public class WebhookMessageSendingQueueProcessorConfig extends Configuration {
 

src/main/java/uk/gov/pay/webhooks/app/WebhooksApp.java

@@ -12,7 +12,7 @@
 import io.dropwizard.migrations.MigrationsBundle;
 import io.prometheus.client.CollectorRegistry;
 import io.prometheus.client.dropwizard.DropwizardExports;
-import io.prometheus.client.exporter.MetricsServlet;
+import io.prometheus.client.servlet.jakarta.exporter.MetricsServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import uk.gov.pay.webhooks.app.filters.LoggingMDCRequestFilter;
@@ -39,7 +39,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static java.util.EnumSet.of;
-import static javax.servlet.DispatcherType.REQUEST;
+import static jakarta.servlet.DispatcherType.REQUEST;
 
 public class WebhooksApp extends Application<WebhooksConfig> {