diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml index f5c4256512c..ad91aba5410 100644 --- a/spring-boot-actuator/pom.xml +++ b/spring-boot-actuator/pom.xml @@ -341,7 +341,7 @@ org.glassfish.jersey.ext - jersey-spring3 + jersey-spring4 test diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml index fbedf78fd2e..66fb03bfde9 100755 --- a/spring-boot-autoconfigure/pom.xml +++ b/spring-boot-autoconfigure/pom.xml @@ -147,7 +147,7 @@ org.glassfish.jersey.ext - jersey-spring3 + jersey-spring4 true diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 5bf04f7ac22..a1c0cb5c0e8 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -108,7 +108,7 @@ 7.6.0.Final 2.0.6 2.9.0 - 2.25.1 + 2.26 5.3.2 9.4.6.v20170531 2.2.0.v201112011158 @@ -1663,11 +1663,6 @@ javax.el ${glassfish-el.version} - - org.glassfish.jersey.bundles.repackaged - jersey-guava - ${jersey.version} - org.glassfish.jersey.containers jersey-container-servlet @@ -1705,7 +1700,7 @@ org.glassfish.jersey.ext - jersey-spring3 + jersey-spring4 ${jersey.version} diff --git a/spring-boot-starters/spring-boot-starter-jersey/pom.xml b/spring-boot-starters/spring-boot-starter-jersey/pom.xml index 9563031dc5d..429377e9c4e 100644 --- a/spring-boot-starters/spring-boot-starter-jersey/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jersey/pom.xml @@ -42,10 +42,22 @@ org.glassfish.jersey.core jersey-server + + + org.glassfish.hk2.external + javax.inject + + org.glassfish.jersey.containers jersey-container-servlet-core + + + org.glassfish.hk2.external + javax.inject + + org.glassfish.jersey.containers @@ -63,16 +75,24 @@ org.glassfish.web javax.el + + org.glassfish.hk2.external + javax.inject + org.glassfish.jersey.ext - jersey-spring3 + jersey-spring4 org.jvnet tiger-types + + org.glassfish.hk2.external + javax.inject + diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 21d22b2c0e7..3ffa2ab15db 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -331,6 +331,11 @@ jersey-container-servlet-core test + + org.glassfish.jersey.ext + jersey-spring4 + true + org.glassfish.jersey.media jersey-media-json-jackson