Merge pull request #18 from umjammer/0.1.9

0.1.9
umjammer · Feb 7, 2024 · 267f4c2 · 267f4c2
2 parents e29e3f0 + 661abfe
commit 267f4c2
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 328 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Check w/o SNAPSHOT when "bump version"
         if: ${{ contains(github.event.head_commit.message, 'bump version') }}

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-[![GitHub Packages](https://github.com/umjammer/vavi-net-auth/actions/workflows/maven-publish.yml/badge.svg)](https://github.com/umjammer?tab=packages&repo_name=vavi-net-auth)
-[![Java CI with Maven](https://github.com/umjammer/vavi-net-auth/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/vavi-net-auth/actions)
+[![Release](https://jitpack.io/v/umjammer/vavi-net-auth.svg)](https://jitpack.io/#umjammer/vavi-net-auth)
+[![Java CI](https://github.com/umjammer/vavi-net-auth/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/vavi-net-auth/actions)
 [![CodeQL](https://github.com/umjammer/vavi-net-auth/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/vavi-net-auth/actions/workflows/codeql-analysis.yml)
-![Java](https://img.shields.io/badge/Java-8-b07219)
+![Java](https://img.shields.io/badge/Java-17-b07219)
 [![Parent](https://img.shields.io/badge/Parent-vavi--apps--fuse-pink)](https://github.com/umjammer/vavi-apps-fuse)
 
 # vavi-net-auth
@@ -25,9 +25,7 @@ Java OAuth2 and auto login and totp
 
 ### jars
 
- * https://github.com/umjammer?tab=packages&repo_name=vavi-net-auth
- * this project uses gitlab package registry. add a personal access token to `~/.m2/settings.xml`
- * see https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#authenticate-to-the-package-registry-with-maven
+ * [maven](https://jitpack.io/#umjammer/vavi-net-auth)
 
 ### ~~selenium chrome driver~~ (obsolete, use os default browser)
 
@@ -52,3 +50,4 @@ Java OAuth2 and auto login and totp
  * refer to cyberduck profile
  * box when refresh token expired
  * [`GoogleCredentials#getApplicationDefault()`](https://cloud.google.com/docs/authentication/application-default-credentials) !!!
+ * ~~only cookie.chrome.mac uses jna~~ 
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>vavi</groupId>
   <artifactId>vavi-net-auth</artifactId>
-  <version>0.1.8</version>
+  <version>0.1.9</version>
 
   <modules>
     <module>vavi-net-auth-common</module>
@@ -33,13 +33,6 @@
   </issueManagement>
   <description>network authentication library like OAuth2</description>
 
-  <distributionManagement>
-    <repository>
-      <id>github</id>
-      <url>https://maven.pkg.github.com/umjammer/vavi-net-auth</url>
-    </repository>
-  </distributionManagement>
-
   <profiles>
     <profile>
       <id>github workflow</id>
@@ -87,7 +80,7 @@
       <dependency>
         <groupId>vavi</groupId>
         <artifactId>vavi-net-auth-common</artifactId>
-        <version>0.1.8</version>
+        <version>0.1.9</version>
       </dependency>
       <dependency>
         <!-- tiny http server for oauth -->
@@ -107,7 +100,7 @@
       <dependency>
         <groupId>vavi</groupId>
         <artifactId>vavi-net-auth-common</artifactId>
-        <version>0.1.8</version>
+        <version>0.1.9</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.8</version>
+    <version>0.1.9</version>
   </parent>
 
   <artifactId>vavi-net-auth-amazon</artifactId>

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.8</version>
+    <version>0.1.9</version>
   </parent>
 
   <artifactId>vavi-net-auth-box</artifactId>

diff --git a/vavi-net-auth-common/pom.xml b/vavi-net-auth-common/pom.xml
@@ -7,63 +7,11 @@
   <parent>
     <groupId>vavi</groupId>
     <artifactId>vavi-net-auth</artifactId>
-    <version>0.1.8</version>
+    <version>0.1.9</version>
   </parent>
 
   <artifactId>vavi-net-auth-common</artifactId>
 
-  <profiles>
-    <profile>
-      <id>local (not on jitpack)</id>
-      <activation>
-        <os>
-          <family>mac</family>
-        </os>
-        <property>
-          <name>env.JITPACK</name>
-          <value>!true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>3.3.0</version>
-            <executions>
-              <execution>
-                <id>copy</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>copy</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.rococoa</groupId>
-                      <artifactId>rococoa-core</artifactId>
-                      <type>dylib</type>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
-                      <destFileName>librococoa.dylib</destFileName>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.rococoa</groupId>
-          <artifactId>rococoa-core</artifactId>
-          <version>0.8.6</version>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
   <build>
     <plugins>
       <plugin>
@@ -81,13 +29,6 @@
     </plugins>
   </build>
 
-  <repositories>
-    <repository>
-      <id>github</id>
-      <url>https://maven.pkg.github.com/umjammer/*</url>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>com.github.umjammer</groupId>
@@ -192,18 +133,6 @@
   <version>3.4.0</version>
 </dependency>
 
-    <dependency>
-      <groupId>vavi</groupId>
-      <artifactId>vavi-crypto-sandbox</artifactId>
-      <version>1.0.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.xerial</groupId>
-      <artifactId>sqlite-jdbc</artifactId>
-      <version>3.42.0.0</version>
-      <scope>runtime</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>

diff --git a/vavi-net-auth-common/src/main/java/vavi/net/auth/cookie/chrome/mac/MacChromeCookie.java b/vavi-net-auth-common/src/main/java/vavi/net/auth/cookie/chrome/mac/MacChromeCookie.java