Skip to content

Commit 23b8425

Browse files
SandorArpaSandorArpa
authored
Merge pull request #3791 from alphagov/PP-13654-upgrade_modules_to_dropwizard_4
PP-13654 upgrade modules to dropwizard 4
2 parents d1a8471 + d31e0b7 commit 23b8425

52 files changed

Lines changed: 173 additions & 192 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 22 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<dependency>
2626
<groupId>io.dropwizard</groupId>
2727
<artifactId>dropwizard-dependencies</artifactId>
28-
<version>3.0.13</version>
28+
<version>4.0.13</version>
2929
<type>pom</type>
3030
<scope>import</scope>
3131
</dependency>
3232
<dependency>
3333
<groupId>com.google.inject</groupId>
3434
<artifactId>guice-bom</artifactId>
35-
<version>6.0.0</version>
35+
<version>7.0.0</version>
3636
<type>pom</type>
3737
<scope>import</scope>
3838
</dependency>
@@ -59,22 +59,10 @@
5959
<dependency>
6060
<groupId>io.dropwizard</groupId>
6161
<artifactId>dropwizard-core</artifactId>
62-
<exclusions>
63-
<exclusion>
64-
<groupId>jakarta.inject</groupId>
65-
<artifactId>jakarta.inject-api</artifactId>
66-
</exclusion>
67-
</exclusions>
6862
</dependency>
6963
<dependency>
7064
<groupId>io.dropwizard</groupId>
7165
<artifactId>dropwizard-auth</artifactId>
72-
<exclusions>
73-
<exclusion>
74-
<groupId>jakarta.inject</groupId>
75-
<artifactId>jakarta.inject-api</artifactId>
76-
</exclusion>
77-
</exclusions>
7866
</dependency>
7967
<dependency>
8068
<groupId>io.dropwizard</groupId>
@@ -103,12 +91,6 @@
10391
<dependency>
10492
<groupId>com.google.inject</groupId>
10593
<artifactId>guice</artifactId>
106-
<exclusions>
107-
<exclusion>
108-
<groupId>jakarta.inject</groupId>
109-
<artifactId>jakarta.inject-api</artifactId>
110-
</exclusion>
111-
</exclusions>
11294
</dependency>
11395
<dependency>
11496
<groupId>org.apache.commons</groupId>
@@ -130,6 +112,10 @@
130112
<groupId>com.amazonaws</groupId>
131113
<artifactId>aws-java-sdk-sqs</artifactId>
132114
</dependency>
115+
<dependency>
116+
<groupId>com.google.guava</groupId>
117+
<artifactId>guava</artifactId>
118+
</dependency>
133119

134120
<!-- Main dependencies that need explicit versions -->
135121
<dependency>
@@ -139,7 +125,7 @@
139125
</dependency>
140126
<dependency>
141127
<groupId>io.prometheus</groupId>
142-
<artifactId>simpleclient_servlet</artifactId>
128+
<artifactId>simpleclient_servlet_jakarta</artifactId>
143129
<version>${prometheus.version}</version>
144130
</dependency>
145131
<dependency>
@@ -159,39 +145,33 @@
159145
</dependency>
160146
<dependency>
161147
<groupId>uk.gov.service.payments</groupId>
162-
<artifactId>model</artifactId>
148+
<artifactId>model-dropwizard-4</artifactId>
163149
<version>${pay-java-commons.version}</version>
164150
</dependency>
165151
<dependency>
166152
<groupId>uk.gov.service.payments</groupId>
167-
<artifactId>utils</artifactId>
153+
<artifactId>utils-dropwizard-4</artifactId>
168154
<version>${pay-java-commons.version}</version>
169155
</dependency>
170156
<dependency>
171157
<groupId>uk.gov.service.payments</groupId>
172-
<artifactId>validation</artifactId>
158+
<artifactId>validation-dropwizard-4</artifactId>
173159
<version>${pay-java-commons.version}</version>
174160
</dependency>
175161
<dependency>
176162
<groupId>uk.gov.service.payments</groupId>
177-
<artifactId>logging-dropwizard-3</artifactId>
163+
<artifactId>logging-dropwizard-4</artifactId>
178164
<version>${pay-java-commons.version}</version>
179165
</dependency>
180166
<dependency>
181167
<groupId>uk.gov.service.payments</groupId>
182-
<artifactId>queue</artifactId>
168+
<artifactId>queue-dropwizard-4</artifactId>
183169
<version>${pay-java-commons.version}</version>
184170
</dependency>
185171
<dependency>
186-
<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
187-
<artifactId>jersey-guava</artifactId>
188-
<version>2.25.1</version>
189-
</dependency>
190-
<dependency>
191-
<groupId>javax.xml.bind</groupId>
192-
<artifactId>jaxb-api</artifactId>
193-
<version>2.3.1</version>
194-
<scope>compile</scope>
172+
<groupId>jakarta.xml.bind</groupId>
173+
<artifactId>jakarta.xml.bind-api</artifactId>
174+
<version>4.0.2</version>
195175
</dependency>
196176
<dependency>
197177
<groupId>software.amazon.awssdk</groupId>
@@ -222,13 +202,13 @@
222202
<dependency>
223203
<groupId>org.eclipse.persistence</groupId>
224204
<artifactId>org.eclipse.persistence.jpa</artifactId>
225-
<version>2.7.15</version>
205+
<version>4.0.5</version>
226206
<scope>compile</scope>
227207
</dependency>
228208
<dependency>
229-
<groupId>jakarta.inject</groupId>
230-
<artifactId>jakarta.inject-api</artifactId>
231-
<version>2.0.1</version>
209+
<groupId>jakarta.annotation</groupId>
210+
<artifactId>jakarta.annotation-api</artifactId>
211+
<version>3.0.0</version>
232212
</dependency>
233213

