From 743202241eff70c10e258f658fac2fbfdcbb4f6d Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 24 Nov 2022 23:55:14 +0800 Subject: [PATCH] [Java][native][apache-httpclient] update dependencies to newer versions (#14110) * update java native dependencies to newer versions * update java native, apache-httpclient to newer version --- .../apache-httpclient/build.gradle.mustache | 6 +-- .../libraries/apache-httpclient/pom.mustache | 37 ++++++++++--------- .../libraries/native/build.gradle.mustache | 8 +++- .../Java/libraries/native/pom.mustache | 22 ++++++----- .../java/apache-httpclient/build.gradle | 6 +-- .../petstore/java/apache-httpclient/pom.xml | 24 ++++++------ .../petstore/java/native-async/build.gradle | 4 +- .../client/petstore/java/native-async/pom.xml | 19 +++++----- .../client/petstore/java/native/build.gradle | 4 +- samples/client/petstore/java/native/pom.xml | 19 +++++----- 10 files changed, 74 insertions(+), 75 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache index 911979d76a4..6c7379be3ce 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache @@ -113,9 +113,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.22" - jackson_version = "2.13.4" - jackson_databind_version = "2.13.4.2" + swagger_annotations_version = "1.6.6" + jackson_version = "2.14.1" + jackson_databind_version = "2.14.1" {{#openApiNullable}} jackson_databind_nullable_version = "0.2.4" {{/openApiNullable}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache index 343f4334bdc..6e5abf83f99 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache @@ -43,7 +43,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -60,7 +60,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M1 + 3.1.0 enforce-maven @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12 + 3.0.0-M7 @@ -90,6 +90,7 @@ -Xms512m -Xmx1500m methods + 10 pertest @@ -112,11 +113,10 @@ org.apache.maven.plugins maven-jar-plugin - 2.2 + 3.3.0 - jar test-jar @@ -128,7 +128,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.10 + 3.3.0 add_sources @@ -159,7 +159,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.1 none 1.8 @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.2.1 attach-sources @@ -197,7 +197,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 3.0.1 sign-artifacts @@ -299,7 +299,7 @@ org.hibernate hibernate-validator - 5.4.1.Final + 5.4.3.Final {{/performBeanValidation}} {{#parcelableModel}} @@ -334,18 +334,19 @@ UTF-8 + {{#swagger1AnnotationLibrary}} 1.6.6 + {{/swagger1AnnotationLibrary}} 4.5.13 - 2.13.4 - 2.13.4.2 -{{#openApiNullable}} + 2.14.1 + 2.14.1 + {{#openApiNullable}} 0.2.4 -{{/openApiNullable}} + {{/openApiNullable}} 1.3.5 -{{#useBeanValidation}} - 2.0.2 -{{/useBeanValidation}} - 1.0.0 + {{#useBeanValidation}} + 3.0.2 + {{/useBeanValidation}} 4.13.2 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache index 6bfd3f6fed6..a7ae198508c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache @@ -62,14 +62,18 @@ artifacts { ext { - swagger_annotations_version = "1.5.22" - jackson_version = "2.13.4" + {{#swagger1AnnotationLibrary}} + swagger_annotations_version = "1.6.9" + {{/swagger1AnnotationLibrary}} + jackson_version = "2.14.1" jakarta_annotation_version = "1.3.5" junit_version = "4.13.2" } dependencies { + {{#swagger1AnnotationLibrary}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swagger1AnnotationLibrary}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache index 584a57fffec..2a40aad08a7 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache @@ -42,7 +42,7 @@ maven-enforcer-plugin - 3.0.0-M1 + 3.1.0 enforce-maven @@ -64,7 +64,7 @@ maven-surefire-plugin - 3.0.0-M3 + 3.0.0-M7 conf/log4j.properties @@ -76,7 +76,7 @@ maven-dependency-plugin - 3.1.1 + 3.3.0 package @@ -94,7 +94,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.2 + 3.3.0 @@ -107,12 +107,12 @@ maven-compiler-plugin - 3.8.1 + 3.10.1 org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.1 attach-javadocs @@ -124,7 +124,7 @@ maven-source-plugin - 3.1.0 + 3.2.1 attach-sources @@ -144,7 +144,7 @@ maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts @@ -220,10 +220,12 @@ UTF-8 - 1.6.6 + {{#swagger1AnnotationLibrary}} + 1.6.9 + {{/swagger1AnnotationLibrary}} 11 11 - 2.13.4 + 2.14.1 0.2.4 1.3.5 4.13.2 diff --git a/samples/client/petstore/java/apache-httpclient/build.gradle b/samples/client/petstore/java/apache-httpclient/build.gradle index f344755af48..4378618057f 100644 --- a/samples/client/petstore/java/apache-httpclient/build.gradle +++ b/samples/client/petstore/java/apache-httpclient/build.gradle @@ -113,9 +113,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.22" - jackson_version = "2.13.4" - jackson_databind_version = "2.13.4.2" + swagger_annotations_version = "1.6.6" + jackson_version = "2.14.1" + jackson_databind_version = "2.14.1" jackson_databind_nullable_version = "0.2.4" jakarta_annotation_version = "1.3.5" httpclient_version = "4.5.13" diff --git a/samples/client/petstore/java/apache-httpclient/pom.xml b/samples/client/petstore/java/apache-httpclient/pom.xml index 847bb322c57..e87487e616b 100644 --- a/samples/client/petstore/java/apache-httpclient/pom.xml +++ b/samples/client/petstore/java/apache-httpclient/pom.xml @@ -36,7 +36,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 1.8 1.8 @@ -53,7 +53,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M1 + 3.1.0 enforce-maven @@ -73,7 +73,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12 + 3.0.0-M7 @@ -83,6 +83,7 @@ -Xms512m -Xmx1500m methods + 10 pertest @@ -105,11 +106,10 @@ org.apache.maven.plugins maven-jar-plugin - 2.2 + 3.3.0 - jar test-jar @@ -121,7 +121,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.10 + 3.3.0 add_sources @@ -152,7 +152,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.1 none 1.8 @@ -169,7 +169,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.2.1 attach-sources @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 3.0.1 sign-artifacts @@ -275,13 +275,11 @@ UTF-8 - 1.6.6 4.5.13 - 2.13.4 - 2.13.4.2 + 2.14.1 + 2.14.1 0.2.4 1.3.5 - 1.0.0 4.13.2 diff --git a/samples/client/petstore/java/native-async/build.gradle b/samples/client/petstore/java/native-async/build.gradle index d69b1d80788..e8e2a8f42d8 100644 --- a/samples/client/petstore/java/native-async/build.gradle +++ b/samples/client/petstore/java/native-async/build.gradle @@ -62,14 +62,12 @@ artifacts { ext { - swagger_annotations_version = "1.5.22" - jackson_version = "2.13.4" + jackson_version = "2.14.1" jakarta_annotation_version = "1.3.5" junit_version = "4.13.2" } dependencies { - implementation "io.swagger:swagger-annotations:$swagger_annotations_version" implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" diff --git a/samples/client/petstore/java/native-async/pom.xml b/samples/client/petstore/java/native-async/pom.xml index 11457d2f724..ea73292b75f 100644 --- a/samples/client/petstore/java/native-async/pom.xml +++ b/samples/client/petstore/java/native-async/pom.xml @@ -35,7 +35,7 @@ maven-enforcer-plugin - 3.0.0-M1 + 3.1.0 enforce-maven @@ -57,7 +57,7 @@ maven-surefire-plugin - 3.0.0-M3 + 3.0.0-M7 conf/log4j.properties @@ -69,7 +69,7 @@ maven-dependency-plugin - 3.1.1 + 3.3.0 package @@ -87,7 +87,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.2 + 3.3.0 @@ -100,12 +100,12 @@ maven-compiler-plugin - 3.8.1 + 3.10.1 org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.1 attach-javadocs @@ -117,7 +117,7 @@ maven-source-plugin - 3.1.0 + 3.2.1 attach-sources @@ -137,7 +137,7 @@ maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts @@ -206,10 +206,9 @@ UTF-8 - 1.6.6 11 11 - 2.13.4 + 2.14.1 0.2.4 1.3.5 4.13.2 diff --git a/samples/client/petstore/java/native/build.gradle b/samples/client/petstore/java/native/build.gradle index d69b1d80788..e8e2a8f42d8 100644 --- a/samples/client/petstore/java/native/build.gradle +++ b/samples/client/petstore/java/native/build.gradle @@ -62,14 +62,12 @@ artifacts { ext { - swagger_annotations_version = "1.5.22" - jackson_version = "2.13.4" + jackson_version = "2.14.1" jakarta_annotation_version = "1.3.5" junit_version = "4.13.2" } dependencies { - implementation "io.swagger:swagger-annotations:$swagger_annotations_version" implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" diff --git a/samples/client/petstore/java/native/pom.xml b/samples/client/petstore/java/native/pom.xml index 11457d2f724..ea73292b75f 100644 --- a/samples/client/petstore/java/native/pom.xml +++ b/samples/client/petstore/java/native/pom.xml @@ -35,7 +35,7 @@ maven-enforcer-plugin - 3.0.0-M1 + 3.1.0 enforce-maven @@ -57,7 +57,7 @@ maven-surefire-plugin - 3.0.0-M3 + 3.0.0-M7 conf/log4j.properties @@ -69,7 +69,7 @@ maven-dependency-plugin - 3.1.1 + 3.3.0 package @@ -87,7 +87,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.2 + 3.3.0 @@ -100,12 +100,12 @@ maven-compiler-plugin - 3.8.1 + 3.10.1 org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.1 attach-javadocs @@ -117,7 +117,7 @@ maven-source-plugin - 3.1.0 + 3.2.1 attach-sources @@ -137,7 +137,7 @@ maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts @@ -206,10 +206,9 @@ UTF-8 - 1.6.6 11 11 - 2.13.4 + 2.14.1 0.2.4 1.3.5 4.13.2