Skip to content

Commit

Permalink
PP-11652 Upgrade from Dropwizard 3.0.1 to Dropwizard 3.0.2
Browse files Browse the repository at this point in the history 
• Upgrade Dropwizard from 3.0,1 to 3.0.2
• Upgrade WireMock from 2.35.1 to 3.2.0
• Use more Maven BOMs for dependencies
• Separate dependencies into those imported from BOMs and others
  • Loading branch information
@alexbishop1
alexbishop1 committed Oct 20, 2023
1 parent 8d6ba00 commit aa07598
Showing 1 changed file with 142 additions and 120 deletions.
262 changes: 142 additions & 120 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
<version>0.1-SNAPSHOT</version>
<artifactId>pay-adminusers</artifactId>

<parent>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-dependencies</artifactId>
<version>3.0.1</version>
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hamcrest.version>2.2</hamcrest.version>
Expand All @@ -20,54 +14,47 @@
<pay-java-commons.version>1.0.20231017121422</pay-java-commons.version>
<prometheus.version>0.16.0</prometheus.version>
<swaggger-version>2.2.10</swaggger-version>
<testcontainers.version>1.19.0</testcontainers.version>
<wiremock.version>2.35.1</wiremock.version>
<surefire.version>3.1.2</surefire.version>
<PACT_BROKER_URL/>
<PACT_BROKER_USERNAME/>
<PACT_BROKER_PASSWORD/>
<PACT_CONSUMER_VERSION/>
<PACT_CONSUMER_TAG/>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-dependencies</artifactId>
<version>3.0.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice-bom</artifactId>
<version>5.1.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>1.12.566</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
<version>${prometheus.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_servlet</artifactId>
<version>${prometheus.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_dropwizard</artifactId>
<version>${prometheus.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.service.payments</groupId>
<artifactId>logging-dropwizard-3</artifactId>
<version>${pay-java-commons.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.service.payments</groupId>
<artifactId>model</artifactId>
<version>${pay-java-commons.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.service.payments</groupId>
<artifactId>queue</artifactId>
<version>${pay-java-commons.version}</version>
</dependency>
<!-- Main dependencies that are imported from one of the BOMs specified
in <dependencyManagement> so no explicit versions needed -->
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-auth</artifactId>
Expand All @@ -85,9 +72,16 @@
<artifactId>dropwizard-migrations</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-persist</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-assistedinject</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -122,29 +116,43 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
<version>${eclipselink.version}</version>
<scope>compile</scope>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-persist</artifactId>
<version>${guice.version}</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-assistedinject</artifactId>
<version>${guice.version}</version>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sqs</artifactId>
</dependency>

<!-- Main dependencies that need explicit versions -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
<version>${eclipselink.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mindrot</groupId>
Expand All @@ -167,10 +175,6 @@
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>uk.gov.service.notify</groupId>
<artifactId>notifications-java-client</artifactId>
Expand All @@ -186,44 +190,97 @@
<artifactId>libphonenumber</artifactId>
<version>8.13.23</version>
</dependency>
<dependency>
<groupId>uk.gov.service.payments</groupId>
<artifactId>utils</artifactId>
<version>${pay-java-commons.version}</version>
</dependency>
<dependency>
<groupId>org.dhatim</groupId>
<artifactId>dropwizard-sentry</artifactId>
<version>2.1.2-4</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sqs</artifactId>
<version>1.12.566</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swaggger-version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
<version>${prometheus.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_servlet</artifactId>
<version>${prometheus.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_dropwizard</artifactId>
<version>${prometheus.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.service.payments</groupId>
<artifactId>model</artifactId>
<version>${pay-java-commons.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.service.payments</groupId>
<artifactId>queue</artifactId>
<version>${pay-java-commons.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.service.payments</groupId>
<artifactId>utils</artifactId>
<version>${pay-java-commons.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.service.payments</groupId>
<artifactId>logging-dropwizard-3</artifactId>
<version>${pay-java-commons.version}</version>
</dependency>

<!-- testing -->
<!-- Test dependencies that are imported from one of the BOMs specified
in <dependencyManagement> so no explicit versions needed -->
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.dropwizard.modules</groupId>
<artifactId>dropwizard-testing-junit4</artifactId>
<version>3.0.0</version>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-jdbi3</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<!-- Test dependencies that need explicit versions -->
<dependency>
<groupId>io.dropwizard.modules</groupId>
<artifactId>dropwizard-testing-junit4</artifactId>
<version>3.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
Expand All @@ -248,11 +305,6 @@
<version>2.0.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-jdbi3</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.exparity</groupId>
<artifactId>hamcrest-date</artifactId>
Expand All @@ -277,58 +329,28 @@
<version>1.9.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.gov.service.payments</groupId>
<artifactId>testing</artifactId>
<version>${pay-java-commons.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path-assert</artifactId>
<version>2.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swaggger-version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>${testcontainers.version}</version>
<version>1.19.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<version>${wiremock.version}</version>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<version>3.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<groupId>uk.gov.service.payments</groupId>
<artifactId>testing</artifactId>
<version>${pay-java-commons.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit aa07598

Please sign in to comment.