feat: add files for java 25 upgrade ci pipelines (ef951bb5) · Commits · OSL / MDG HypO / code / org.etsi.osl.hypo.api / org.etsi.osl.hypo.api.fabric

.gitlab-ci.yml

+3 −3

Changes for .gitlab-ci.yml: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ stages:
		- prod_image_build_release

		default:
		image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.8.3-openjdk-17
		image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.9-eclipse-temurin-25

		variables:
		DOCKER_HOST: unix:///var/run/docker.sock
		@@ -41,7 +41,7 @@ dev_tests_job:
		stage: dev_test
		tags:
		- hypo
		image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.9.16-eclipse-temurin-17
		image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.9-eclipse-temurin-25

		before_script:
		- curl -fsSL https://get.docker.com -o get-docker.sh
		@@ -84,7 +84,7 @@ dev_verify_job:
		stage: dev_verify
		tags:
		- hypo
		image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.8.3-openjdk-17
		image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.9-eclipse-temurin-25
		script:
		- chmod +x ./mvnw
		- ./mvnw ${MAVEN_CLI_OPTS} post-integration-test failsafe:verify -DskipUTs ${MAVEN_OPTS}

.mvn/wrapper/MavenWrapperDownloader.java

+6 −3

Changes for .mvn/wrapper/MavenWrapperDownloader.java: 6 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import java.nio.file.StandardCopyOption;
		import java.util.concurrent.ThreadLocalRandom;

		public final class MavenWrapperDownloader {
		private static final String WRAPPER_VERSION = "3.3.2";
		private static final String WRAPPER_VERSION = "3.3.4";

		private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("MVNW_VERBOSE"));

		@@ -45,8 +45,11 @@ public final class MavenWrapperDownloader {
		try {
		log(" - Downloader started");
		final URL wrapperUrl = URI.create(args[0]).toURL();
		final String jarPath = args[1].replace("..", ""); // Sanitize path
		final Path wrapperJarPath = Paths.get(jarPath).toAbsolutePath().normalize();
		final Path baseDir = Paths.get(".").toAbsolutePath().normalize();
		final Path wrapperJarPath = baseDir.resolve(args[1]).normalize();
		if (!wrapperJarPath.startsWith(baseDir)) {
		throw new IOException("Invalid path: outside of allowed directory");
		}
		downloadFileFromURL(wrapperUrl, wrapperJarPath);
		log("Done");
		} catch (IOException e) {

.mvn/wrapper/maven-wrapper.properties

+3 −19

Changes for .mvn/wrapper/maven-wrapper.properties: 3 added lines, 19 removed lines.
Original line number	Diff line number	Diff line
		# Licensed to the Apache Software Foundation (ASF) under one
		# or more contributor license agreements. See the NOTICE file
		# distributed with this work for additional information
		# regarding copyright ownership. The ASF licenses this file
		# to you under the Apache License, Version 2.0 (the
		# "License"); you may not use this file except in compliance
		# with the License. You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing,
		# software distributed under the License is distributed on an
		# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
		# KIND, either express or implied. See the License for the
		# specific language governing permissions and limitations
		# under the License.
		wrapperVersion=3.3.2
		wrapperVersion=3.3.4
		distributionType=source
		distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
		wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
		No newline at end of file
		distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
		wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

mvnw

+75 −45

Changes for mvnw: 75 added lines, 45 removed lines.
Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		# ----------------------------------------------------------------------------

		# ----------------------------------------------------------------------------
		# Apache Maven Wrapper startup batch script, version 3.2.0
		# Apache Maven Wrapper startup batch script, version 3.3.4
		#
		# Required ENV vars:
		# ------------------
		@@ -50,20 +50,23 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
		fi

		# OS specific support. $var _must_ be set to either true or false.
		cygwin=false;
		darwin=false;
		cygwin=false
		darwin=false
		mingw=false
		case "$(uname)" in
		CYGWIN*) cygwin=true ;;
		MINGW*) mingw=true ;;
		Darwin*) darwin=true
		Darwin*)
		darwin=true
		# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
		# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
		if [ -z "$JAVA_HOME" ]; then
		if [ -x "/usr/libexec/java_home" ]; then
		JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
		JAVA_HOME="$(/usr/libexec/java_home)"
		export JAVA_HOME
		else
		JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
		JAVA_HOME="/Library/Java/Home"
		export JAVA_HOME
		fi
		fi
		;;
		@@ -77,31 +80,37 @@ fi

		# For Cygwin, ensure paths are in UNIX format before anything is touched
		if $cygwin; then
		[ -n "$JAVA_HOME" ] &&
		JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
		[ -n "$CLASSPATH" ] &&
		CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
		[ -n "$JAVA_HOME" ] \
		&& JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
		[ -n "$CLASSPATH" ] \
		&& CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
		fi

		# For Mingw, ensure paths are in UNIX format before anything is touched
		if $mingw; then
		[ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
		JAVA_HOME="$(cd "$JAVA_HOME" \|\| (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
		[ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \
		&& JAVA_HOME="$(
		cd "$JAVA_HOME" \|\| (
		echo "cannot cd into $JAVA_HOME." >&2
		exit 1
		)
		pwd
		)"
		fi

		if [ -z "$JAVA_HOME" ]; then
		javaExecutable="$(which javac)"
		if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '$[^ ]*$')" = "no" ]; then
		if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '$[^ ]*$')" = "no" ]; then
		# readlink(1) is not available as standard on Solaris 10.
		readLink=$(which readlink)
		if [ ! "$(expr "$readLink" : '$[^ ]*$')" = "no" ]; then
		if $darwin; then
		javaHome="$(dirname "\"$javaExecutable\"")"
		javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
		javaHome="$(dirname "$javaExecutable")"
		javaExecutable="$(cd "$javaHome" && pwd -P)/javac"
		else
		javaExecutable="$(readlink -f "\"$javaExecutable\"")"
		javaExecutable="$(readlink -f "$javaExecutable")"
		fi
		javaHome="$(dirname "\"$javaExecutable\"")"
		javaHome="$(dirname "$javaExecutable")"
		javaHome=$(expr "$javaHome" : '$.*$/bin')
		JAVA_HOME="$javaHome"
		export JAVA_HOME
		@@ -118,7 +127,10 @@ if [ -z "$JAVACMD" ] ; then
		JAVACMD="$JAVA_HOME/bin/java"
		fi
		else
		JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
		JAVACMD="$(
		\unset -f command 2>/dev/null
		\command -v java
		)"
		fi
		fi

		@@ -129,15 +141,14 @@ if [ ! -x "$JAVACMD" ] ; then
		fi

		if [ -z "$JAVA_HOME" ]; then
		echo "Warning: JAVA_HOME environment variable is not set."
		echo "Warning: JAVA_HOME environment variable is not set." >&2
		fi

		# traverses directory structure from process work directory to filesystem root
		# first directory with .mvn subdirectory is considered project base directory
		find_maven_basedir() {
		if [ -z "$1" ]
		then
		echo "Path not specified to find_maven_basedir"
		if [ -z "$1" ]; then
		echo "Path not specified to find_maven_basedir" >&2
		return 1
		fi

		@@ -150,11 +161,17 @@ find_maven_basedir() {
		fi
		# workaround for JBEAP-8937 (on Solaris 10/Sparc)
		if [ -d "${wdir}" ]; then
		wdir=$(cd "$wdir/.." \|\| exit 1; pwd)
		wdir=$(
		cd "$wdir/.." \|\| exit 1
		pwd
		)
		fi
		# end of workaround
		done
		printf '%s' "$(cd "$basedir" \|\| exit 1; pwd)"
		printf '%s' "$(
		cd "$basedir" \|\| exit 1
		pwd
		)"
		}

		# concatenates all lines of a file
		@@ -177,12 +194,21 @@ log() {

		BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
		if [ -z "$BASE_DIR" ]; then
		exit 1;
		exit 1
		fi

		MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
		MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
		export MAVEN_PROJECTBASEDIR
		log "$MAVEN_PROJECTBASEDIR"

		trim() {
		# MWRAPPER-139:
		# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
		# Needed for removing poorly interpreted newline sequences when running in more
		# exotic environments such as mingw bash on Windows.
		printf "%s" "${1}" \| tr -d '[:space:]'
		}

		##########################################################################################
		# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
		# This allows using the maven wrapper in projects that prohibit checking in binary data.
		@@ -194,14 +220,15 @@ else
		log "Couldn't find $wrapperJarPath, downloading it ..."

		if [ -n "$MVNW_REPOURL" ]; then
		wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
		wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
		else
		wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
		wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
		fi
		while IFS="=" read -r key value; do
		# Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
		safeValue=$(echo "$value" \| tr -d '\r')
		case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
		case "$key" in wrapperUrl)
		wrapperUrl=$(trim "${value-}")
		break
		;;
		esac
		done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
		log "Downloading from: $wrapperUrl"
		@@ -214,17 +241,17 @@ else
		log "Found wget ... using wget"
		[ "$MVNW_VERBOSE" = true ] && QUIET="" \|\| QUIET="--quiet"
		if [ -z "$MVNW_USERNAME" ] \|\| [ -z "$MVNW_PASSWORD" ]; then
		wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" \|\| rm -f "$wrapperJarPath"
		wget ${QUIET:+"$QUIET"} "$wrapperUrl" -O "$wrapperJarPath" \|\| rm -f "$wrapperJarPath"
		else
		wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" \|\| rm -f "$wrapperJarPath"
		wget ${QUIET:+"$QUIET"} --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" \|\| rm -f "$wrapperJarPath"
		fi
		elif command -v curl >/dev/null; then
		log "Found curl ... using curl"
		[ "$MVNW_VERBOSE" = true ] && QUIET="" \|\| QUIET="--silent"
		if [ -z "$MVNW_USERNAME" ] \|\| [ -z "$MVNW_PASSWORD" ]; then
		curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L \|\| rm -f "$wrapperJarPath"
		curl ${QUIET:+"$QUIET"} -o "$wrapperJarPath" "$wrapperUrl" -f -L \|\| rm -f "$wrapperJarPath"
		else
		curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L \|\| rm -f "$wrapperJarPath"
		curl ${QUIET:+"$QUIET"} --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L \|\| rm -f "$wrapperJarPath"
		fi
		else
		log "Falling back to using Java to download"
		@@ -254,13 +281,16 @@ fi
		# If specified, validate the SHA-256 sum of the Maven wrapper jar file
		wrapperSha256Sum=""
		while IFS="=" read -r key value; do
		case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
		case "$key" in wrapperSha256Sum)
		wrapperSha256Sum=$(trim "${value-}")
		break
		;;
		esac
		done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
		if [ -n "$wrapperSha256Sum" ]; then
		wrapperSha256Result=false
		if command -v sha256sum >/dev/null; then
		if echo "$wrapperSha256Sum $wrapperJarPath" \| sha256sum -c > /dev/null 2>&1; then
		if echo "$wrapperSha256Sum $wrapperJarPath" \| sha256sum -c - >/dev/null 2>&1; then
		wrapperSha256Result=true
		fi
		elif command -v shasum >/dev/null; then
		@@ -268,8 +298,8 @@ if [ -n "$wrapperSha256Sum" ]; then
		wrapperSha256Result=true
		fi
		else
		echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
		echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
		echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
		echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2
		exit 1
		fi
		if [ $wrapperSha256Result = false ]; then
		@@ -284,12 +314,12 @@ MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"

		# For Cygwin, switch paths to Windows format before running java
		if $cygwin; then
		[ -n "$JAVA_HOME" ] &&
		JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
		[ -n "$CLASSPATH" ] &&
		CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
		[ -n "$MAVEN_PROJECTBASEDIR" ] &&
		MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
		[ -n "$JAVA_HOME" ] \
		&& JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
		[ -n "$CLASSPATH" ] \
		&& CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
		[ -n "$MAVEN_PROJECTBASEDIR" ] \
		&& MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
		fi

		# Provide a "standardized" way to retrieve the CLI args that will

