From 54cb067251768cc5e586fe52a0c7fb61d06c60ee Mon Sep 17 00:00:00 2001
From: Tim Clark <timothygclark@gmail.com>
Date: Fri, 31 Jul 2020 16:10:49 +0000
Subject: [PATCH] [Java][jersey2]Fix gradle HttpSignatureAuth dependencies

* Corrects tag for including HttpSignatureAuth in gradle builds
* Updates version of org.tomitribe:tomitribe-http-signatures in
gradle template to match version from maven template
* Updates samples
---
 .../Java/libraries/jersey2/build.gradle.mustache       | 10 +++++-----
 .../client/petstore/java/jersey2-java8/build.gradle    |  2 --
 .../client/petstore/java/jersey2-java8/build.gradle    |  2 +-
 3 files changed, 6 insertions(+), 8 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 fa00d428c3fd..b2f37d720e9a 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
@@ -137,9 +137,9 @@ ext {
     {{#hasOAuthMethods}}
     scribejava_apis_version = "6.9.0"
     {{/hasOAuthMethods}}
-    {{#hasHttpBasicMethods}}
-    tomitribe_http_signatures_version = "1.3"
-    {{/hasHttpBasicMethods}}
+    {{#hasHttpSignatureMethods}}
+    tomitribe_http_signatures_version = "1.5"
+    {{/hasHttpSignatureMethods}}
 }
 
 dependencies {
@@ -161,9 +161,9 @@ dependencies {
     {{#hasOAuthMethods}}
     compile "com.github.scribejava:scribejava-apis:$scribejava_apis_version"
     {{/hasOAuthMethods}}
-    {{#hasHttpBasicMethods}}
+    {{#hasHttpSignatureMethods}}
     compile "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version"
-    {{/hasHttpBasicMethods}}
+    {{/hasHttpSignatureMethods}}
     {{#supportJava6}}
     compile "commons-io:commons-io:$commons_io_version"
     compile "org.apache.commons:commons-lang3:$commons_lang3_version"
diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle
index 9fd264d4f8b6..ce0818364e37 100644
--- a/samples/client/petstore/java/jersey2-java8/build.gradle
+++ b/samples/client/petstore/java/jersey2-java8/build.gradle
@@ -101,7 +101,6 @@ ext {
     jersey_version = "2.27"
     junit_version = "4.13"
     scribejava_apis_version = "6.9.0"
-    tomitribe_http_signatures_version = "1.3"
 }
 
 dependencies {
@@ -116,7 +115,6 @@ dependencies {
     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"
     compile 'javax.annotation:javax.annotation-api:1.3.2'
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle b/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
index 621ae35ce3a9..f100f9868637 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
@@ -101,7 +101,7 @@ ext {
     jersey_version = "2.27"
     junit_version = "4.13"
     scribejava_apis_version = "6.9.0"
-    tomitribe_http_signatures_version = "1.3"
+    tomitribe_http_signatures_version = "1.5"
 }
 
 dependencies {