From 7f2ca8354e4d8c19b3072520e7fa341d88289655 Mon Sep 17 00:00:00 2001 From: frantuma Date: Wed, 3 Jun 2020 16:50:44 +0200 Subject: [PATCH] ref #3554 - bump jackson to 2.11.1 --- .../annotations/callbacks/CallbackTest.java | 6 +++--- .../annotations/examples/ExamplesTest.java | 6 +++--- .../AnnotatedOperationMethodTest.java | 4 ++-- .../operations/MergedOperationTest.java | 2 +- .../annotations/parameters/ParametersTest.java | 18 +++++++++--------- pom.xml | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/callbacks/CallbackTest.java b/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/callbacks/CallbackTest.java index a08cf25720..06931862a1 100644 --- a/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/callbacks/CallbackTest.java +++ b/modules/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/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/examples/ExamplesTest.java b/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/examples/ExamplesTest.java index fcbc95adba..bc08d3bc2b 100644 --- a/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/examples/ExamplesTest.java +++ b/modules/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/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/operations/AnnotatedOperationMethodTest.java b/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/operations/AnnotatedOperationMethodTest.java index 3282fa83c9..6d9f4aede4 100644 --- a/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/operations/AnnotatedOperationMethodTest.java +++ b/modules/swagger-jaxrs2/src/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/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/operations/MergedOperationTest.java b/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/operations/MergedOperationTest.java index 5d8b65d810..b5658c10ce 100644 --- a/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/operations/MergedOperationTest.java +++ b/modules/swagger-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/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/parameters/ParametersTest.java b/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/parameters/ParametersTest.java index a2c17b594f..1f3d282f45 100644 --- a/modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/parameters/ParametersTest.java +++ b/modules/swagger-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 index 2b6ef6b032..7785fd46b8 100644 --- a/pom.xml +++ b/pom.xml @@ -508,7 +508,7 @@ 4.2.1 4.0.3 2.26 - 2.10.1 + 2.11.1 1.2.3 4.8.65 27.0.1-jre