Commit cb695d22 authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

feat: upgrade to java 25 pipelines

parent 19939e6a

.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

+18 −12
Changes for mvnw: 18 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
# ----------------------------------------------------------------------------



# ----------------------------------------------------------------------------

# Apache Maven Wrapper startup batch script, version 3.3.2

# Apache Maven Wrapper startup batch script, version 3.3.4

#

# Required ENV vars:

# ------------------
@@ -201,6 +201,14 @@ 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.
@@ -212,15 +220,13 @@ else 
  log "Couldn't find $wrapperJarPath, downloading it ..."



  if [ -n "$MVNW_REPOURL" ]; then

    wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.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.3.2/maven-wrapper-3.3.2.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"

      wrapperUrl=$(trim "${value-}")

      break

      ;;

    esac
@@ -235,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"
@@ -276,7 +282,7 @@ fi 
wrapperSha256Sum=""

while IFS="=" read -r key value; do

  case "$key" in wrapperSha256Sum)

    wrapperSha256Sum=$value

    wrapperSha256Sum=$(trim "${value-}")

    break

    ;;

  esac
@@ -284,7 +290,7 @@ 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

mvnw.cmd

+3 −3
Changes for mvnw.cmd: 3 added lines, 3 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.3.2

@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
@@ -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.3.2/maven-wrapper-3.3.2.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.3.2/maven-wrapper-3.3.2.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 ...