update deps versions

Author: frantuma

java/java-jersey2/pom.xml

@@ -35,29 +35,6 @@
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <version>${jetty-version}</version>
-        <dependencies>
-<!--
-          <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback-version}</version>
-          </dependency>
--->
-<!--
-          <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-access</artifactId>
-            <version>${logback-version}</version>
-          </dependency>
--->
-<!--
-          <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-version}</version>
-          </dependency>
--->
-        </dependencies>
         <configuration>
           <webApp>
             <contextPath>/</contextPath>
@@ -165,7 +142,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.8.9</version>
+      <version>${jackson-version}</version>
     </dependency>
 
     <dependency>
@@ -188,17 +165,23 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
-      <artifactId>jersey-container-servlet-core</artifactId>
+      <artifactId>jersey-container-servlet</artifactId>
       <version>${jersey2-version}</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-multipart</artifactId>
       <version>${jersey2-version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
   </dependencies>
 </project>

java/java-jersey2/src/main/java/io/swagger/sample/resource/SwaggerListingResource.java

@@ -240,13 +240,6 @@
           <groupId>org.mortbay.jetty</groupId>
     		  <artifactId>jetty-maven-plugin</artifactId>
     		  <version>${jetty-version}</version>
-    		  <dependencies>
-    		    <dependency>
-    		      <groupId>com.sun.jersey</groupId>
-    		      <artifactId>jersey-servlet</artifactId>
-    		      <version>${jersey-version}</version>
-    		    </dependency>
-    		  </dependencies>
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
@@ -398,9 +391,8 @@
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
+        <artifactId>javax.servlet-api</artifactId>
         <version>${servlet-api-version}</version>
-        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -411,22 +403,22 @@
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-client</artifactId>
-        <version>${jersey-version}</version>
+        <version>${jersey2-version}</version>
       </dependency>
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-core</artifactId>
-        <version>${jersey-version}</version>
+        <version>${jersey2-version}</version>
       </dependency>
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-json</artifactId>
-        <version>${jersey-version}</version>
+        <version>${jersey2-version}</version>
       </dependency>
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-servlet</artifactId>
-        <version>${jersey-version}</version>
+        <version>${jersey2-version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -437,11 +429,10 @@
     <swagger-ui-version>2.1.4</swagger-ui-version>
     <scala-version>2.10.4</scala-version>
     <felix-version>2.3.4</felix-version>
-    <servlet-api-version>2.5</servlet-api-version>
-    <jetty-version>9.2.14.v20151106</jetty-version>
-    <jersey2-version>2.24</jersey2-version>
-    <jackson-version>2.4.2</jackson-version>
-    <jackson-guava-version>2.4.2</jackson-guava-version>
+    <servlet-api-version>3.1.0</servlet-api-version>
+    <jersey2-version>2.26</jersey2-version>
+    <jetty-version>9.4.6.v20170531</jetty-version>
+    <jackson-version>2.9.1</jackson-version>
     <logback-version>1.0.1</logback-version>
 
     <junit-version>4.8.1</junit-version>