234214
<!-- Test dependencies that are imported from one of the BOMs specified
@@ -280,7 +260,7 @@
280260
<dependency>
281261
<groupId>io.dropwizard.modules</groupId>
282262
<artifactId>dropwizard-testing-junit4</artifactId>
283-
<version>3.0.13</version>
263+
<version>4.0.13</version>
284264
<scope>test</scope>
285265
</dependency>
286266
<dependency>
@@ -291,7 +271,7 @@
291271
</dependency>
292272
<dependency>
293273
<groupId>uk.gov.service.payments</groupId>
294-
<artifactId>testing</artifactId>
274+
<artifactId>testing-dropwizard-4</artifactId>
295275
<version>${pay-java-commons.version}</version>
296276
<scope>test</scope>
297277
</dependency>
@@ -459,7 +439,7 @@
459439
</plugin>
460440
<plugin>
461441
<groupId>io.swagger.core.v3</groupId>
462-
<artifactId>swagger-maven-plugin</artifactId>
442+
<artifactId>swagger-maven-plugin-jakarta</artifactId>
463443
<version>${swagger.version}</version>
464444
<configuration>
465445
<outputPath>openapi</outputPath>

‎src/main/java/uk/gov/pay/ledger/agreement/resource/AgreementResource.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@
88
import io.swagger.v3.oas.annotations.media.Schema;
99
import io.swagger.v3.oas.annotations.responses.ApiResponse;
1010
import io.swagger.v3.oas.annotations.tags.Tag;
11+
import jakarta.validation.Valid;
1112
import uk.gov.pay.ledger.agreement.model.Agreement;
1213
import uk.gov.pay.ledger.agreement.model.AgreementEventsResponse;
1314
import uk.gov.pay.ledger.agreement.model.AgreementSearchResponse;
1415
import uk.gov.pay.ledger.agreement.service.AgreementService;
1516

16-
import javax.validation.Valid;
17-
import javax.ws.rs.BeanParam;
18-
import javax.ws.rs.GET;
19-
import javax.ws.rs.HeaderParam;
20-
import javax.ws.rs.Path;
21-
import javax.ws.rs.PathParam;
22-
import javax.ws.rs.Produces;
23-
import javax.ws.rs.QueryParam;
24-
import javax.ws.rs.WebApplicationException;
25-
import javax.ws.rs.core.Context;
26-
import javax.ws.rs.core.Response;
27-
import javax.ws.rs.core.UriInfo;
17+
import jakarta.ws.rs.BeanParam;
18+
import jakarta.ws.rs.GET;
19+
import jakarta.ws.rs.HeaderParam;
20+
import jakarta.ws.rs.Path;
21+
import jakarta.ws.rs.PathParam;
22+
import jakarta.ws.rs.Produces;
23+
import jakarta.ws.rs.QueryParam;
24+
import jakarta.ws.rs.WebApplicationException;
25+
import jakarta.ws.rs.core.Context;
26+
import jakarta.ws.rs.core.Response;
27+
import jakarta.ws.rs.core.UriInfo;
2828
import java.util.Optional;
2929

