Skip to content

Commit

Permalink
Add explicit dependencies to resolve conflicts (#49)
Browse files Browse the repository at this point in the history
* jakarta.activation (com.sun.activation version)
* jersey-container-servlet-core
* netty-codec
  • Loading branch information
chrisrohr authored Dec 21, 2021
1 parent 98f4598 commit 5e89f8b
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,12 @@
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>${jakarta.activation-api.version}</version>
</dependency>

<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
Expand Down Expand Up @@ -463,6 +469,12 @@
<version>${jersey.version}</version>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
<version>${jersey.version}</version>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
Expand Down Expand Up @@ -619,6 +631,12 @@
<version>${netty.version}</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>${netty.version}</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
Expand Down

0 comments on commit 5e89f8b

Please sign in to comment.