Merge pull request #3601 from swagger-api/issue-3554

ref #3554 - bump jackson to 2.11.1
swagger-api · Jun 26, 2020 · f6d73cf · f6d73cf
2 parents e260f6c + 7f2ca83
commit f6d73cf
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/...swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/callbacks/CallbackTest.java b/...swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/callbacks/CallbackTest.java
@@ -28,9 +28,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,\n" +
-                "        as identified by the input token.  The supplied url will be used as the delivery\n" +
-                "        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\\\n" +
+                "        \\ delivery address for response payloads\"\n" +
                 "      operationId: subscribe\n" +
                 "      parameters:\n" +
                 "      - name: x-auth-token\n" +

diff --git a/.../swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/examples/ExamplesTest.java b/.../swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/examples/ExamplesTest.java
@@ -349,9 +349,9 @@ public void testFullExample() {
         String extractedYAML = openApiYAML.substring(start, end);
         String expectedYAML = "/test:\n" +
                 "    post:\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" +
+                "      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\\\n" +
+                "        \\ delivery address for response payloads\"\n" +
                 "      operationId: subscribe\n" +
                 "      parameters:\n" +
                 "      - name: subscriptionId\n" +

diff --git a/...c/test/java/io/swagger/v3/jaxrs2/annotations/operations/AnnotatedOperationMethodTest.java b/...c/test/java/io/swagger/v3/jaxrs2/annotations/operations/AnnotatedOperationMethodTest.java
@@ -197,7 +197,7 @@ public void testOperationWithResponseExamples() {
                 "                basic:\n" +
                 "                  summary: shows a basic example\n" +
                 "                  description: basic\n" +
-                "                  value: '{id: 19877734}'\n" +
+                "                  value: \"{id: 19877734}\"\n" +
                 "      deprecated: true\n";
         assertEquals(extractedYAML, expectedYAML);
     }
@@ -229,7 +229,7 @@ public void testOperationWithParameterExample() {
                 "                basic:\n" +
                 "                  summary: shows a basic example\n" +
                 "                  description: basic\n" +
-                "                  value: '{id: 19877734}'\n" +
+                "                  value: \"{id: 19877734}\"\n" +
                 "      deprecated: true\n";
         assertEquals(extractedYAML, expectedYAML);
     }

diff --git a/...jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/operations/MergedOperationTest.java b/...jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/operations/MergedOperationTest.java
@@ -92,7 +92,7 @@ public void testPartiallyAnnotatedMethod() {
                 "      - name: id\n" +
                 "        in: query\n" +
                 "        schema:\n" +
-                "          pattern: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'\n" +
+                "          pattern: \"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\"\n" +
                 "          type: string\n" +
                 "          description: a GUID for the user in uuid-v4 format\n" +
                 "          format: uuid\n" +

diff --git a/...gger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/parameters/ParametersTest.java b/...gger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/parameters/ParametersTest.java
@@ -48,9 +48,9 @@ public void testParameters() {
         String extractedYAML = openApiYAML.substring(start, end);
         String expectedYAML = "/test:\n" +
                 "    post:\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" +
+                "      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\\\n" +
+                "        \\ delivery address for response payloads\"\n" +
                 "      operationId: subscribe\n" +
                 "      parameters:\n" +
                 "      - name: subscriptionId\n" +
@@ -140,9 +140,9 @@ public void testArraySchemaParameters() {
         String extractedYAML = openApiYAML.substring(start, end);
         String expectedYAML = "/test:\n" +
                 "    post:\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" +
+                "      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\\\n" +
+                "        \\ delivery address for response payloads\"\n" +
                 "      operationId: subscribe\n" +
                 "      parameters:\n" +
                 "      - name: arrayParameter\n" +
@@ -180,9 +180,9 @@ public void testRepeatableParameters() {
         String extractedYAML = openApiYAML.substring(start, end);
         String expectedYAML = "/test:\n" +
                 "    post:\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" +
+                "      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\\\n" +
+                "        \\ delivery address for response payloads\"\n" +
                 "      operationId: subscribe\n" +
                 "      parameters:\n" +
                 "      - name: subscriptionId\n" +

diff --git a/pom.xml b/pom.xml
@@ -508,7 +508,7 @@
         <felix-version>4.2.1</felix-version>
         <servlet-api-version>4.0.3</servlet-api-version>
         <jersey2-version>2.26</jersey2-version>
-        <jackson-version>2.10.1</jackson-version>
+        <jackson-version>2.11.1</jackson-version>
         <logback-version>1.2.3</logback-version>
         <classgraph-version>4.8.65</classgraph-version>
         <guava-version>27.0.1-jre</guava-version>