deps versions

stbischof · Sep 20, 2017 · c1fe8e8 · c1fe8e8
1 parent 4aa0129
commit c1fe8e8
Show file tree

Hide file tree

Showing 11 changed files with 96 additions and 118 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...es/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/callbacks/CallbackTest.java b/...es/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/...les/swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/examples/ExamplesTest.java b/...les/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/...swagger-jaxrs2/src/test/java/io/swagger/jaxrs2/annotations/parameters/ParametersTest.java b/...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
@@ -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>