Merge pull request #17412 from dreis2211

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

Closes gh-17412
This commit is contained in:
Andy Wilkinson
2019-07-04 10:26:59 +01:00
6 changed files with 10 additions and 5 deletions

View File

@@ -557,7 +557,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
<artifactId>jersey-spring5</artifactId>
<scope>test</scope>
</dependency>
<dependency>

View File

@@ -367,7 +367,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
<artifactId>jersey-spring5</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>

View File

@@ -186,7 +186,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
<artifactId>jersey-spring5</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>

View File

@@ -2254,6 +2254,11 @@
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring5</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>

View File

@@ -669,7 +669,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
<artifactId>jersey-spring5</artifactId>
<optional>true</optional>
</dependency>
<dependency>

View File

@@ -93,7 +93,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
<artifactId>jersey-spring5</artifactId>
<exclusions>
<exclusion>
<groupId>org.jvnet</groupId>