Merge pull request #22 from umjammer/0.1.11

0.1.11
umjammer · May 4, 2024 · 367bf69 · 367bf69
2 parents 6a63c57 + ec97cca
commit 367bf69
Show file tree

Hide file tree

Showing 90 changed files with 45 additions and 213 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>vavi</groupId>
   <artifactId>vavi-net-auth</artifactId>
-  <version>0.1.10</version>
+  <version>0.1.11</version>
 
   <modules>
     <module>vavi-net-auth-common</module>
@@ -19,7 +19,7 @@
 
   <properties>
     <vavi-commons-net.groupId>com.github.umjammer</vavi-commons-net.groupId> <!-- vavi -->
-    <vavi-commons-net.version>1.0.7</vavi-commons-net.version>
+    <vavi-commons-net.version>1.0.9</vavi-commons-net.version>
   </properties>
 
   <packaging>pom</packaging>
@@ -80,7 +80,7 @@
       <dependency>
         <groupId>vavi</groupId>
         <artifactId>vavi-net-auth-common</artifactId>
-        <version>0.1.10</version>
+        <version>0.1.11</version>
       </dependency>
       <dependency>
         <!-- tiny http server for oauth -->
@@ -100,7 +100,7 @@
       <dependency>
         <groupId>vavi</groupId>
         <artifactId>vavi-net-auth-common</artifactId>
-        <version>0.1.10</version>
+        <version>0.1.11</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>

diff --git a/vavi-net-auth-amazon/pom.xml b/vavi-net-auth-amazon/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>vavi</groupId>
     <artifactId>vavi-net-auth</artifactId>
-    <version>0.1.10</version>
+    <version>0.1.11</version>
   </parent>
 
   <artifactId>vavi-net-auth-amazon</artifactId>
@@ -32,22 +32,18 @@
     </profile>
 
     <profile>
-      <id>local (not on CI)</id>
+      <id>local</id>
       <activation>
         <file>
           <exists>${basedir}/local.properties</exists>
         </file>
-        <property>
-          <name>env.JITPACK</name>
-          <value>!true</value>
-        </property>
       </activation>
       <build>
         <plugins>
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>properties-maven-plugin</artifactId>
-            <version>1.0.0</version>
+            <version>1.2.1</version>
             <executions>
               <execution>
                 <phase>initialize</phase>
@@ -62,29 +58,24 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <trimStackTrace>false</trimStackTrace>
+              <argLine>
+                -Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties
+              </argLine>
+              <environmentVariables>
+                <TEST_AMAZON_ACCOUNT>${test.account}</TEST_AMAZON_ACCOUNT>
+              </environmentVariables>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>
   </profiles>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <trimStackTrace>false</trimStackTrace>
-          <argLine>
-            -Djava.util.logging.config.file=${project.build.testResources.testResource.directory}/logging.properties
-          </argLine>
-          <environmentVariables>
-            <TEST_AMAZON_ACCOUNT>${test.account}</TEST_AMAZON_ACCOUNT>
-          </environmentVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <repositories>
     <repository>
       <id>jitpack.io</id>
@@ -120,7 +111,7 @@
 <dependency>
   <groupId>io.netty</groupId>
   <artifactId>netty-handler</artifactId>
-  <version>4.1.106.Final</version>
+  <version>4.1.107.Final</version>
 </dependency>
 
     <dependency>

diff --git a/vavi-net-auth-amazon/src/main/java/vavi/net/auth/oauth2/amazon/AmazonBasicAuthenticator.java b/vavi-net-auth-amazon/src/main/java/vavi/net/auth/oauth2/amazon/AmazonBasicAuthenticator.java
@@ -50,5 +50,3 @@ public String authorize(UserCredential userCredential) throws IOException {
         return ui.getResult();
     }
 }
-
-/* */
diff --git a/vavi-net-auth-amazon/src/main/java/vavi/net/auth/oauth2/amazon/AmazonLocalAppCredential.java b/vavi-net-auth-amazon/src/main/java/vavi/net/auth/oauth2/amazon/AmazonLocalAppCredential.java
@@ -97,5 +97,3 @@ public String getScope() {
         return scope;  
     }
 }
