From c1fe8e8979b2cfff160a74fa212214ce3532e79c Mon Sep 17 00:00:00 2001
From: frantuma <frantuma@yahoo.com>
Date: Tue, 19 Sep 2017 11:09:05 +0200
Subject: [PATCH] deps versions

---
 modules/swagger-annotations/pom.xml           |   6 -
 modules/swagger-core/pom.xml                  |  27 ----
 .../matchers/SerializationMatchers.java       |   4 +-
 .../ModelWithSecurityRequirements.json        |   1 -
 modules/swagger-integration/pom.xml           |   9 --
 modules/swagger-jaxrs2/pom.xml                |  16 +--
 .../annotations/callbacks/CallbackTest.java   |  13 +-
 .../annotations/examples/ExamplesTest.java    |   4 +-
 .../parameters/ParametersTest.java            |   4 +-
 modules/swagger-models/pom.xml                |  10 +-
 pom.xml                                       | 120 +++++++++++-------
 11 files changed, 96 insertions(+), 118 deletions(-)

diff --git a/modules/swagger-annotations/pom.xml b/modules/swagger-annotations/pom.xml
index 4afc85b64b..af695a4636 100644
--- a/modules/swagger-annotations/pom.xml
+++ b/modules/swagger-annotations/pom.xml
@@ -21,11 +21,6 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <version>${felix-version}</version>
                 <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>io.swagger.oas.annotations</Export-Package>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -129,7 +124,6 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.0.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/modules/swagger-core/pom.xml b/modules/swagger-core/pom.xml
index 2c9697397c..40c07205b0 100644
--- a/modules/swagger-core/pom.xml
+++ b/modules/swagger-core/pom.xml
@@ -32,20 +32,6 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <version>${felix-version}</version>
                 <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>
