From 1db7127f17cab6304d87c698d22f28a9418605f5 Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Wed, 16 Feb 2022 11:23:35 +0800 Subject: [PATCH 1/2] update kotlin vertx dep to newer versions --- .../main/resources/kotlin-vertx-server/pom.mustache | 13 ++++++------- .../petstore/kotlin-vertx-modelMutable/pom.xml | 13 ++++++------- samples/server/petstore/kotlin/vertx/pom.xml | 13 ++++++------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache index 1daf924bb13..5f769c0eb09 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache @@ -15,13 +15,12 @@ <kotlin.version>1.3.10</kotlin.version> <kotlin.compiler.incremental>true</kotlin.compiler.incremental> <jakarta-annotation-version>1.3.5</jakarta-annotation-version> - <junit.version>4.13</junit.version> - <vertx.version>3.4.1</vertx.version> - <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> + <junit.version>4.13.2</junit.version> + <vertx.version>3.9.12</vertx.version> + <maven-compiler-plugin.version>3.10.0</maven-compiler-plugin.version> <vertx-openapi-router.version>1.0.2</vertx-openapi-router.version> - <maven-shade-plugin.version>2.3</maven-shade-plugin.version> - <jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version> - <vertx.version>3.6.0</vertx.version> + <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version> + <jackson-datatype-jsr310.version>2.13.1</jackson-datatype-jsr310.version> </properties> <dependencies> @@ -188,4 +187,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/samples/server/petstore/kotlin-vertx-modelMutable/pom.xml b/samples/server/petstore/kotlin-vertx-modelMutable/pom.xml index f7dce917e48..a825a93b951 100644 --- a/samples/server/petstore/kotlin-vertx-modelMutable/pom.xml +++ b/samples/server/petstore/kotlin-vertx-modelMutable/pom.xml @@ -15,13 +15,12 @@ <kotlin.version>1.3.10</kotlin.version> <kotlin.compiler.incremental>true</kotlin.compiler.incremental> <jakarta-annotation-version>1.3.5</jakarta-annotation-version> - <junit.version>4.13</junit.version> - <vertx.version>3.4.1</vertx.version> - <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> + <junit.version>4.13.2</junit.version> + <vertx.version>3.9.12</vertx.version> + <maven-compiler-plugin.version>3.10.0</maven-compiler-plugin.version> <vertx-openapi-router.version>1.0.2</vertx-openapi-router.version> - <maven-shade-plugin.version>2.3</maven-shade-plugin.version> - <jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version> - <vertx.version>3.6.0</vertx.version> + <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version> + <jackson-datatype-jsr310.version>2.13.1</jackson-datatype-jsr310.version> </properties> <dependencies> @@ -188,4 +187,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/samples/server/petstore/kotlin/vertx/pom.xml b/samples/server/petstore/kotlin/vertx/pom.xml index f7dce917e48..a825a93b951 100644 --- a/samples/server/petstore/kotlin/vertx/pom.xml +++ b/samples/server/petstore/kotlin/vertx/pom.xml @@ -15,13 +15,12 @@ <kotlin.version>1.3.10</kotlin.version> <kotlin.compiler.incremental>true</kotlin.compiler.incremental> <jakarta-annotation-version>1.3.5</jakarta-annotation-version> - <junit.version>4.13</junit.version> - <vertx.version>3.4.1</vertx.version> - <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> + <junit.version>4.13.2</junit.version> + <vertx.version>3.9.12</vertx.version> + <maven-compiler-plugin.version>3.10.0</maven-compiler-plugin.version> <vertx-openapi-router.version>1.0.2</vertx-openapi-router.version> - <maven-shade-plugin.version>2.3</maven-shade-plugin.version> - <jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version> - <vertx.version>3.6.0</vertx.version> + <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version> + <jackson-datatype-jsr310.version>2.13.1</jackson-datatype-jsr310.version> </properties> <dependencies> @@ -188,4 +187,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> -- GitLab From e518ad99e076cfb1d2bfc57c1a84ef0c71e92adf Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Thu, 17 Feb 2022 11:48:45 +0800 Subject: [PATCH 2/2] update kotlin to newer version --- .../src/main/resources/kotlin-vertx-server/pom.mustache | 2 +- samples/server/petstore/kotlin-vertx-modelMutable/pom.xml | 2 +- samples/server/petstore/kotlin/vertx/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache index 5f769c0eb09..e26747f3da7 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/pom.mustache @@ -12,7 +12,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <java.version>1.8</java.version> - <kotlin.version>1.3.10</kotlin.version> + <kotlin.version>1.6.10</kotlin.version> <kotlin.compiler.incremental>true</kotlin.compiler.incremental> <jakarta-annotation-version>1.3.5</jakarta-annotation-version> <junit.version>4.13.2</junit.version> diff --git a/samples/server/petstore/kotlin-vertx-modelMutable/pom.xml b/samples/server/petstore/kotlin-vertx-modelMutable/pom.xml index a825a93b951..4bf0da66ad8 100644 --- a/samples/server/petstore/kotlin-vertx-modelMutable/pom.xml +++ b/samples/server/petstore/kotlin-vertx-modelMutable/pom.xml @@ -12,7 +12,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <java.version>1.8</java.version> - <kotlin.version>1.3.10</kotlin.version> + <kotlin.version>1.6.10</kotlin.version> <kotlin.compiler.incremental>true</kotlin.compiler.incremental> <jakarta-annotation-version>1.3.5</jakarta-annotation-version> <junit.version>4.13.2</junit.version> diff --git a/samples/server/petstore/kotlin/vertx/pom.xml b/samples/server/petstore/kotlin/vertx/pom.xml index a825a93b951..4bf0da66ad8 100644 --- a/samples/server/petstore/kotlin/vertx/pom.xml +++ b/samples/server/petstore/kotlin/vertx/pom.xml @@ -12,7 +12,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <java.version>1.8</java.version> - <kotlin.version>1.3.10</kotlin.version> + <kotlin.version>1.6.10</kotlin.version> <kotlin.compiler.incremental>true</kotlin.compiler.incremental> <jakarta-annotation-version>1.3.5</jakarta-annotation-version> <junit.version>4.13.2</junit.version> -- GitLab