30-
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
30+
import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
3131
import static uk.gov.pay.ledger.common.consistent.ConsistentKeys.HEADER_PARAM_X_CONSISTENT;
3232

3333
@Path("/v1/agreement")

‎src/main/java/uk/gov/pay/ledger/agreement/resource/AgreementSearchParams.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import uk.gov.pay.ledger.common.search.SearchParams;
77
import uk.gov.service.payments.commons.model.agreement.AgreementStatus;
88

9-
import javax.validation.constraints.AssertTrue;
10-
import javax.validation.constraints.NotNull;
11-
import javax.ws.rs.DefaultValue;
12-
import javax.ws.rs.QueryParam;
9+
import jakarta.validation.constraints.AssertTrue;
10+
import jakarta.validation.constraints.NotNull;
11+
import jakarta.ws.rs.DefaultValue;
12+
import jakarta.ws.rs.QueryParam;
1313
import java.util.ArrayList;
1414
import java.util.HashMap;
1515
import java.util.List;

‎src/main/java/uk/gov/pay/ledger/agreement/service/AgreementService.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
import uk.gov.pay.ledger.exception.EmptyEventsException;
1616
import uk.gov.pay.ledger.util.pagination.PaginationBuilder;
1717

18-
import javax.annotation.Nullable;
19-
import javax.ws.rs.WebApplicationException;
20-
import javax.ws.rs.core.Response;
21-
import javax.ws.rs.core.UriInfo;
18+
import jakarta.ws.rs.WebApplicationException;
19+
import jakarta.ws.rs.core.Response;
20+
import jakarta.ws.rs.core.UriInfo;
21+
22+
import jakarta.annotation.Nullable;
2223
import java.util.List;
2324
import java.util.Optional;
2425
import java.util.stream.Collectors;

‎src/main/java/uk/gov/pay/ledger/app/LedgerApp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import io.dropwizard.migrations.MigrationsBundle;
1414
import io.prometheus.client.CollectorRegistry;
1515
import io.prometheus.client.dropwizard.DropwizardExports;
16-
import io.prometheus.client.exporter.MetricsServlet;
16+
import io.prometheus.client.servlet.jakarta.exporter.MetricsServlet;
1717
import org.jdbi.v3.core.Jdbi;
1818
import org.slf4j.Logger;
1919
import org.slf4j.LoggerFactory;
@@ -38,7 +38,7 @@
3838
import uk.gov.service.payments.logging.SentryAppenderFactory;
3939

4040
import static java.util.EnumSet.of;
41-
import static javax.servlet.DispatcherType.REQUEST;
41+
import static jakarta.servlet.DispatcherType.REQUEST;
4242

4343
public class LedgerApp extends Application<LedgerConfig> {
4444

‎src/main/java/uk/gov/pay/ledger/app/LedgerConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import uk.gov.pay.ledger.app.config.SnsConfig;
1010
import uk.gov.pay.ledger.app.config.SqsConfig;
1111

12-
import javax.validation.Valid;
13-
import javax.validation.constraints.NotNull;
12+
import jakarta.validation.Valid;
13+
import jakarta.validation.constraints.NotNull;
1414
import java.net.URI;
1515
import java.util.Optional;
1616

‎src/main/java/uk/gov/pay/ledger/app/config/ExpungeOrRedactHistoricalDataConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33

44
import io.dropwizard.core.Configuration;
5+
import jakarta.validation.constraints.NotNull;
56

6-
import javax.validation.constraints.NotNull;
77

88
public class ExpungeOrRedactHistoricalDataConfig extends Configuration {
99

‎src/main/java/uk/gov/pay/ledger/app/config/QueueMessageReceiverConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import io.dropwizard.core.Configuration;
55

6-
import javax.validation.Valid;
7-
import javax.validation.constraints.NotNull;
6+
import jakarta.validation.Valid;
7+
import jakarta.validation.constraints.NotNull;
88

99
public class QueueMessageReceiverConfig extends Configuration {
1010

‎src/main/java/uk/gov/pay/ledger/app/config/ReportingConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import io.dropwizard.core.Configuration;
55

6-
import javax.validation.Valid;
6+
import jakarta.validation.Valid;
77

88
public class ReportingConfig extends Configuration {
99

‎src/main/java/uk/gov/pay/ledger/app/config/SnsConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import java.net.URI;
77

8-
import javax.validation.constraints.NotNull;
8+
import jakarta.validation.constraints.NotNull;
99

1010
public class SnsConfig extends Configuration {
1111

0 commit comments

Comments
 (0)