-                            io.swagger.converter,
-                            io.swagger.core,
-                            io.swagger.core.filter,
-                            io.swagger.core.util,
-                            io.swagger.reader,
-                            io.swagger.config,
-                            io.swagger.oas.models,
-                            io.swagger.util
-                        </Export-Package>
-                    </instructions>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -73,23 +59,14 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-annotations-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson-version}</version>
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
@@ -99,7 +76,6 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>${joda-time-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -109,19 +85,16 @@
         <dependency>
             <groupId>org.joda</groupId>
             <artifactId>joda-convert</artifactId>
-            <version>${joda-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${logback-version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>${logback-version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/modules/swagger-core/src/test/java/io/swagger/matchers/SerializationMatchers.java b/modules/swagger-core/src/test/java/io/swagger/matchers/SerializationMatchers.java
index b2af77fbc6..d58f7aba1a 100644
--- a/modules/swagger-core/src/test/java/io/swagger/matchers/SerializationMatchers.java
+++ b/modules/swagger-core/src/test/java/io/swagger/matchers/SerializationMatchers.java
@@ -1,5 +1,6 @@
 package io.swagger.matchers;
 
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 import io.swagger.util.Json;
 import io.swagger.util.Yaml;
@@ -35,7 +36,8 @@ private static void apply(Object objectToSerialize, String str, ObjectMapper map
             LOGGER.error("Failed to read value", e);
         }
         if (!lhs.equals(new ObjectNodeComparator(), rhs)) {
-            fail(String.format("Serialized object:\n%s\ndoes not equal to expected serialized string:\n%s", lhs, rhs));
+            assertEquals(Yaml.pretty(lhs), Yaml.pretty(rhs));
+            //fail(String.format("Serialized object:\n%s\ndoes not equal to expected serialized string:\n%s", lhs, rhs));
         }
     }
 
diff --git a/modules/swagger-core/src/test/resources/ModelWithSecurityRequirements.json b/modules/swagger-core/src/test/resources/ModelWithSecurityRequirements.json
index a017590753..7cc0549c96 100644
--- a/modules/swagger-core/src/test/resources/ModelWithSecurityRequirements.json
+++ b/modules/swagger-core/src/test/resources/ModelWithSecurityRequirements.json
@@ -79,7 +79,6 @@
   },
   "components": {
     "schemas": {
-      "Error": null,
       "Person": {
         "type": "object",
         "properties": {
diff --git a/modules/swagger-integration/pom.xml b/modules/swagger-integration/pom.xml
index 982e78f38a..0609b64725 100644
--- a/modules/swagger-integration/pom.xml
+++ b/modules/swagger-integration/pom.xml
@@ -22,7 +22,6 @@
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.0.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -50,14 +49,6 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<version>${felix-version}</version>
 				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Export-Package>
-							io.swagger.oas.integration,
-							io.swagger.oas.integration.api
-						</Export-Package>
-					</instructions>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/modules/swagger-jaxrs2/pom.xml b/modules/swagger-jaxrs2/pom.xml
index 6306dd0cd2..6c9781ee04 100644
--- a/modules/swagger-jaxrs2/pom.xml
+++ b/modules/swagger-jaxrs2/pom.xml
@@ -10,6 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>swagger-jaxrs2</artifactId>
+    <packaging>bundle</packaging>
     <name>swagger-jaxrs2</name>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
@@ -36,7 +37,7 @@
                             io.swagger.jaxrs2.util
                         </Export-Package>
                         <Import-Package>
-                            javax.ws.rs*;version="[2.0,0)",
+                            javax.ws.rs*;version="2.0",
                             *
                         </Import-Package>
                     </instructions>
@@ -58,7 +59,6 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>${jetty-version}</version>
                 <configuration>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
                     <stopKey>a</stopKey>
@@ -104,17 +104,11 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>
@@ -128,13 +122,11 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${logback-version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>${logback-version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/callbacks/CallbackTest.java b/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/callbacks/CallbackTest.java
index c9d4c1959d..1525779bd7 100644
--- a/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/callbacks/CallbackTest.java
+++ b/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/callbacks/CallbackTest.java
@@ -25,14 +25,17 @@ public void testSimpleCallback() {
         String extractedYAML = openApiYAML.substring(start, end);
         String expectedYAML = "/test:\n" +
                 "    post:\n" +
-                "      description: subscribes a client to updates relevant to the requestor's account, as identified by the input token.  The supplied url will be used as the delivery address for response payloads\n" +
+                "      description: subscribes a client to updates relevant to the requestor's account,\n" +
+                "        as identified by the input token.  The supplied url will be used as the delivery\n" +
+                "        address for response payloads\n" +
                 "      operationId: subscribe\n" +
                 "      parameters:\n" +
                 "      - name: x-auth-token\n" +
                 "        in: header\n" +
                 "        schema:\n" +
                 "          type: string\n" +
-                "          description: the authentication token provided after initially authenticating to the application\n" +
+                "          description: the authentication token provided after initially authenticating\n" +
+                "            to the application\n" +
                 "          readOnly: true\n" +
                 "      - name: url\n" +
                 "        in: query\n" +
@@ -65,11 +68,13 @@ public void testSimpleCallback() {
                 "                  readOnly: true\n" +
                 "              responses:\n" +
                 "                200:\n" +
-                "                  description: Return this code if the callback was received and processed successfully\n" +
+                "                  description: Return this code if the callback was received and processed\n" +
+                "                    successfully\n" +
                 "                205:\n" +
                 "                  description: Return this code to unsubscribe from future data updates\n" +
                 "                default:\n" +
-                "                  description: All other response codes will disable this callback subscription\n" +
+                "                  description: All other response codes will disable this callback\n" +
+                "                    subscription\n" +
                 "components:\n" +
                 "  schemas:\n" +
                 "    string:\n" +
diff --git a/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/examples/ExamplesTest.java b/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/examples/ExamplesTest.java
index aa62b8acc5..d0230f4415 100644
--- a/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/examples/ExamplesTest.java
+++ b/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/examples/ExamplesTest.java
@@ -29,7 +29,9 @@ public void testSimpleCallback() {
         String extractedYAML = openApiYAML.substring(start, end);
         String expectedYAML = "/test:\n" +
                 "    post:\n" +
-                "      description: subscribes a client to updates relevant to the requestor's account, as identified by the input token.  The supplied url will be used as the delivery address for response payloads\n" +
+                "      description: subscribes a client to updates relevant to the requestor's account,\n" +
+                "        as identified by the input token.  The supplied url will be used as the delivery\n" +
+                "        address for response payloads\n" +
                 "      operationId: subscribe\n" +
                 "      parameters:\n" +
                 "      - name: subscriptionId\n" +
diff --git a/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/parameters/ParametersTest.java b/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/parameters/ParametersTest.java
index b26018a4b0..2bf4a763f6 100644
--- a/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/parameters/ParametersTest.java
+++ b/modules/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/parameters/ParametersTest.java
@@ -29,7 +29,9 @@ public void testSimpleCallback() {
         String extractedYAML = openApiYAML.substring(start, end);
         String expectedYAML = "/test:\n" +
                 "    post:\n" +
-                "      description: subscribes a client to updates relevant to the requestor's account, as identified by the input token.  The supplied url will be used as the delivery address for response payloads\n" +
+                "      description: subscribes a client to updates relevant to the requestor's account,\n" +
+                "        as identified by the input token.  The supplied url will be used as the delivery\n" +
+                "        address for response payloads\n" +
                 "      operationId: subscribe\n" +
                 "      parameters:\n" +
                 "      - name: subscriptionId\n" +
diff --git a/modules/swagger-models/pom.xml b/modules/swagger-models/pom.xml
index 14fb9b38a7..12f5b42703 100644
--- a/modules/swagger-models/pom.xml
+++ b/modules/swagger-models/pom.xml
@@ -50,13 +50,11 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${jackson-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -78,16 +76,10 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-annotations-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-version}</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 
+
     <properties>
         <annotations.version>2.0.0-SNAPSHOT</annotations.version>
         <validation-api-version>1.1.0.Final</validation-api-version>
diff --git a/pom.xml b/pom.xml
index 985ad78fbc..5032edb4ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,15 +204,9 @@
                     <groupId>org.eclipse.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>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
                     <version>${enforcer-plugin-version}</version>
                 </plugin>
@@ -358,7 +352,7 @@
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
+                <artifactId>javax.servlet-api</artifactId>
                 <version>${servlet-api-version}</version>
                 <scope>provided</scope>
             </dependency>
@@ -368,26 +362,6 @@
                 <version>${slf4j-version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-client</artifactId>
-                <version>${jersey-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-core</artifactId>
-                <version>${jersey-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-json</artifactId>
-                <version>${jersey-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-servlet</artifactId>
-                <version>${jersey-version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
@@ -404,35 +378,87 @@
                 <artifactId>guava</artifactId>
                 <version>${guava-version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-yaml</artifactId>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback-version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${logback-version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>joda-time</groupId>
+                <artifactId>joda-time</artifactId>
+                <version>${joda-time-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.joda</groupId>
+                <artifactId>joda-convert</artifactId>
+                <version>${joda-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>javax.ws.rs-api</artifactId>
+                <version>${javax.ws-version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <properties>
         <joda-version>1.2</joda-version>
         <joda-time-version>2.7</joda-time-version>
-
+        <snakeyaml-version>1.18</snakeyaml-version>
+        <javax.ws-version>2.0.1</javax.ws-version>
         <felix-version>2.4.0</felix-version>
-        <servlet-api-version>2.5</servlet-api-version>
-        <jersey-version>1.13</jersey-version>
-        <jersey2-version>2.25.1</jersey2-version>
-        <jackson-version>2.8.9</jackson-version>
-        <jackson-annotations-version>2.8.0</jackson-annotations-version>
-        <logback-version>1.0.1</logback-version>
+        <servlet-api-version>3.1.0</servlet-api-version>
+        <jersey2-version>2.26</jersey2-version>
+        <jackson-version>2.9.1</jackson-version>
+        <logback-version>1.2.3</logback-version>
         <reflections-version>0.9.11</reflections-version>
-        <guava-version>20.0</guava-version>
-
-        <testng-version>6.9.10</testng-version>
-        <mockito-version>1.9.5</mockito-version>
+        <guava-version>23.0</guava-version>
+        <commons-lang-version>3.6</commons-lang-version>
+        <commons-io-version>2.5</commons-io-version>
+        <slf4j-version>1.7.25</slf4j-version>
+        <jetty-version>9.4.6.v20170531</jetty-version>
+        <testng-version>6.11</testng-version>
+        <mockito-version>1.10.19</mockito-version>
         <rest-assured-version>2.8.0</rest-assured-version>
-        <surefire-version>2.18.1</surefire-version>
-        <maven-plugin-version>1.0.0</maven-plugin-version>
-        <commons-lang-version>3.2.1</commons-lang-version>
-        <slf4j-version>1.7.22</slf4j-version>
-        <jetty-version>9.2.14.v20151106</jetty-version>
+
+        <surefire-version>2.20</surefire-version>
+        <enforcer-plugin-version>3.0.0-M1</enforcer-plugin-version>
+        <failsafe-plugin-version>2.20</failsafe-plugin-version>
+
         <coverage.complexity.minimum>0.90</coverage.complexity.minimum>
         <coverage.line.minimum>0.90</coverage.line.minimum>
         <coverage.missed.classes>0</coverage.missed.classes>
-        <commons-io-version>2.5</commons-io-version>
-        <enforcer-plugin-version>1.4</enforcer-plugin-version>
-        <failsafe-plugin-version>2.19.1</failsafe-plugin-version>
+
     </properties>
 </project>