Uplift code base to java21

Issue-ID: POLICY-5466
Change-Id: I866be4a3af359f9840046d473c6536b1c164ea7a
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

diff --git a/csit/resources/Dockerfile b/csit/resources/Dockerfile
index f072e50..4ee1c4b 100644 (file)
--- a/csit/resources/Dockerfile
+++ b/csit/resources/Dockerfile
@@ -2,7 +2,9 @@ FROM nexus3.onap.org:10001/library/python:3.13-slim-bullseye
 ARG CSIT_SCRIPT=${CSIT_SCRIPT}
 ARG ROBOT_FILE=${ROBOT_FILE}
 ENV ROBOT_WORKSPACE=/opt/robotworkspace ROBOT_FILE=$ROBOT_FILE TEST_ENV=$TEST_ENV PROJECT=$PROJECT
-RUN apt-get update && apt-get install -y gcc postgresql-client; \
+RUN apt-get update && \
+    apt-get install -y gcc postgresql-client \
+    && apt-get clean; \
     python3 -m pip -qq install --upgrade pip; \
     python3 -m pip -qq install --upgrade confluent-kafka; \
     python3 -m pip -qq install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.6.0.*' --pre; \

diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh
index 2435ff2..5ddc195 100755 (executable)
--- a/csit/run-project-csit.sh
+++ b/csit/run-project-csit.sh
@@ -217,7 +217,7 @@ function setup_distribution() {
 
     # Remake temp directory
     sudo rm -rf /tmp/distribution
-    sudo mkdir /tmp/distribution
+    mkdir /tmp/distribution
 
     export ROBOT_FILES="distribution-test.robot"
     source "${DOCKER_COMPOSE_DIR}"/start-compose.sh distribution --grafana

diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile
index 38bfc4a..2e665a5 100644 (file)
--- a/policy-jdk/alpine/src/main/docker/Dockerfile
+++ b/policy-jdk/alpine/src/main/docker/Dockerfile
@@ -18,11 +18,11 @@
 #   SPDX-License-Identifier: Apache-2.0
 #   ============LICENSE_END=========================================================
 
-FROM alpine:3.20.3
+FROM alpine:3.22.2
 
 LABEL maintainer="Policy Team"
-LABEL org.opencontainers.image.title="Policy JRE Alpine"
-LABEL org.opencontainers.image.description="Policy Java 17 JRE image based on Alpine"
+LABEL org.opencontainers.image.title="Policy JDK Alpine"
+LABEL org.opencontainers.image.description="Policy Java 21 JDK image based on Alpine"
 LABEL org.opencontainers.image.url="https://github.com/onap/policy-docker"
 LABEL org.opencontainers.image.vendor="ONAP Policy Team"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
@@ -47,17 +47,17 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 RUN apk update && \
     apk add --no-cache \
         libretls \
-        openjdk17-jdk \
+        openjdk21-jdk \
         openssl && \
     rm -rf /var/cache/apk/* && \
-# ONAP additions
+# ONAP additions\
     addgroup -S $group && \
     adduser -G $group -D $user && \
     mkdir /var/log/$user && \
     mkdir /app && \
     chown -R $user:$group /var/log/$user && \
     chown -R $user:$group /app && \
-# Policy Framework additions
+# Policy Framework additions\
     apk update && \
     apk add --no-cache \
         busybox-extras \

diff --git a/policy-jre/alpine/src/main/docker/Dockerfile b/policy-jre/alpine/src/main/docker/Dockerfile
index b044e99..635474c 100644 (file)
--- a/policy-jre/alpine/src/main/docker/Dockerfile
+++ b/policy-jre/alpine/src/main/docker/Dockerfile
@@ -18,11 +18,11 @@
 #   SPDX-License-Identifier: Apache-2.0
 #   ============LICENSE_END=========================================================
 
-FROM alpine:3.20.3
+FROM alpine:3.22.2
 
 LABEL maintainer="Policy Team"
 LABEL org.opencontainers.image.title="Policy JRE Alpine"
-LABEL org.opencontainers.image.description="Policy Java 17 JRE image based on Alpine"
+LABEL org.opencontainers.image.description="Policy Java 21 JRE image based on Alpine"
 LABEL org.opencontainers.image.url="https://github.com/onap/policy-docker"
 LABEL org.opencontainers.image.vendor="ONAP Policy Team"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
@@ -46,17 +46,17 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 RUN apk update && \
     apk add --no-cache \
         libretls \
-        openjdk17-jre \
+        openjdk21-jre \
         openssl && \
     rm -rf /var/cache/apk/* && \
-# ONAP additions
+# ONAP additions\
     addgroup -S $group && \
     adduser -G $group -D $user && \
     mkdir /var/log/$user && \
     mkdir /app && \
     chown -R $user:$group /var/log/$user && \
     chown -R $user:$group /app && \
-# Policy Framework additions
+# Policy Framework additions\
     apk update && \
     apk add --no-cache \
         busybox-extras \