From 1ce35db7755a339c656d3103407806bd439623db Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 13 Jun 2025 13:41:41 +0200 Subject: [PATCH] Fix double slashes in secring paths. Closes #6 --- ci/build-and-distribute.bash | 2 +- ci/conclude.bash | 2 +- ci/prepare-and-build.bash | 2 +- pom.xml | 16 +++++++++++++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ci/build-and-distribute.bash b/ci/build-and-distribute.bash index 024ab73..2b2e1c2 100755 --- a/ci/build-and-distribute.bash +++ b/ci/build-and-distribute.bash @@ -17,7 +17,7 @@ export SETTINGS_XML=$(pwd)/ci/settings.xml mkdir -p ${RELEASE_TOOLS_MAVEN_REPOSITORY} mkdir -p ${LOGS_DIR} -export GNUPGHOME=~/.gnupg/ +export GNUPGHOME=~/.gnupg mkdir -p ${GNUPGHOME} chmod 700 ${GNUPGHOME} diff --git a/ci/conclude.bash b/ci/conclude.bash index 3dbcc62..7f5717e 100755 --- a/ci/conclude.bash +++ b/ci/conclude.bash @@ -13,7 +13,7 @@ export JENKINS_HOME=/tmp/jenkins-home export RELEASE_TOOLS_MAVEN_REPOSITORY=${JENKINS_HOME}/.m2/spring-data-release-tools export LOGS_DIR=${JENKINS_HOME}/spring-data-shell/logs export SETTINGS_XML=$(pwd)/ci/settings.xml -export GNUPGHOME=~/.gnupg/ +export GNUPGHOME=~/.gnupg if test -f application-local.properties; then echo "You are running from dev environment! Using application-local.properties." diff --git a/ci/prepare-and-build.bash b/ci/prepare-and-build.bash index f0b87fa..07cf724 100755 --- a/ci/prepare-and-build.bash +++ b/ci/prepare-and-build.bash @@ -17,7 +17,7 @@ export SETTINGS_XML=$(pwd)/ci/settings.xml mkdir -p ${RELEASE_TOOLS_MAVEN_REPOSITORY} mkdir -p ${LOGS_DIR} -export GNUPGHOME=~/.gnupg/ +export GNUPGHOME=~/.gnupg mkdir -p ${GNUPGHOME} chmod 700 ${GNUPGHOME} diff --git a/pom.xml b/pom.xml index 9cf8bcf..f3fc53a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.data.build spring-data-release-cli @@ -17,6 +17,16 @@ 1.18.26 + + + + commons-io + commons-io + 2.19.0 + + + + @@ -108,7 +118,7 @@ com.google.guava guava - 32.0.0-jre + 32.0.1-jre