From 229d77f825bc901b0c3b1cfd148b74dcc3e08df8 Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Wed, 18 Dec 2024 15:22:15 +0200 Subject: [PATCH] Update pipeline and docker image --- ci/Dockerfile | 2 +- ci/build-and-deploy-to-artifactory.sh | 3 --- ci/build-and-deploy-to-maven-central.sh | 3 --- ci/pipeline.properties | 3 +-- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 0a718839..dcca3565 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17.0.6_10-jdk-focal +FROM eclipse-temurin:17.0.13_10-jdk-jammmy RUN apt-get update && apt-get install -y gpg diff --git a/ci/build-and-deploy-to-artifactory.sh b/ci/build-and-deploy-to-artifactory.sh index 0141d63c..c1abc1e7 100755 --- a/ci/build-and-deploy-to-artifactory.sh +++ b/ci/build-and-deploy-to-artifactory.sh @@ -4,9 +4,6 @@ set -euo pipefail RELEASE_TYPE=$1 -export GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR} -export GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW} - echo 'Deploying to Artifactory...' MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \ diff --git a/ci/build-and-deploy-to-maven-central.sh b/ci/build-and-deploy-to-maven-central.sh index 9f28fd8e..2c93cdf9 100755 --- a/ci/build-and-deploy-to-maven-central.sh +++ b/ci/build-and-deploy-to-maven-central.sh @@ -5,9 +5,6 @@ set -euo pipefail PROJECT_VERSION=$1 STAGING_REPOSITORY_ID=$2 -export GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR} -export GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW} - echo 'Staging on Maven Central...' GNUPGHOME=/tmp/gpghome diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 2aea0874..09915555 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -18,5 +18,4 @@ docker.java.inside.basic=-v $HOME:/tmp/jenkins-home # Credentials artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c dockerhub.credentials=hub.docker.com-springbuildmaster -gradle-enterprise-cache.credentials=gradle_enterprise_cache_user -gradle-enterprise.access-key=gradle_enterprise_secret_access_key +develocity.access-key=gradle_enterprise_secret_access_key