From 07620cebe240c6351083a9f3e378187172b0d917 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 17 Nov 2023 10:34:22 +0800 Subject: [PATCH] update webclient dep to newer version, add tests (#17106) --- .github/workflows/samples-jdk17.yaml | 3 +++ .../Java/libraries/webclient/build.gradle.mustache | 12 ++++++------ .../resources/Java/libraries/webclient/pom.mustache | 12 ++++++------ .../webclient-useAbstractionForFiles/build.gradle | 6 +++--- .../java/webclient-useAbstractionForFiles/pom.xml | 6 +++--- .../petstore/java/webclient-jakarta/build.gradle | 6 +++--- .../client/petstore/java/webclient-jakarta/pom.xml | 6 +++--- .../java/webclient-nullable-arrays/build.gradle | 6 +++--- .../petstore/java/webclient-nullable-arrays/pom.xml | 6 +++--- .../petstore/java/webclient-swagger2/build.gradle | 6 +++--- .../client/petstore/java/webclient-swagger2/pom.xml | 6 +++--- samples/client/petstore/java/webclient/build.gradle | 6 +++--- samples/client/petstore/java/webclient/pom.xml | 6 +++--- 13 files changed, 45 insertions(+), 42 deletions(-) diff --git a/.github/workflows/samples-jdk17.yaml b/.github/workflows/samples-jdk17.yaml index e264ec628a5b..f2a4ccfb6370 100644 --- a/.github/workflows/samples-jdk17.yaml +++ b/.github/workflows/samples-jdk17.yaml @@ -8,6 +8,7 @@ on: - samples/client/petstore/java-helidon-client/se/** - samples/client/petstore/spring-http-interface-reactive/** - samples/client/petstore/spring-http-interface/** + - samples/client/petstore/java/webclient-jakarta/** # servers - samples/openapi3/server/petstore/springboot-3/** - samples/server/petstore/java-helidon-server/mp/** @@ -20,6 +21,7 @@ on: - samples/client/petstore/java-helidon-client/se/** - samples/client/petstore/spring-http-interface-reactive/** - samples/client/petstore/spring-http-interface/** + - samples/client/petstore/java/webclient-jakarta/** # servers - samples/openapi3/server/petstore/springboot-3/** - samples/server/petstore/java-helidon-server/mp/** @@ -38,6 +40,7 @@ jobs: - samples/client/petstore/java-helidon-client/se - samples/client/petstore/spring-http-interface-reactive - samples/client/petstore/spring-http-interface + - samples/client/petstore/java/webclient-jakarta # servers - samples/openapi3/server/petstore/springboot-3 - samples/server/petstore/java-helidon-server/mp diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache index a8eb081a5abb..53c528209a2d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache @@ -131,16 +131,16 @@ ext { swagger_annotations_version = "2.2.9" {{/swagger2AnnotationLibrary}} {{#useJakartaEe}} - spring_boot_version = "3.0.1" + spring_boot_version = "3.0.12" jakarta_annotation_version = "2.1.1" - reactor_version = "3.5.1" - reactor_netty_version = "1.1.1" + reactor_version = "3.5.12" + reactor_netty_version = "1.1.13" {{/useJakartaEe}} {{^useJakartaEe}} - spring_boot_version = "2.6.6" + spring_boot_version = "2.7.17" jakarta_annotation_version = "1.3.5" - reactor_version = "3.4.3" - reactor_netty_version = "1.0.4" + reactor_version = "3.4.34" + reactor_netty_version = "1.0.39" {{/useJakartaEe}} jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache index 9158c35e1a83..84ad1047c61c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache @@ -173,16 +173,16 @@ 0.2.6 {{/openApiNullable}} {{#useJakartaEe}} - 3.0.1 + 3.0.12 2.1.1 - 3.5.1 - 1.1.1 + 3.5.12 + 1.1.13 {{/useJakartaEe}} {{^useJakartaEe}} - 2.6.6 + 2.7.17 1.3.5 - 3.4.3 - 1.0.4 + 3.4.34 + 1.0.39 {{/useJakartaEe}} 4.13.2 {{#joda}} diff --git a/samples/client/others/java/webclient-useAbstractionForFiles/build.gradle b/samples/client/others/java/webclient-useAbstractionForFiles/build.gradle index e034c7fbc4eb..559d51536ef2 100644 --- a/samples/client/others/java/webclient-useAbstractionForFiles/build.gradle +++ b/samples/client/others/java/webclient-useAbstractionForFiles/build.gradle @@ -112,10 +112,10 @@ if(hasProperty('target') && target == 'android') { } ext { - spring_boot_version = "2.6.6" + spring_boot_version = "2.7.17" jakarta_annotation_version = "1.3.5" - reactor_version = "3.4.3" - reactor_netty_version = "1.0.4" + reactor_version = "3.4.34" + reactor_netty_version = "1.0.39" jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" jackson_databind_nullable_version = "0.2.6" diff --git a/samples/client/others/java/webclient-useAbstractionForFiles/pom.xml b/samples/client/others/java/webclient-useAbstractionForFiles/pom.xml index d3249097db87..8a0d4efccb11 100644 --- a/samples/client/others/java/webclient-useAbstractionForFiles/pom.xml +++ b/samples/client/others/java/webclient-useAbstractionForFiles/pom.xml @@ -123,10 +123,10 @@ 2.15.2 2.15.2 0.2.6 - 2.6.6 + 2.7.17 1.3.5 - 3.4.3 - 1.0.4 + 3.4.34 + 1.0.39 4.13.2 diff --git a/samples/client/petstore/java/webclient-jakarta/build.gradle b/samples/client/petstore/java/webclient-jakarta/build.gradle index 71ee7b668b7a..9e82e0e32b5c 100644 --- a/samples/client/petstore/java/webclient-jakarta/build.gradle +++ b/samples/client/petstore/java/webclient-jakarta/build.gradle @@ -112,10 +112,10 @@ if(hasProperty('target') && target == 'android') { } ext { - spring_boot_version = "3.0.1" + spring_boot_version = "3.0.12" jakarta_annotation_version = "2.1.1" - reactor_version = "3.5.1" - reactor_netty_version = "1.1.1" + reactor_version = "3.5.12" + reactor_netty_version = "1.1.13" jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" jackson_databind_nullable_version = "0.2.6" diff --git a/samples/client/petstore/java/webclient-jakarta/pom.xml b/samples/client/petstore/java/webclient-jakarta/pom.xml index c0ee7564416d..877afeb2de53 100644 --- a/samples/client/petstore/java/webclient-jakarta/pom.xml +++ b/samples/client/petstore/java/webclient-jakarta/pom.xml @@ -123,10 +123,10 @@ 2.15.2 2.15.2 0.2.6 - 3.0.1 + 3.0.12 2.1.1 - 3.5.1 - 1.1.1 + 3.5.12 + 1.1.13 4.13.2 diff --git a/samples/client/petstore/java/webclient-nullable-arrays/build.gradle b/samples/client/petstore/java/webclient-nullable-arrays/build.gradle index 6e36612f7023..690b3ea79966 100644 --- a/samples/client/petstore/java/webclient-nullable-arrays/build.gradle +++ b/samples/client/petstore/java/webclient-nullable-arrays/build.gradle @@ -112,10 +112,10 @@ if(hasProperty('target') && target == 'android') { } ext { - spring_boot_version = "2.6.6" + spring_boot_version = "2.7.17" jakarta_annotation_version = "1.3.5" - reactor_version = "3.4.3" - reactor_netty_version = "1.0.4" + reactor_version = "3.4.34" + reactor_netty_version = "1.0.39" jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" jackson_databind_nullable_version = "0.2.6" diff --git a/samples/client/petstore/java/webclient-nullable-arrays/pom.xml b/samples/client/petstore/java/webclient-nullable-arrays/pom.xml index ece14e13171b..898a6952def9 100644 --- a/samples/client/petstore/java/webclient-nullable-arrays/pom.xml +++ b/samples/client/petstore/java/webclient-nullable-arrays/pom.xml @@ -123,10 +123,10 @@ 2.15.2 2.15.2 0.2.6 - 2.6.6 + 2.7.17 1.3.5 - 3.4.3 - 1.0.4 + 3.4.34 + 1.0.39 4.13.2 diff --git a/samples/client/petstore/java/webclient-swagger2/build.gradle b/samples/client/petstore/java/webclient-swagger2/build.gradle index 96475de4b16f..9052967eaba1 100644 --- a/samples/client/petstore/java/webclient-swagger2/build.gradle +++ b/samples/client/petstore/java/webclient-swagger2/build.gradle @@ -113,10 +113,10 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "2.2.9" - spring_boot_version = "2.6.6" + spring_boot_version = "2.7.17" jakarta_annotation_version = "1.3.5" - reactor_version = "3.4.3" - reactor_netty_version = "1.0.4" + reactor_version = "3.4.34" + reactor_netty_version = "1.0.39" jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" jackson_databind_nullable_version = "0.2.6" diff --git a/samples/client/petstore/java/webclient-swagger2/pom.xml b/samples/client/petstore/java/webclient-swagger2/pom.xml index 760405970e7a..e8297f3e9547 100644 --- a/samples/client/petstore/java/webclient-swagger2/pom.xml +++ b/samples/client/petstore/java/webclient-swagger2/pom.xml @@ -129,10 +129,10 @@ 2.15.2 2.15.2 0.2.6 - 2.6.6 + 2.7.17 1.3.5 - 3.4.3 - 1.0.4 + 3.4.34 + 1.0.39 4.13.2 diff --git a/samples/client/petstore/java/webclient/build.gradle b/samples/client/petstore/java/webclient/build.gradle index a804139148d9..e34609ac6301 100644 --- a/samples/client/petstore/java/webclient/build.gradle +++ b/samples/client/petstore/java/webclient/build.gradle @@ -112,10 +112,10 @@ if(hasProperty('target') && target == 'android') { } ext { - spring_boot_version = "2.6.6" + spring_boot_version = "2.7.17" jakarta_annotation_version = "1.3.5" - reactor_version = "3.4.3" - reactor_netty_version = "1.0.4" + reactor_version = "3.4.34" + reactor_netty_version = "1.0.39" jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" jackson_databind_nullable_version = "0.2.6" diff --git a/samples/client/petstore/java/webclient/pom.xml b/samples/client/petstore/java/webclient/pom.xml index fbfc0947328b..475fc63d50d6 100644 --- a/samples/client/petstore/java/webclient/pom.xml +++ b/samples/client/petstore/java/webclient/pom.xml @@ -123,10 +123,10 @@ 2.15.2 2.15.2 0.2.6 - 2.6.6 + 2.7.17 1.3.5 - 3.4.3 - 1.0.4 + 3.4.34 + 1.0.39 4.13.2