Spring/spring-data-release
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use gpg1 for client-side actions.

Browse Source 
JGit has limited support for GPGv2 KBX files. Switching to gpg1 and legacy keyring files enables proper signing of commits.
This commit is contained in:
Greg L. Turnquist
2023-01-23 11:16:34 -06:00
parent ae2bc720f4
commit 949b92bb8a
7 changed files with 12 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci/Dockerfile
View File

@@ -17,7 +17,7 @@ RUN set -eux; \
sed -i -e 's/ports.ubuntu.com/ftp.tu-chemnitz.de\/pub\/linux/g' /etc/apt/sources.list && \
sed -i -e 's/http/https/g' /etc/apt/sources.list && \
apt-get update && \
apt-get -y install curl zip gnupg libfreetype6
apt-get -y install curl zip gnupg gnupg1 libfreetype6
RUN rm -rf /var/lib/apt/lists/* && \
rm -rf /tmp/*

6
ci/build-and-distribute.bash
View File

@@ -34,9 +34,9 @@ if test -f application-local.properties; then
else
echo "You are running inside Jenkins! Using parameters fed from the agent."
echo "${GIT_SIGNING_KEY_PASSWORD}" | /usr/bin/gpg --batch --yes --passphrase-fd 0 --import "${GIT_SIGNING_KEY}"
echo "${MAVEN_SIGNING_KEY_PASSWORD}" | /usr/bin/gpg --batch --yes --passphrase-fd 0 --import "${MAVEN_SIGNING_KEY}"
/usr/bin/gpg -k
echo "${GIT_SIGNING_KEY_PASSWORD}" | /usr/bin/gpg1 --batch --yes --passphrase-fd 0 --import "${GIT_SIGNING_KEY}"
echo "${MAVEN_SIGNING_KEY_PASSWORD}" | /usr/bin/gpg1 --batch --yes --passphrase-fd 0 --import "${MAVEN_SIGNING_KEY}"
/usr/bin/gpg1 -k
function spring-data-release-shell {
java \

6
ci/prepare-and-build.bash
View File

@@ -34,9 +34,9 @@ if test -f application-local.properties; then
else
echo "You are running inside Jenkins! Using parameters fed from the agent."
echo "${GIT_SIGNING_KEY_PASSWORD}" | /usr/bin/gpg --batch --yes --passphrase-fd 0 --import "${GIT_SIGNING_KEY}"
echo "${MAVEN_SIGNING_KEY_PASSWORD}" | /usr/bin/gpg --batch --yes --passphrase-fd 0 --import "${MAVEN_SIGNING_KEY}"
/usr/bin/gpg -k
echo "${GIT_SIGNING_KEY_PASSWORD}" | /usr/bin/gpg1 --batch --yes --passphrase-fd 0 --import "${GIT_SIGNING_KEY}"
echo "${MAVEN_SIGNING_KEY_PASSWORD}" | /usr/bin/gpg1 --batch --yes --passphrase-fd 0 --import "${MAVEN_SIGNING_KEY}"
/usr/bin/gpg1 -k
function spring-data-release-shell {
java \