From c81359304d96d2ed2d391ef24358ed0d9a74b29c Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 17 May 2020 17:59:57 +0800 Subject: [PATCH] fix gradle in some java clients (#6339) --- .../Java/libraries/jersey2/build.gradle.mustache | 8 ++++++++ .../resources/Java/libraries/jersey2/build.sbt.mustache | 4 ++++ .../main/resources/Java/libraries/jersey2/pom.mustache | 5 ++++- .../resources/Java/libraries/vertx/build.gradle.mustache | 2 ++ samples/client/petstore/java/jersey2-java7/build.gradle | 4 ++++ samples/client/petstore/java/jersey2-java7/build.sbt | 2 ++ samples/client/petstore/java/jersey2-java7/pom.xml | 3 ++- samples/client/petstore/java/jersey2-java8/build.gradle | 4 ++++ samples/client/petstore/java/jersey2-java8/build.sbt | 2 ++ samples/client/petstore/java/jersey2-java8/pom.xml | 3 ++- samples/client/petstore/java/vertx/build.gradle | 2 ++ 11 files changed, 36 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache index 633cd317963..90843185f55 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache @@ -134,6 +134,10 @@ ext { {{#threetenbp}} threetenbp_version = "2.9.10" {{/threetenbp}} + {{#hasOAuthMethods}} + scribejava_apis_version = "6.9.0" + {{/hasOAuthMethods}} + tomitribe_http_signatures_version = "1.3" } dependencies { @@ -152,6 +156,10 @@ dependencies { {{#java8}} compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} + {{#hasOAuthMethods}} + compile "com.github.scribejava:scribejava-apis:$scribejava_apis_version" + {{/hasOAuthMethods}} + compile "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version" {{#supportJava6}} compile "commons-io:commons-io:$commons_io_version" compile "org.apache.commons:commons-lang3:$commons_lang3_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache index d3dd1b5c50a..e179fc9054a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache @@ -25,6 +25,10 @@ lazy val root = (project in file(".")). {{#threetenbp}} "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", {{/threetenbp}} + {{#hasOAuthMethods}} + "com.github.scribejava" % "scribejava-apis" % "6.9.0" % "compile", + {{/hasOAuthMethods}} + "org.tomitribe" % "tomitribe-http-signatures" % "1.3" % "compile", {{^java8}} "com.brsanthu" % "migbase64" % "2.2", {{/java8}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache index 99e6822fd13..9030427467c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -347,7 +347,7 @@ com.github.scribejava scribejava-apis - 6.9.0 + ${scribejava-apis-version} {{/hasOAuthMethods}} {{#useBeanValidation}} @@ -386,5 +386,8 @@ {{/threetenbp}} 4.13 1.3 + {{#hasOAuthMethods}} + 6.9.0 + {{/hasOAuthMethods}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache index 5287bc16166..c6c76b8e8b8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache @@ -32,6 +32,7 @@ ext { jackson_databind_version = "2.10.4" vertx_version = "3.4.2" junit_version = "4.13" + jackson_databind_nullable_version = "0.2.1" } dependencies { @@ -51,6 +52,7 @@ dependencies { {{#threetenbp}} compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version" {{/threetenbp}} + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" testCompile "junit:junit:$junit_version" testCompile "io.vertx:vertx-unit:$vertx_version" } diff --git a/samples/client/petstore/java/jersey2-java7/build.gradle b/samples/client/petstore/java/jersey2-java7/build.gradle index 9380cb95d7f..ac52f6ddae5 100644 --- a/samples/client/petstore/java/jersey2-java7/build.gradle +++ b/samples/client/petstore/java/jersey2-java7/build.gradle @@ -101,6 +101,8 @@ ext { jersey_version = "2.27" junit_version = "4.13" threetenbp_version = "2.9.10" + scribejava_apis_version = "6.9.0" + tomitribe_http_signatures_version = "1.3" } dependencies { @@ -113,6 +115,8 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + compile "com.github.scribejava:scribejava-apis:$scribejava_apis_version" + compile "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version" compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" compile "com.brsanthu:migbase64:2.2" testCompile "junit:junit:$junit_version" diff --git a/samples/client/petstore/java/jersey2-java7/build.sbt b/samples/client/petstore/java/jersey2-java7/build.sbt index c8b2c019694..b61577d94c7 100644 --- a/samples/client/petstore/java/jersey2-java7/build.sbt +++ b/samples/client/petstore/java/jersey2-java7/build.sbt @@ -17,6 +17,8 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile", + "com.github.scribejava" % "scribejava-apis" % "6.9.0" % "compile", + "org.tomitribe" % "tomitribe-http-signatures" % "1.3" % "compile", "com.brsanthu" % "migbase64" % "2.2", "junit" % "junit" % "4.13" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" diff --git a/samples/client/petstore/java/jersey2-java7/pom.xml b/samples/client/petstore/java/jersey2-java7/pom.xml index 5d2902e0521..2e89bebce3f 100644 --- a/samples/client/petstore/java/jersey2-java7/pom.xml +++ b/samples/client/petstore/java/jersey2-java7/pom.xml @@ -287,7 +287,7 @@ com.github.scribejava scribejava-apis - 6.9.0 + ${scribejava-apis-version} @@ -307,5 +307,6 @@ 2.9.10 4.13 1.3 + 6.9.0 diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle index d6e296d67b2..ae42ace869b 100644 --- a/samples/client/petstore/java/jersey2-java8/build.gradle +++ b/samples/client/petstore/java/jersey2-java8/build.gradle @@ -100,6 +100,8 @@ ext { jackson_databind_nullable_version = "0.2.1" jersey_version = "2.27" junit_version = "4.13" + scribejava_apis_version = "6.9.0" + tomitribe_http_signatures_version = "1.3" } dependencies { @@ -113,6 +115,8 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + compile "com.github.scribejava:scribejava-apis:$scribejava_apis_version" + compile "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version" testCompile "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/jersey2-java8/build.sbt b/samples/client/petstore/java/jersey2-java8/build.sbt index 4e2c99a4c28..6d3d373e83b 100644 --- a/samples/client/petstore/java/jersey2-java8/build.sbt +++ b/samples/client/petstore/java/jersey2-java8/build.sbt @@ -17,6 +17,8 @@ lazy val root = (project in file(".")). "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile", + "com.github.scribejava" % "scribejava-apis" % "6.9.0" % "compile", + "org.tomitribe" % "tomitribe-http-signatures" % "1.3" % "compile", "junit" % "junit" % "4.13" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml index 0fb9a28f39d..4bf52a3ef02 100644 --- a/samples/client/petstore/java/jersey2-java8/pom.xml +++ b/samples/client/petstore/java/jersey2-java8/pom.xml @@ -281,7 +281,7 @@ com.github.scribejava scribejava-apis - 6.9.0 + ${scribejava-apis-version} @@ -300,5 +300,6 @@ 0.2.1 4.13 1.3 + 6.9.0 diff --git a/samples/client/petstore/java/vertx/build.gradle b/samples/client/petstore/java/vertx/build.gradle index 6cc28bdf957..bf87fa8200b 100644 --- a/samples/client/petstore/java/vertx/build.gradle +++ b/samples/client/petstore/java/vertx/build.gradle @@ -32,6 +32,7 @@ ext { jackson_databind_version = "2.10.4" vertx_version = "3.4.2" junit_version = "4.13" + jackson_databind_nullable_version = "0.2.1" } dependencies { @@ -43,6 +44,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" testCompile "junit:junit:$junit_version" testCompile "io.vertx:vertx-unit:$vertx_version" }