From 7619152baa6868f15fd7d71884b2ccf3ee337206 Mon Sep 17 00:00:00 2001
From: Chris Slater <6004777+electricsam@users.noreply.github.com>
Date: Thu, 19 Dec 2024 14:28:03 -0700
Subject: [PATCH] really try GH actions

---
 .github/workflows/branch-release.yml |  8 +--
 .github/workflows/ci.yaml            |  5 +-
 .github/workflows/tag-release.yml    |  8 +--
 pom.xml                              | 93 ++++++++++++++++------------
 4 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/branch-release.yml b/.github/workflows/branch-release.yml
index 4c8c660..fd0c5e7 100644
--- a/.github/workflows/branch-release.yml
+++ b/.github/workflows/branch-release.yml
@@ -24,7 +24,7 @@ jobs:
           release:branch
         env:
           NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
-          ARTIFACTORY_API_USERNAME: ${{ vars.ARTIFACTORY_API_USERNAME }}
-          ARTIFACTORY_API_KEY: ${{ secrets.ARTIFACTORY_API_KEY }}
-          ARTIFACTORY_SNAPSHOT_URL: ${{ vars.ARTIFACTORY_SNAPSHOT_URL }}
-          ARTIFACTORY_RELEASE_URL: ${{ vars.ARTIFACTORY_RELEASE_URL }}
\ No newline at end of file
+          SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+          SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a4dd333..8bd0590 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,11 +17,8 @@ jobs:
           java-version: '11'
           distribution: 'temurin'
           cache: maven
-#      - run: echo "$MAVEN_GPG_PRIVATE_KEY" | base64 -d > gpg.key
-#        env:
-#          MAVEN_GPG_PRIVATE_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
       - name: build with maven
-        run: mvn -B -s settings.xml clean install -Prelease
+        run: mvn -B -s settings.xml clean deploy -Pdep-check
         env:
           NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
           SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml
index 2adc91c..5577a8c 100644
--- a/.github/workflows/tag-release.yml
+++ b/.github/workflows/tag-release.yml
@@ -27,7 +27,7 @@ jobs:
           release:prepare release:perform
         env:
           NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
-          ARTIFACTORY_API_USERNAME: ${{ vars.ARTIFACTORY_API_USERNAME }}
-          ARTIFACTORY_API_KEY: ${{ secrets.ARTIFACTORY_API_KEY }}
-          ARTIFACTORY_SNAPSHOT_URL: ${{ vars.ARTIFACTORY_SNAPSHOT_URL }}
-          ARTIFACTORY_RELEASE_URL: ${{ vars.ARTIFACTORY_RELEASE_URL }}
\ No newline at end of file
+          SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+          SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 82ef427..498cb2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,6 @@
     <maven.compiler.release>8</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <sign.serverId>gpg-sign</sign.serverId>
     <slf4j.version>1.7.32</slf4j.version>
     <javadoc.version>3.11.2</javadoc.version>
     <jacoco.version>0.8.12</jacoco.version>
@@ -190,11 +189,59 @@
           <artifactId>maven-resources-plugin</artifactId>
           <version>3.3.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>3.2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.simplify4u.plugins</groupId>
+          <artifactId>sign-maven-plugin</artifactId>
+          <version>1.1.0</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
     <plugins>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.simplify4u.plugins</groupId>
+        <artifactId>sign-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -287,6 +334,9 @@
 
     <profile>
       <id>release</id>
+      <properties>
+        <sign.skipNoKey>false</sign.skipNoKey>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -316,50 +366,11 @@
               </replacementProperties>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>3.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.simplify4u.plugins</groupId>
-            <artifactId>sign-maven-plugin</artifactId>
-            <version>1.1.0</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-                <configuration>
-                  <skipNoKey>false</skipNoKey>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
 
+
     <profile>
       <id>site-publish</id>
       <build>