From a77d20e10560c1e89913ea3a4b29922cfd855d1d Mon Sep 17 00:00:00 2001 From: Anthony Dahanne Date: Tue, 15 Aug 2023 15:57:17 -0400 Subject: [PATCH] Adapt to CI * now using springio/concourse-release-scripts --- scripts/Dockerfile | 2 -- scripts/bump-version.sh | 3 +++ scripts/deploy.sh | 1 - scripts/promote-to-maven-central.sh | 2 +- scripts/release-version.sh | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 61c4962..cf2be97 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -1,8 +1,6 @@ ARG base_image=ubuntu:bionic FROM ${base_image} -ADD https://repo.spring.io/libs-release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.2/concourse-release-scripts-0.3.2.jar /opt/concourse-release-scripts.jar - RUN apt-get update && apt-get install --no-install-recommends -y \ git gnupg \ && rm -rf /var/lib/apt/lists/* diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 67b4b35..9df2b2f 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -34,6 +34,9 @@ cd source VERSION=$(./mvnw --quiet help:evaluate -DforceStdout -Dexpression=project.version) git add pom.xml +git add spring-cloud-bindings/pom.xml +git add spring-cloud-bindings-tests/pom.xml + git checkout -- . git \ diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 7a85306..d27fe76 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -30,5 +30,4 @@ EOF REPOSITORY="${PWD}"/repository cd source - ./mvnw deploy -Dmaven.test.skip=true -DaltDeploymentRepository="local::default::file://${REPOSITORY}" diff --git a/scripts/promote-to-maven-central.sh b/scripts/promote-to-maven-central.sh index 5d38b82..639f0ad 100755 --- a/scripts/promote-to-maven-central.sh +++ b/scripts/promote-to-maven-central.sh @@ -4,6 +4,6 @@ set -euo pipefail export BUILD_INFO_LOCATION=$(pwd)/repository/build-info.json -java -jar /opt/concourse-release-scripts.jar publishToCentral 'RELEASE' "$BUILD_INFO_LOCATION" repository +java -jar /concourse-release-scripts.jar publishToCentral 'RELEASE' "$BUILD_INFO_LOCATION" repository echo "Sync complete" \ No newline at end of file diff --git a/scripts/release-version.sh b/scripts/release-version.sh index 304b3cf..aaf98ae 100755 --- a/scripts/release-version.sh +++ b/scripts/release-version.sh @@ -10,6 +10,9 @@ cd source VERSION=$(./mvnw --quiet help:evaluate -DforceStdout -Dexpression=project.version) git add pom.xml +git add spring-cloud-bindings/pom.xml +git add spring-cloud-bindings-tests/pom.xml + git checkout -- . git \