mvnw.cmd

+11 −10

Changes for mvnw.cmd: 11 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		@REM ----------------------------------------------------------------------------

		@REM ----------------------------------------------------------------------------
		@REM Apache Maven Wrapper startup batch script, version 3.2.0
		@REM Apache Maven Wrapper startup batch script, version 3.3.4
		@REM
		@REM Required ENV vars:
		@REM JAVA_HOME - location of a JDK home dir
		@@ -59,22 +59,22 @@ set ERROR_CODE=0
		@REM ==== START VALIDATION ====
		if not "%JAVA_HOME%" == "" goto OkJHome

		echo.
		echo. >&2
		echo Error: JAVA_HOME not found in your environment. >&2
		echo Please set the JAVA_HOME variable in your environment to match the >&2
		echo location of your Java installation. >&2
		echo.
		echo. >&2
		goto error

		:OkJHome
		if exist "%JAVA_HOME%\bin\java.exe" goto init

		echo.
		echo. >&2
		echo Error: JAVA_HOME is set to an invalid directory. >&2
		echo JAVA_HOME = "%JAVA_HOME%" >&2
		echo Please set the JAVA_HOME variable in your environment to match the >&2
		echo location of your Java installation. >&2
		echo.
		echo. >&2
		goto error

		@REM ==== END VALIDATION ====
		@@ -119,7 +119,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
		set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
		set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

		set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
		set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"

		FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
		IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
		@@ -133,7 +133,7 @@ if exist %WRAPPER_JAR% (
		)
		) else (
		if not "%MVNW_REPOURL%" == "" (
		SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
		SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
		)
		if "%MVNW_VERBOSE%" == "true" (
		echo Couldn't find %WRAPPER_JAR%, downloading it ...
		@@ -160,11 +160,12 @@ FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapp
		)
		IF NOT %WRAPPER_SHA_256_SUM%=="" (
		powershell -Command "&{"^
		"Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^
		"$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
		"If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
		" Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
		" Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
		" Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
		" Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
		" Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
		" Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
		" exit 1;"^
		"}"^
		"}"