diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8e4dc933..7239c0b1 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,8 +5,6 @@ updates:
schedule:
interval: daily
target-branch: main
- ignore:
- - dependency-name: "org.apache.maven.plugins:maven-gpg-plugin"
- package-ecosystem: "github-actions"
directory: "/"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 96e63d9c..272ebba5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -41,17 +41,17 @@ jobs:
openssl aes-256-cbc -pass pass:"$PGP_KEY_PASSWORD" -in "$GITHUB_WORKSPACE"/.ci/secring.gpg.enc -out "$GITHUB_WORKSPACE"/secring.gpg -d -md md5
mkdir -p "$HOME"/.gnupg
cp "$GITHUB_WORKSPACE"/secring.gpg "$HOME"/.gnupg/secring.gpg
+ echo "allow-loopback-pinentry" >> "$HOME"/.gnupg/gpg-agent.conf
+ echo "pinentry-mode loopback" >> "$HOME"/.gnupg/gpg.conf
+ gpgconf --reload gpg-agent
shell: bash
env:
PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
- name: Deploy Release
- run: |
- export GPG_TTY=`tty`
- mvn -B -ff -ntp deploy -DskipTests
+ run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
shell: bash
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
- PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }}
PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
\ No newline at end of file
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index db34764e..2299bf00 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -41,14 +41,17 @@ jobs:
openssl aes-256-cbc -pass pass:"$PGP_KEY_PASSWORD" -in "$GITHUB_WORKSPACE"/.ci/secring.gpg.enc -out "$GITHUB_WORKSPACE"/secring.gpg -d -md md5
mkdir -p "$HOME"/.gnupg
cp "$GITHUB_WORKSPACE"/secring.gpg "$HOME"/.gnupg/secring.gpg
+ echo "allow-loopback-pinentry" >> "$HOME"/.gnupg/gpg-agent.conf
+ echo "pinentry-mode loopback" >> "$HOME"/.gnupg/gpg.conf
+ gpgconf --reload gpg-agent
shell: bash
env:
PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
- name: Deploy Snapshot
- run: mvn -B -ff -ntp deploy -DskipTests
+ run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
+ shell: bash
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
- PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }}
PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24d1e532..2df34372 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Release 4.2.0 - Jan 5, 2024
+## Release 4.2.0 - Jan 6, 2024
### New Changes
diff --git a/pom.xml b/pom.xml
index a8199ae4..a8ae0844 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
1.23
7.0_r2
1.6.13
- 1.6
+ 3.1.0