-
-/* */
diff --git a/vavi-net-auth-amazon/src/main/java/vavi/net/auth/oauth2/amazon/AmazonLocalAuthenticator.java b/vavi-net-auth-amazon/src/main/java/vavi/net/auth/oauth2/amazon/AmazonLocalAuthenticator.java
@@ -45,5 +45,3 @@ public String authorize(UserCredential userCredential) throws IOException {
         return ui.getResult();
     }
 }
-
-/* */
diff --git a/...-net-auth-amazon/src/main/java/vavi/net/auth/oauth2/amazon/AmazonLocalTokenRefresher.java b/...-net-auth-amazon/src/main/java/vavi/net/auth/oauth2/amazon/AmazonLocalTokenRefresher.java
@@ -71,5 +71,3 @@ public void close() {
         }
     }
 }
-
-/* */
diff --git a/vavi-net-auth-amazon/src/main/java/vavi/net/auth/oauth2/amazon/AmazonOAuth2.java b/vavi-net-auth-amazon/src/main/java/vavi/net/auth/oauth2/amazon/AmazonOAuth2.java
@@ -105,5 +105,3 @@ private void refreshToken(String token) {
         }
     }
 }
-
-/* */
diff --git a/vavi-net-auth-amazon/src/main/java/vavi/net/auth/web/amazon/AmazonBrowserAuthUI.java b/vavi-net-auth-amazon/src/main/java/vavi/net/auth/web/amazon/AmazonBrowserAuthUI.java
@@ -108,5 +108,3 @@ protected void finalize() {
         }
     }
 }
-
-/* */
diff --git a/vavi-net-auth-amazon/src/main/java/vavi/net/auth/web/amazon/AmazonLocalAuthenticator.java b/vavi-net-auth-amazon/src/main/java/vavi/net/auth/web/amazon/AmazonLocalAuthenticator.java
@@ -47,5 +47,3 @@ public WebDriver authorize(UserCredential credential) throws IOException {
         return ui.getResult();
     }
 }
-
-/* */
diff --git a/vavi-net-auth-amazon/src/main/java/vavi/net/auth/web/amazon/AmazonLocalUserCredential.java b/vavi-net-auth-amazon/src/main/java/vavi/net/auth/web/amazon/AmazonLocalUserCredential.java
@@ -39,5 +39,3 @@ public String getPassword() {
         return password;
     }
 }
-
-/* */
diff --git a/vavi-net-auth-amazon/src/main/java/vavi/net/auth/web/amazon/AmazonSeleniumAuthUI.java b/vavi-net-auth-amazon/src/main/java/vavi/net/auth/web/amazon/AmazonSeleniumAuthUI.java
@@ -136,5 +136,3 @@ public Exception getException() {
         return exception;
     }
 }
-
-/* */
diff --git a/vavi-net-auth-amazon/src/test/java/vavi/net/auth/oauth2/acd/TestACD.java b/vavi-net-auth-amazon/src/test/java/vavi/net/auth/oauth2/acd/TestACD.java
@@ -11,11 +11,13 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import vavi.net.auth.UserCredential;
 import vavi.net.auth.oauth2.OAuth2AppCredential;
 import vavi.net.auth.oauth2.amazon.AmazonBasicAuthenticator;
 import vavi.net.auth.oauth2.amazon.AmazonLocalAppCredential;
 import vavi.net.auth.web.amazon.AmazonLocalUserCredential;
+import vavi.util.Debug;
 
 
 /**
@@ -36,13 +38,12 @@ public static void main(String[] args) throws Exception {
 
     @Test
     @Disabled("doesn't work 2022-03-08")
+    @EnabledIfEnvironmentVariable(named = "TEST_AMAZON_ACCOUNT", matches = ".*")
     void process() throws IOException {
         String email = System.getenv("TEST_AMAZON_ACCOUNT");
         OAuth2AppCredential appCredential = new AmazonLocalAppCredential();
         UserCredential credential = new AmazonLocalUserCredential(email);
         String code = new AmazonBasicAuthenticator(appCredential).authorize(credential);
-System.err.println("code: " + code);
+Debug.println("code: " + code);
     }
 }
-
-/* */
diff --git a/vavi-net-auth-amazon/src/test/java/vavi/net/auth/oauth2/acd/TestAmazon.java b/vavi-net-auth-amazon/src/test/java/vavi/net/auth/oauth2/acd/TestAmazon.java
@@ -39,5 +39,3 @@ void process() throws Exception {
         Thread.sleep(5);
     }
 }
