Skip to content

Commit 98a9676

Browse files
committed
upgrade to dropwizard 4.0.7
1 parent 4ccdd63 commit 98a9676

File tree

4 files changed

+27
-39
lines changed

4 files changed

+27
-39
lines changed

pom.xml

+17-29
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,36 @@
88
<name>Dropwizard Hello World application</name>
99

1010
<properties>
11-
<dropwizard.version>2.1.0</dropwizard.version>
12-
<junit.version>5.8.2</junit.version>
11+
<junit.version>5.10.2</junit.version>
1312
<logback.version>1.2.11</logback.version>
1413
<slf4j.version>1.7.36</slf4j.version>
1514
<skip.tests>false</skip.tests>
1615
<main.class>com.github.sullis.dropwizard.helloworld.HelloWorldApplication</main.class>
1716
</properties>
1817

18+
<dependencyManagement>
19+
<dependencies>
20+
<dependency>
21+
<groupId>io.dropwizard</groupId>
22+
<artifactId>dropwizard-bom</artifactId>
23+
<version>4.0.7</version>
24+
<type>pom</type>
25+
<scope>import</scope>
26+
</dependency>
27+
</dependencies>
28+
</dependencyManagement>
1929
<dependencies>
2030
<dependency>
2131
<groupId>io.dropwizard</groupId>
2232
<artifactId>dropwizard-core</artifactId>
23-
<version>${dropwizard.version}</version>
2433
</dependency>
2534
<dependency>
2635
<groupId>io.dropwizard</groupId>
2736
<artifactId>dropwizard-jackson</artifactId>
28-
<version>${dropwizard.version}</version>
2937
</dependency>
3038
<dependency>
3139
<groupId>io.dropwizard</groupId>
3240
<artifactId>dropwizard-testing</artifactId>
33-
<version>${dropwizard.version}</version>
3441
<scope>test</scope>
3542
</dependency>
3643
<dependency>
@@ -54,13 +61,13 @@
5461
<dependency>
5562
<groupId>org.mockito</groupId>
5663
<artifactId>mockito-core</artifactId>
57-
<version>4.6.1</version>
64+
<version>5.12.0</version>
5865
<scope>test</scope>
5966
</dependency>
6067
<dependency>
6168
<groupId>org.assertj</groupId>
6269
<artifactId>assertj-core</artifactId>
63-
<version>3.23.1</version>
70+
<version>3.26.0</version>
6471
<scope>test</scope>
6572
</dependency>
6673
</dependencies>
@@ -70,36 +77,17 @@
7077
<plugin>
7178
<groupId>org.apache.maven.plugins</groupId>
7279
<artifactId>maven-compiler-plugin</artifactId>
73-
<version>3.10.1</version>
80+
<version>3.13.0</version>
7481
<configuration>
75-
<source>8</source>
76-
<target>8</target>
82+
<source>17</source>
83+
<target>17</target>
7784
<encoding>UTF-8</encoding>
7885
<compilerArgs>
7986
<arg>-Werror</arg>
8087
<arg>-Xlint:all</arg>
8188
</compilerArgs>
8289
</configuration>
8390
</plugin>
84-
<plugin>
85-
<groupId>org.gaul</groupId>
86-
<artifactId>modernizer-maven-plugin</artifactId>
87-
<version>2.4.0</version>
88-
<configuration>
89-
<javaVersion>17</javaVersion>
90-
<failOnViolations>true</failOnViolations>
91-
<includeTestClasses>true</includeTestClasses>
92-
</configuration>
93-
<executions>
94-
<execution>
95-
<id>modernizer</id>
96-
<phase>verify</phase>
97-
<goals>
98-
<goal>modernizer</goal>
99-
</goals>
100-
</execution>
101-
</executions>
102-
</plugin>
10391
<plugin>
10492
<groupId>org.apache.maven.plugins</groupId>
10593
<artifactId>maven-shade-plugin</artifactId>

src/main/java/com/github/sullis/dropwizard/helloworld/HelloWorldApplication.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.github.sullis.dropwizard.helloworld.resources.HelloResource;
44

5-
import io.dropwizard.Application;
6-
import io.dropwizard.setup.Environment;
5+
import io.dropwizard.core.Application;
6+
import io.dropwizard.core.setup.Environment;
77

88
public class HelloWorldApplication
99
extends Application<HelloWorldConfiguration> {

src/main/java/com/github/sullis/dropwizard/helloworld/HelloWorldConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.github.sullis.dropwizard.helloworld;
22

3-
import io.dropwizard.Configuration;
3+
import io.dropwizard.core.Configuration;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import javax.validation.constraints.NotEmpty;
5+
import jakarta.validation.constraints.NotEmpty;
66

77
public class HelloWorldConfiguration extends Configuration {
88
@NotEmpty

src/main/java/com/github/sullis/dropwizard/helloworld/resources/HelloResource.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.github.sullis.dropwizard.helloworld.resources;
22

3-
import javax.ws.rs.Consumes;
4-
import javax.ws.rs.GET;
5-
import javax.ws.rs.Path;
6-
import javax.ws.rs.Produces;
7-
import javax.ws.rs.QueryParam;
8-
import javax.ws.rs.core.MediaType;
3+
import jakarta.ws.rs.Consumes;
4+
import jakarta.ws.rs.GET;
5+
import jakarta.ws.rs.Path;
6+
import jakarta.ws.rs.Produces;
7+
import jakarta.ws.rs.QueryParam;
8+
import jakarta.ws.rs.core.MediaType;
99

1010
import com.github.sullis.dropwizard.helloworld.api.Message;
1111
import java.util.Optional;

0 commit comments

Comments
 (0)