Skip to content

Commit

Permalink
BAU — Small tweaks to POM and Dependabot config
Browse files Browse the repository at this point in the history
• Use Dropwizard version property so we upgrade Dropwizard and
  Dropwizard Testing Support for JUnit 4.x in lockstep

• Use Testcontainers BOM

• Stop using EclipseLink version property because it’s only used in
  one place

• Remove unused Guice version property

• Tell Dependabot not to try to upgrade us to Guice 7.0.0, which
  migrates from Java EE to Jakarta EE and is never going to be a
  just-merge-it upgrade
  • Loading branch information
alexbishop1 committed Oct 26, 2023
1 parent 4320f08 commit 81228c6
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ updates:
- dependency-name: "io.dropwizard:dropwizard-dependencies"
versions:
- ">= 4"
- dependency-name: "com.google.inject:guice-bom"
versions:
- ">= 7"
open-pull-requests-limit: 10
labels:
- dependencies
Expand Down
27 changes: 16 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dropwizard.version>3.0.2</dropwizard.version>
<hamcrest.version>2.2</hamcrest.version>
<eclipselink.version>2.7.13</eclipselink.version>
<guice.version>5.1.0</guice.version>
<pact.version>3.6.15</pact.version>
<pay-java-commons.version>1.0.20231017121422</pay-java-commons.version>
<prometheus.version>0.16.0</prometheus.version>
Expand All @@ -27,7 +26,7 @@
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-dependencies</artifactId>
<version>3.0.2</version>
<version>${dropwizard.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -45,6 +44,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.19.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -151,7 +157,7 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
<version>${eclipselink.version}</version>
<version>2.7.13</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -273,12 +279,17 @@
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</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>
<version>${dropwizard.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -335,12 +346,6 @@
<version>2.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.19.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
Expand Down

0 comments on commit 81228c6

Please sign in to comment.