From 41e97e6d2bd817c39e0ce6593acea8b9b290ddd6 Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Tue, 12 May 2020 18:57:25 -0700
Subject: [PATCH 1/2] Mustache template should use invokerPackage tag to
 generate import

---
 .../Java/libraries/jersey2/AbstractOpenApiSchema.mustache       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
index cdba3be84552..c924650e6c0a 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache
@@ -2,7 +2,7 @@
 
 package {{invokerPackage}}.model;
 
-import org.openapitools.client.ApiException;
+import {{invokerPackage}}.ApiException;
 import java.lang.reflect.Type;
 import java.util.Map;
 import javax.ws.rs.core.GenericType;

From 5a4fff548323023a59be106143bc0270a08703f0 Mon Sep 17 00:00:00 2001
From: "Sebastien Rosset (serosset)" <serosset@cisco.com>
Date: Sat, 23 May 2020 01:43:49 +0000
Subject: [PATCH 2/2] Fix tag for http signature in pom.xml

---
 .../main/resources/Java/libraries/jersey2/pom.mustache    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 d186a51fb981..873fb95968d5 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
@@ -338,13 +338,13 @@
             <version>${commons-io-version}</version>
         </dependency>
         {{/supportJava6}}
-        {{#hasHttpBasicMethods}}
+        {{#hasHttpSignatureMethods}}
         <dependency>
             <groupId>org.tomitribe</groupId>
             <artifactId>tomitribe-http-signatures</artifactId>
             <version>${http-signature-version}</version>
         </dependency>
-        {{/hasHttpBasicMethods}}
+        {{/hasHttpSignatureMethods}}
         {{#hasOAuthMethods}}
         <dependency>
             <groupId>com.github.scribejava</groupId>
@@ -387,9 +387,9 @@
         <threetenbp-version>2.9.10</threetenbp-version>
         {{/threetenbp}}
         <junit-version>4.13</junit-version>
-        {{#hasHttpBasicMethods}}
+        {{#hasHttpSignatureMethods}}
         <http-signature-version>1.4</http-signature-version>
-        {{/hasHttpBasicMethods}}
+        {{/hasHttpSignatureMethods}}
         {{#hasOAuthMethods}}
         <scribejava-apis-version>6.9.0</scribejava-apis-version>
         {{/hasOAuthMethods}}