Commit 2dfbf41b authored by Andy Wilkinson's avatar Andy Wilkinson

Merge pull request #17412 from dreis2211

* gh-17412:
  Polish "Use Spring 5 module of Jersey"
  Use Spring 5 module of Jersey

Closes gh-17412
parents 7d05551b 345c3682
...@@ -557,7 +557,7 @@ ...@@ -557,7 +557,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.ext</groupId> <groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId> <artifactId>jersey-spring5</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.ext</groupId> <groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId> <artifactId>jersey-spring5</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
......
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.ext</groupId> <groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId> <artifactId>jersey-spring5</artifactId>
<optional>true</optional> <optional>true</optional>
<exclusions> <exclusions>
<exclusion> <exclusion>
......
...@@ -2254,6 +2254,11 @@ ...@@ -2254,6 +2254,11 @@
<scope>import</scope> <scope>import</scope>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring5</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId> <artifactId>hamcrest</artifactId>
......
...@@ -669,7 +669,7 @@ ...@@ -669,7 +669,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.ext</groupId> <groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId> <artifactId>jersey-spring5</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.ext</groupId> <groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId> <artifactId>jersey-spring5</artifactId>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.jvnet</groupId> <groupId>org.jvnet</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment