From 8cda070d61aa94561b0789978fc1d2706335ea85 Mon Sep 17 00:00:00 2001
From: "yadong.zhang" <yadong.zhang0415@gmail.com>
Date: Thu, 23 Sep 2021 00:06:16 +0800
Subject: [PATCH] :pushpin: jap-http-jakarta-adapter version -> 1.0.1

---
 .../jap/core/context/JapAuthenticationTest.java        |  4 ++--
 .../java/com/fujieid/jap/core/util/JapUtilTest.java    |  2 +-
 .../fujieid/jap/web/filter/IdsAccessTokenFilter.java   |  4 ++--
 .../fujieid/jap/web/filter/IdsUserStatusFilter.java    |  4 ++--
 .../src/test/java/com/fujieid/jap/ids/BaseIdsTest.java |  2 +-
 .../com/fujieid/jap/oauth2/Oauth2StrategyTest.java     |  4 ++--
 .../java/com/fujieid/jap/oauth2/Oauth2UtilTest.java    |  2 +-
 .../jap/oauth2/token/AccessTokenHelperTest.java        |  2 +-
 .../test/java/com/fujieid/jap/sso/JapSsoUtilTest.java  |  2 +-
 pom.xml                                                | 10 +++++-----
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/jap-core/src/test/java/com/fujieid/jap/core/context/JapAuthenticationTest.java b/jap-core/src/test/java/com/fujieid/jap/core/context/JapAuthenticationTest.java
index a7a925d..a260893 100644
--- a/jap-core/src/test/java/com/fujieid/jap/core/context/JapAuthenticationTest.java
+++ b/jap-core/src/test/java/com/fujieid/jap/core/context/JapAuthenticationTest.java
@@ -24,8 +24,8 @@ import com.fujieid.jap.core.result.JapResponse;
 import com.fujieid.jap.core.store.JapUserStore;
 import com.fujieid.jap.http.JapHttpRequest;
 import com.fujieid.jap.http.JapHttpResponse;
-import com.fujieid.jap.http.jakarta.JakartaRequestAdapter;
-import com.fujieid.jap.http.jakarta.JakartaResponseAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaRequestAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaResponseAdapter;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/jap-core/src/test/java/com/fujieid/jap/core/util/JapUtilTest.java b/jap-core/src/test/java/com/fujieid/jap/core/util/JapUtilTest.java
index a248f07..292aa92 100644
--- a/jap-core/src/test/java/com/fujieid/jap/core/util/JapUtilTest.java
+++ b/jap-core/src/test/java/com/fujieid/jap/core/util/JapUtilTest.java
@@ -17,7 +17,7 @@ package com.fujieid.jap.core.util;
 
 import com.fujieid.jap.core.JapUser;
 import com.fujieid.jap.http.JapHttpRequest;
-import com.fujieid.jap.http.jakarta.JakartaRequestAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaRequestAdapter;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/jap-ids-web/src/main/java/com/fujieid/jap/web/filter/IdsAccessTokenFilter.java b/jap-ids-web/src/main/java/com/fujieid/jap/web/filter/IdsAccessTokenFilter.java
index e64ae8c..624640c 100644
--- a/jap-ids-web/src/main/java/com/fujieid/jap/web/filter/IdsAccessTokenFilter.java
+++ b/jap-ids-web/src/main/java/com/fujieid/jap/web/filter/IdsAccessTokenFilter.java
@@ -17,8 +17,8 @@ package com.fujieid.jap.web.filter;
 
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
-import com.fujieid.jap.http.jakarta.JakartaRequestAdapter;
-import com.fujieid.jap.http.jakarta.JakartaResponseAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaRequestAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaResponseAdapter;
 import com.fujieid.jap.ids.JapIds;
 import com.fujieid.jap.ids.pipeline.IdsPipeline;
 import com.fujieid.jap.ids.util.TokenUtil;
diff --git a/jap-ids-web/src/main/java/com/fujieid/jap/web/filter/IdsUserStatusFilter.java b/jap-ids-web/src/main/java/com/fujieid/jap/web/filter/IdsUserStatusFilter.java
index c877c05..61775b7 100644
--- a/jap-ids-web/src/main/java/com/fujieid/jap/web/filter/IdsUserStatusFilter.java
+++ b/jap-ids-web/src/main/java/com/fujieid/jap/web/filter/IdsUserStatusFilter.java
@@ -15,8 +15,8 @@
  */
 package com.fujieid.jap.web.filter;
 
-import com.fujieid.jap.http.jakarta.JakartaRequestAdapter;
-import com.fujieid.jap.http.jakarta.JakartaResponseAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaRequestAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaResponseAdapter;
 import com.fujieid.jap.ids.JapIds;
 import com.fujieid.jap.ids.exception.IdsException;
 import com.fujieid.jap.ids.model.enums.ErrorResponse;