-
-/* */
diff --git a/vavi-net-auth-box/pom.xml b/vavi-net-auth-box/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>vavi</groupId>
     <artifactId>vavi-net-auth</artifactId>
-    <version>0.1.10</version>
+    <version>0.1.11</version>
   </parent>
 
   <artifactId>vavi-net-auth-box</artifactId>
@@ -75,12 +75,12 @@
 <dependency>
   <groupId>org.bouncycastle</groupId>
   <artifactId>bcprov-jdk18on</artifactId>
-  <version>1.74</version>
+  <version>1.78</version>
 </dependency>
 <dependency>
   <groupId>com.squareup.okio</groupId>
   <artifactId>okio-jvm</artifactId>
-  <version>3.6.0</version>
+  <version>3.9.0</version>
 </dependency>
 
     <dependency>

diff --git a/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxBasicAuthenticator.java b/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxBasicAuthenticator.java
@@ -48,5 +48,3 @@ public String authorize(UserCredential userCredential) throws IOException {
         return ui.getResult();
     }
 }
-
-/* */
diff --git a/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxDevOAuth2.java b/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxDevOAuth2.java
@@ -36,5 +36,3 @@ public BoxAPIConnection authorize(UserCredential userCredential) throws IOExcept
         return new BoxAPIConnection(System.getenv("BOX_DEVELOPER_TOKEN"));
     }
 }
-
-/* */
diff --git a/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxLocalAppCredential.java b/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxLocalAppCredential.java
@@ -87,5 +87,3 @@ public String getScope() {
         return scope;
     }
 }
-
-/* */
diff --git a/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxLocalAuthenticator.java b/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxLocalAuthenticator.java
@@ -51,5 +51,3 @@ public String authorize(UserCredential userCredential) throws IOException {
         return ui.getResult();
     }
 }
-
-/* */
diff --git a/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxLocalTokenRefresher.java b/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxLocalTokenRefresher.java
@@ -74,5 +74,3 @@ public void close() {
         }
     }
 }
-
-/* */
diff --git a/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxOAuth2.java b/vavi-net-auth-box/src/main/java/vavi/net/auth/oauth2/box/BoxOAuth2.java
@@ -128,5 +128,3 @@ public void onError(BoxAPIConnection api, BoxAPIException error) {
         return api;
     }
 }
-
-/* */
diff --git a/vavi-net-auth-box/src/main/java/vavi/net/auth/web/box/BoxBrowserAuthUI.java b/vavi-net-auth-box/src/main/java/vavi/net/auth/web/box/BoxBrowserAuthUI.java
@@ -111,5 +111,3 @@ protected void finalize() {
         }
     }
 }
-
-/* */
diff --git a/vavi-net-auth-box/src/main/java/vavi/net/auth/web/box/BoxLocalUserCredential.java b/vavi-net-auth-box/src/main/java/vavi/net/auth/web/box/BoxLocalUserCredential.java
@@ -39,5 +39,3 @@ public String getPassword() {
         return password;
     }
 }
-
-/* */
diff --git a/vavi-net-auth-box/src/main/java/vavi/net/auth/web/box/BoxSeleniumAuthUI.java b/vavi-net-auth-box/src/main/java/vavi/net/auth/web/box/BoxSeleniumAuthUI.java
@@ -176,5 +176,3 @@ protected void finalize() {
         su.close();
     }
 }
-
-/* */
diff --git a/vavi-net-auth-box/src/test/java/vavi/net/auth/oauth2/box/Main2.java b/vavi-net-auth-box/src/test/java/vavi/net/auth/oauth2/box/Main2.java
@@ -103,5 +103,3 @@ public static void main(String[] args) throws Exception {
         }
     }
 }
-
-/* */
diff --git a/vavi-net-auth-common/pom.xml b/vavi-net-auth-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>vavi</groupId>
     <artifactId>vavi-net-auth</artifactId>
-    <version>0.1.10</version>
+    <version>0.1.11</version>
   </parent>
 
   <artifactId>vavi-net-auth-common</artifactId>
