Skip to content

Commit f6d73cf

Browse files
authored
Merge pull request #3601 from swagger-api/issue-3554
ref #3554 - bump jackson to 2.11.1
2 parents e260f6c + 7f2ca83 commit f6d73cf

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/callbacks/CallbackTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ public void testSimpleCallback() {
2828
String extractedYAML = openApiYAML.substring(start, end);
2929
String expectedYAML = "/test:\n" +
3030
" post:\n" +
31-
" description: subscribes a client to updates relevant to the requestor's account,\n" +
32-
" as identified by the input token. The supplied url will be used as the delivery\n" +
33-
" address for response payloads\n" +
31+
" description: \"subscribes a client to updates relevant to the requestor's account,\\\n" +
32+
" \\ as identified by the input token. The supplied url will be used as the\\\n" +
33+
" \\ delivery address for response payloads\"\n" +
3434
" operationId: subscribe\n" +
3535
" parameters:\n" +
3636
" - name: x-auth-token\n" +

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/examples/ExamplesTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,9 @@ public void testFullExample() {
349349
String extractedYAML = openApiYAML.substring(start, end);
350350
String expectedYAML = "/test:\n" +
351351
" post:\n" +
352-
" description: subscribes a client to updates relevant to the requestor's account,\n" +
353-
" as identified by the input token. The supplied url will be used as the delivery\n" +
354-
" address for response payloads\n" +
352+
" description: \"subscribes a client to updates relevant to the requestor's account,\\\n" +
353+
" \\ as identified by the input token. The supplied url will be used as the\\\n" +
354+
" \\ delivery address for response payloads\"\n" +
355355
" operationId: subscribe\n" +
356356
" parameters:\n" +
357357
" - name: subscriptionId\n" +

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/operations/AnnotatedOperationMethodTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public void testOperationWithResponseExamples() {
197197
" basic:\n" +
198198
" summary: shows a basic example\n" +
199199
" description: basic\n" +
200-
" value: '{id: 19877734}'\n" +
200+
" value: \"{id: 19877734}\"\n" +
201201
" deprecated: true\n";
202202
assertEquals(extractedYAML, expectedYAML);
203203
}
@@ -229,7 +229,7 @@ public void testOperationWithParameterExample() {
229229
" basic:\n" +
230230
" summary: shows a basic example\n" +
231231
" description: basic\n" +
232-
" value: '{id: 19877734}'\n" +
232+
" value: \"{id: 19877734}\"\n" +
233233
" deprecated: true\n";
234234
assertEquals(extractedYAML, expectedYAML);
235235
}

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/operations/MergedOperationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void testPartiallyAnnotatedMethod() {
9292
" - name: id\n" +
9393
" in: query\n" +
9494
" schema:\n" +
95-
" pattern: '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'\n" +
95+
" pattern: \"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\"\n" +
9696
" type: string\n" +
9797
" description: a GUID for the user in uuid-v4 format\n" +
9898
" format: uuid\n" +

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/parameters/ParametersTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public void testParameters() {
4848
String extractedYAML = openApiYAML.substring(start, end);
4949
String expectedYAML = "/test:\n" +
5050
" post:\n" +
51-
" description: subscribes a client to updates relevant to the requestor's account,\n" +
52-
" as identified by the input token. The supplied url will be used as the delivery\n" +
53-
" address for response payloads\n" +
51+
" description: \"subscribes a client to updates relevant to the requestor's account,\\\n" +
52+
" \\ as identified by the input token. The supplied url will be used as the\\\n" +
53+
" \\ delivery address for response payloads\"\n" +
5454
" operationId: subscribe\n" +
5555
" parameters:\n" +
5656
" - name: subscriptionId\n" +
@@ -140,9 +140,9 @@ public void testArraySchemaParameters() {
140140
String extractedYAML = openApiYAML.substring(start, end);
141141
String expectedYAML = "/test:\n" +
142142
" post:\n" +
143-
" description: subscribes a client to updates relevant to the requestor's account,\n" +
144-
" as identified by the input token. The supplied url will be used as the delivery\n" +
145-
" address for response payloads\n" +
143+
" description: \"subscribes a client to updates relevant to the requestor's account,\\\n" +
144+
" \\ as identified by the input token. The supplied url will be used as the\\\n" +
145+
" \\ delivery address for response payloads\"\n" +
146146
" operationId: subscribe\n" +
147147
" parameters:\n" +
148148
" - name: arrayParameter\n" +
@@ -180,9 +180,9 @@ public void testRepeatableParameters() {
180180
String extractedYAML = openApiYAML.substring(start, end);
181181
String expectedYAML = "/test:\n" +
182182
" post:\n" +
183-
" description: subscribes a client to updates relevant to the requestor's account,\n" +
184-
" as identified by the input token. The supplied url will be used as the delivery\n" +
185-
" address for response payloads\n" +
183+
" description: \"subscribes a client to updates relevant to the requestor's account,\\\n" +
184+
" \\ as identified by the input token. The supplied url will be used as the\\\n" +
185+
" \\ delivery address for response payloads\"\n" +
186186
" operationId: subscribe\n" +
187187
" parameters:\n" +
188188
" - name: subscriptionId\n" +

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@
508508
<felix-version>4.2.1</felix-version>
509509
<servlet-api-version>4.0.3</servlet-api-version>
510510
<jersey2-version>2.26</jersey2-version>
511-
<jackson-version>2.10.1</jackson-version>
511+
<jackson-version>2.11.1</jackson-version>
512512
<logback-version>1.2.3</logback-version>
513513
<classgraph-version>4.8.65</classgraph-version>
514514
<guava-version>27.0.1-jre</guava-version>

0 commit comments

Comments
 (0)