diff --git a/jap-ids/src/test/java/com/fujieid/jap/ids/BaseIdsTest.java b/jap-ids/src/test/java/com/fujieid/jap/ids/BaseIdsTest.java
index 77be1ce..30c6973 100644
--- a/jap-ids/src/test/java/com/fujieid/jap/ids/BaseIdsTest.java
+++ b/jap-ids/src/test/java/com/fujieid/jap/ids/BaseIdsTest.java
@@ -1,7 +1,7 @@
 package com.fujieid.jap.ids;
 
 import com.fujieid.jap.http.JapHttpRequest;
-import com.fujieid.jap.http.jakarta.JakartaRequestAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaRequestAdapter;
 import com.fujieid.jap.ids.config.IdsConfig;
 import com.fujieid.jap.ids.config.JwtConfig;
 import com.fujieid.jap.ids.context.IdsContext;
diff --git a/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/Oauth2StrategyTest.java b/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/Oauth2StrategyTest.java
index b308e62..9d192cf 100644
--- a/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/Oauth2StrategyTest.java
+++ b/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/Oauth2StrategyTest.java
@@ -23,8 +23,8 @@ import com.fujieid.jap.core.config.JapConfig;
 import com.fujieid.jap.core.result.JapResponse;
 import com.fujieid.jap.http.JapHttpRequest;
 import com.fujieid.jap.http.JapHttpResponse;
-import com.fujieid.jap.http.jakarta.JakartaRequestAdapter;
-import com.fujieid.jap.http.jakarta.JakartaResponseAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaRequestAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaResponseAdapter;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/Oauth2UtilTest.java b/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/Oauth2UtilTest.java
index a52828b..f361b17 100644
--- a/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/Oauth2UtilTest.java
+++ b/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/Oauth2UtilTest.java
@@ -21,7 +21,7 @@ import com.fujieid.jap.core.context.JapAuthentication;
 import com.fujieid.jap.core.context.JapContext;
 import com.fujieid.jap.core.exception.JapOauth2Exception;
 import com.fujieid.jap.http.JapHttpRequest;
-import com.fujieid.jap.http.jakarta.JakartaRequestAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaRequestAdapter;
 import com.fujieid.jap.oauth2.pkce.PkceCodeChallengeMethod;
 import com.xkcoding.json.util.Kv;
 import org.junit.Assert;
diff --git a/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/token/AccessTokenHelperTest.java b/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/token/AccessTokenHelperTest.java
index 92f39bc..eedf676 100644
--- a/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/token/AccessTokenHelperTest.java
+++ b/jap-oauth2/src/test/java/com/fujieid/jap/oauth2/token/AccessTokenHelperTest.java
@@ -22,7 +22,7 @@ import com.fujieid.jap.core.context.JapContext;
 import com.fujieid.jap.core.exception.JapOauth2Exception;
 import com.fujieid.jap.core.exception.OidcException;
 import com.fujieid.jap.http.JapHttpRequest;
-import com.fujieid.jap.http.jakarta.JakartaRequestAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaRequestAdapter;
 import com.fujieid.jap.oauth2.OAuthConfig;
 import com.fujieid.jap.oauth2.Oauth2GrantType;
 import com.fujieid.jap.oauth2.Oauth2ResponseType;
diff --git a/jap-sso/src/test/java/com/fujieid/jap/sso/JapSsoUtilTest.java b/jap-sso/src/test/java/com/fujieid/jap/sso/JapSsoUtilTest.java
index 13bf386..a493eec 100644
--- a/jap-sso/src/test/java/com/fujieid/jap/sso/JapSsoUtilTest.java
+++ b/jap-sso/src/test/java/com/fujieid/jap/sso/JapSsoUtilTest.java
@@ -17,7 +17,7 @@ package com.fujieid.jap.sso;
 
 import com.baomidou.kisso.security.token.SSOToken;
 import com.fujieid.jap.http.JapHttpRequest;
-import com.fujieid.jap.http.jakarta.JakartaRequestAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaRequestAdapter;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/pom.xml b/pom.xml
index 0c5e0bb..c447679 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,10 +84,10 @@
     <zxing.version>3.3.3</zxing.version>
     <googleauth.version>1.5.0</googleauth.version>
     <commons-cli.version>1.4</commons-cli.version>
+    <jap-http.version>1.0.0</jap-http.version>
+    <jap-http-jakarta-adapter.version>1.0.1</jap-http-jakarta-adapter.version>
     <!-- Only for jap-mfa -->
     <httpclient.version>4.5.13</httpclient.version>
-    <jap-http.version>1.0.0</jap-http.version>
-    <jap-http-adapter.version>1.0.0</jap-http-adapter.version>
   </properties>
 
   <dependencies>
@@ -117,7 +117,7 @@
       <artifactId>jap-http</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fujieid.jap.http</groupId>
+      <groupId>com.fujieid.jap.http.adapter</groupId>
       <artifactId>jap-http-jakarta-adapter</artifactId>
     </dependency>
   </dependencies>
@@ -257,9 +257,9 @@
         <version>${jap-http.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.fujieid.jap.http</groupId>
+        <groupId>com.fujieid.jap.http.adapter</groupId>
         <artifactId>jap-http-jakarta-adapter</artifactId>
-        <version>${jap-http-adapter.version}</version>
+        <version>${jap-http-jakarta-adapter.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
-- 
GitLab