Skip to content
Permalink
Browse files

upgrade Jackson, swagger-core, and swagger-parser (#4915)

- swagger-parser 2.0.17
- swagger-core 2.1.1
- jackson 2.10.1
  • Loading branch information
sullis authored and wing328 committed Jan 14, 2020
1 parent 8a94a3a commit 6a48dd7cd61196848932a5b980b55aa74757ebdd
@@ -198,8 +198,8 @@
<diffutils-version>1.3.0</diffutils-version>
<guava-version>26.0-jre</guava-version>
<generex-version>1.0.2</generex-version>
<jackson-version>2.9.10</jackson-version>
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
<jackson-version>2.10.1</jackson-version>
<jackson-threetenbp-version>2.10.0</jackson-threetenbp-version>
<kotlin-version>1.3.60</kotlin-version>
</properties>
<dependencies>
@@ -212,7 +212,7 @@
<groupId>${swagger-parser-groupid}</groupId>
<artifactId>swagger-parser</artifactId>
<version>${swagger-parser-version}</version>
</dependency>
</dependency>
<dependency>
<groupId>com.samskivert</groupId>
<artifactId>jmustache</artifactId>
@@ -268,6 +268,11 @@
<artifactId>jackson-datatype-guava</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -1364,7 +1364,11 @@ public Number getNumber(String path, Number defaultValue) throws CacheException
} else {
JsonNode node = root.at(ptr);
Object value = node.isPojo() && !JsonNode.class.isAssignableFrom(type) ? ((POJONode) node).getPojo() : node;
result = mapper.convertValue(value, type);
if ((value != null) && (value.getClass() == type)) {
result = (T) value;
} else {
result = mapper.convertValue(value, type);
}
}
return result;
}
@@ -52,7 +52,7 @@ public void testToYamlStringCompleteExample() throws Exception {
" description: Some description\n" +
" operationId: pingOp\n" +
" responses:\n" +
" 200:\n" +
" \"200\":\n" +
" description: Ok\n" +
"components:\n" +
" schemas:\n" +
@@ -178,7 +178,7 @@ public void testToYamlStringMinimalExample() throws Exception {
" description: Some description\n" +
" operationId: pingOp\n" +
" responses:\n" +
" 200:\n" +
" \"200\":\n" +
" description: Ok\n";
assertEquals(content, expected);
}
@@ -1401,9 +1401,9 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<swagger-core-version>2.0.10</swagger-core-version>
<swagger-core-version>2.1.1</swagger-core-version>
<swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid>
<swagger-parser-version>2.0.16</swagger-parser-version>
<swagger-parser-version>2.0.17</swagger-parser-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.1</felix-version>
<commons-io-version>2.4</commons-io-version>

0 comments on commit 6a48dd7

Please sign in to comment.
You can’t perform that action at this time.