root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Upgrade to Jersey 2.26 

Closes gh-10217
This commit is contained in:
Andy Wilkinson 2017-09-07 17:22:37 +01:00
parent 725b0fa3eb
commit 2e19f0b3e5
5 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-actuator/pom.xml
View File

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

2
spring-boot-autoconfigure/pom.xml
View File

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

9
spring-boot-dependencies/pom.xml
View File

@ -108,7 +108,7 @@
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
<jdom2.version>2.0.6</jdom2.version>
<jedis.version>2.9.0</jedis.version>
<jersey.version>2.25.1</jersey.version>
<jersey.version>2.26</jersey.version>
<jest.version>5.3.2</jest.version>
<jetty.version>9.4.6.v20170531</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
@ -1663,11 +1663,6 @@
<artifactId>javax.el</artifactId>
<version>${glassfish-el.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
<artifactId>jersey-guava</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
@ -1705,7 +1700,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring3</artifactId>
<artifactId>jersey-spring4</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>

22
spring-boot-starters/spring-boot-starter-jersey/pom.xml
View File

@ -42,10 +42,22 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<exclusions>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
@ -63,16 +75,24 @@
<groupId>org.glassfish.web</groupId>
<artifactId>javax.el</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring3</artifactId>
<artifactId>jersey-spring4</artifactId>
<exclusions>
<exclusion>
<groupId>org.jvnet</groupId>
<artifactId>tiger-types</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

5
spring-boot/pom.xml
View File

@ -331,6 +331,11 @@
<artifactId>jersey-container-servlet-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>