@@ -39,13 +39,13 @@
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-java</artifactId>
-      <version>4.16.1</version>
+      <version>4.20.0</version>
     </dependency>
 
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-chrome-driver</artifactId>
-      <version>4.17.0</version>
+      <version>4.20.0</version>
     </dependency>
 
     <dependency>
@@ -63,7 +63,7 @@
 <dependency>
   <groupId>org.json</groupId>
   <artifactId>json</artifactId>
-  <version>20231013</version>
+  <version>20240303</version>
 </dependency>
     <dependency>
       <groupId>org.dmfs</groupId>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.xerial</groupId>
       <artifactId>sqlite-jdbc</artifactId>
-      <version>3.45.0.0</version>
+      <version>3.45.3.0</version>
       <scope>runtime</scope>
     </dependency>
 

diff --git a/vavi-net-auth-common/src/main/java/vavi/net/auth/AppCredential.java b/vavi-net-auth-common/src/main/java/vavi/net/auth/AppCredential.java
@@ -24,5 +24,3 @@ public interface AppCredential {
     /** id for authenticate */
     String getClientId();
 }
-
-/* */
diff --git a/vavi-net-auth-common/src/main/java/vavi/net/auth/AuthUI.java b/vavi-net-auth-common/src/main/java/vavi/net/auth/AuthUI.java
@@ -24,5 +24,3 @@ public interface AuthUI<T> {
     /** */
     Exception getException();
 }
-
-/* */
diff --git a/vavi-net-auth-common/src/main/java/vavi/net/auth/Authenticator.java b/vavi-net-auth-common/src/main/java/vavi/net/auth/Authenticator.java
@@ -23,5 +23,3 @@ public interface Authenticator<I, O> {
      */
     O authorize(I credential) throws IOException;
 }
-
-/* */
diff --git a/vavi-net-auth-common/src/main/java/vavi/net/auth/BaseLocalAppCredential.java b/vavi-net-auth-common/src/main/java/vavi/net/auth/BaseLocalAppCredential.java
@@ -33,5 +33,3 @@ protected BaseLocalAppCredential() {
         }
     }
 }
-
-/* */
diff --git a/vavi-net-auth-common/src/main/java/vavi/net/auth/BaseLocalUserCredential.java b/vavi-net-auth-common/src/main/java/vavi/net/auth/BaseLocalUserCredential.java
@@ -44,5 +44,3 @@ public String getId() {
         return id;
     }
 }
-
-/* */
diff --git a/vavi-net-auth-common/src/main/java/vavi/net/auth/UserCredential.java b/vavi-net-auth-common/src/main/java/vavi/net/auth/UserCredential.java
@@ -21,5 +21,3 @@ public interface UserCredential {
     /** */
     String getPassword();
 }
-
-/* */
diff --git a/vavi-net-auth-common/src/main/java/vavi/net/auth/WithTotpUserCredential.java b/vavi-net-auth-common/src/main/java/vavi/net/auth/WithTotpUserCredential.java
@@ -18,5 +18,3 @@ public interface WithTotpUserCredential extends UserCredential {
     /** */
     String getTotpSecret();
 }
-
-/* */
diff --git a/vavi-net-auth-common/src/main/java/vavi/net/auth/oauth2/BaseTokenRefresher.java b/vavi-net-auth-common/src/main/java/vavi/net/auth/oauth2/BaseTokenRefresher.java
@@ -96,5 +96,3 @@ public void close() {
     /* */
     public abstract T readRefreshToken() throws IOException;
 }
-
-/* */
diff --git a/vavi-net-auth-common/src/main/java/vavi/net/auth/oauth2/BasicLocalTokenRefresher.java b/vavi-net-auth-common/src/main/java/vavi/net/auth/oauth2/BasicLocalTokenRefresher.java
@@ -58,5 +58,3 @@ public void close() {
         super.close();
     }
 }
-
-/* */
diff --git a/vavi-net-auth-common/src/main/java/vavi/net/auth/oauth2/BasicOAuth2.java b/vavi-net-auth-common/src/main/java/vavi/net/auth/oauth2/BasicOAuth2.java
@@ -193,5 +193,3 @@ public void close() {
         }
     }
 }
-
-/* */