Skip to content

Commit 21d13ac

Browse files
Upgrade build image to Java 17
1 parent e565a78 commit 21d13ac

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

ci/images/java-cfenv-ci/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ ENV JAVA_HOME /opt/openjdk
77
ENV PATH $JAVA_HOME/bin:$PATH
88
RUN mkdir -p /opt/openjdk && \
99
cd /opt/openjdk && \
10-
curl -L https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz | tar xz --strip-components=1
10+
curl -L https://github.com/bell-sw/Liberica/releases/download/17.0.8.1+1/bellsoft-jdk17.0.8.1+1-linux-amd64.tar.gz | tar xz --strip-components=1
1111

1212
ADD https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh /opt/
13-
ADD https://repo.spring.io/libs-release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.3/concourse-release-scripts-0.3.3.jar /opt/
1413

ci/scripts/promote.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source $(dirname $0)/common.sh
77
version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
88
export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json
99

10-
java -jar /opt/concourse-release-scripts*.jar promote $RELEASE_TYPE $BUILD_INFO_LOCATION
10+
java -jar /concourse-release-scripts*.jar promote $RELEASE_TYPE $BUILD_INFO_LOCATION
1111

1212
echo "Promotion complete"
1313
echo $version > version/version

ci/scripts/sync-to-maven-central.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44
readonly BUILD_INFO_LOCATION="$(pwd)/artifactory-repo/build-info.json"
55
readonly CONFIG_DIR="$(pwd)/git-repo/ci/config"
66

7-
java -jar /opt/concourse-release-scripts*.jar \
7+
java -jar /concourse-release-scripts*.jar \
88
--spring.config.location="${CONFIG_DIR}/release-scripts.yml" \
99
publishToCentral 'RELEASE' "$BUILD_INFO_LOCATION" "artifactory-repo"
1010

0 commit comments

Comments
 (0)