From e3317a37dc0d05d39ddf8f376f587c7c808d639d Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Mon, 24 Feb 2020 15:41:38 +0800 Subject: [PATCH 1/4] update swagger parser to 2.0.18 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3f2da68c9d..ac4b492d731 100644 --- a/pom.xml +++ b/pom.xml @@ -1590,7 +1590,7 @@ <maven.compiler.target>1.8</maven.compiler.target> <swagger-core-version>2.1.1</swagger-core-version> <swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid> - <swagger-parser-version>2.0.17</swagger-parser-version> + <swagger-parser-version>2.0.18</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> -- GitLab From fe3cb5221f362c00b176fa81411eaf368f0e446d Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Wed, 26 Feb 2020 16:59:58 +0800 Subject: [PATCH 2/4] fix online server exception --- modules/openapi-generator-online/pom.xml | 7 +++++++ modules/openapi-generator/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 971771ab474..bf9af44118a 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -18,6 +18,7 @@ <spring-boot-version>2.0.7.RELEASE</spring-boot-version> <springfox-version>2.8.0</springfox-version> <junit-version>4.13</junit-version> + <jackson-version>2.10.2</jackson-version> </properties> <dependencyManagement> <dependencies> @@ -117,6 +118,12 @@ <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> + <version>${jackson-version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson-version}</version> </dependency> <!-- Bean Validation API support --> <dependency> diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index bb80952df1e..eb4b4fbffcc 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -232,7 +232,7 @@ <diffutils-version>1.3.0</diffutils-version> <guava-version>26.0-jre</guava-version> <generex-version>1.0.2</generex-version> - <jackson-version>2.10.1</jackson-version> + <jackson-version>2.10.2</jackson-version> <jackson-threetenbp-version>2.10.0</jackson-threetenbp-version> <kotlin-version>1.3.60</kotlin-version> </properties> diff --git a/pom.xml b/pom.xml index ac4b492d731..14d7146048b 100644 --- a/pom.xml +++ b/pom.xml @@ -1596,7 +1596,7 @@ <commons-io-version>2.4</commons-io-version> <commons-cli-version>1.2</commons-cli-version> <junit-version>4.13</junit-version> - <jackson-version>2.8.9</jackson-version> + <jackson-version>2.10.2</jackson-version> <maven-plugin-version>1.0.0</maven-plugin-version> <commons-lang-version>3.4</commons-lang-version> <slf4j-version>1.7.12</slf4j-version> -- GitLab From 16e18e5ab98dffa9b5c6d7cd2356573b04f91d0f Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Fri, 28 Feb 2020 11:26:30 +0800 Subject: [PATCH 3/4] Revert "fix online server exception" This reverts commit fe3cb5221f362c00b176fa81411eaf368f0e446d. --- modules/openapi-generator-online/pom.xml | 7 ------- modules/openapi-generator/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index bf9af44118a..971771ab474 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -18,7 +18,6 @@ <spring-boot-version>2.0.7.RELEASE</spring-boot-version> <springfox-version>2.8.0</springfox-version> <junit-version>4.13</junit-version> - <jackson-version>2.10.2</jackson-version> </properties> <dependencyManagement> <dependencies> @@ -118,12 +117,6 @@ <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> - <version>${jackson-version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson-version}</version> </dependency> <!-- Bean Validation API support --> <dependency> diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index eb4b4fbffcc..bb80952df1e 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -232,7 +232,7 @@ <diffutils-version>1.3.0</diffutils-version> <guava-version>26.0-jre</guava-version> <generex-version>1.0.2</generex-version> - <jackson-version>2.10.2</jackson-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> diff --git a/pom.xml b/pom.xml index 14d7146048b..ac4b492d731 100644 --- a/pom.xml +++ b/pom.xml @@ -1596,7 +1596,7 @@ <commons-io-version>2.4</commons-io-version> <commons-cli-version>1.2</commons-cli-version> <junit-version>4.13</junit-version> - <jackson-version>2.10.2</jackson-version> + <jackson-version>2.8.9</jackson-version> <maven-plugin-version>1.0.0</maven-plugin-version> <commons-lang-version>3.4</commons-lang-version> <slf4j-version>1.7.12</slf4j-version> -- GitLab From 5b068e60eefefeb501aec288b61d985dc38f35fe Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Thu, 2 Apr 2020 20:04:58 +0800 Subject: [PATCH 4/4] update parser to 2.0.19 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac4b492d731..57ad5ed229b 100644 --- a/pom.xml +++ b/pom.xml @@ -1590,7 +1590,7 @@ <maven.compiler.target>1.8</maven.compiler.target> <swagger-core-version>2.1.1</swagger-core-version> <swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid> - <swagger-parser-version>2.0.18</swagger-parser-version> + <swagger-parser-version>2.0.19</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> -- GitLab