From 396f60280265a37379916ad12752a94691118f65 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Mon, 7 Aug 2023 16:01:21 -0400 Subject: Upgrade java-17 in drools-pdp Issue-ID: POLICY-4676 Change-Id: I85a0f6303b30cd0405d63be003c9288f59a9d6b7 Signed-off-by: adheli.tavares --- packages/base/pom.xml | 9 +++++---- packages/docker/pom.xml | 5 +++-- packages/docker/src/main/docker/Dockerfile | 6 +++--- packages/docker/src/main/docker/suse.Dockerfile | 4 ++-- packages/install/pom.xml | 6 +++--- packages/pom.xml | 6 +++--- 6 files changed, 19 insertions(+), 17 deletions(-) (limited to 'packages') diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 1f9a0254..ec68223e 100644 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -8,9 +8,9 @@ Licensed 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. @@ -19,14 +19,15 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.drools-pdp drools-packages - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT base diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 7228de55..96ddcab3 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -20,14 +20,15 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.drools-pdp drools-packages - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT docker diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index 6b993830..ac13bf61 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -2,7 +2,7 @@ # Dockerfile # ============LICENSE_START======================================================= # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright (C) 2022 Nordix Foundation. +# Modifications Copyright (C) 2022-2023 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= #------------------------------------------------------------------------------- -FROM onap/policy-jdk-alpine:3.0.0-SNAPSHOT +FROM onap/policy-jdk-alpine:3.0.1-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy Drools PDP" @@ -39,7 +39,7 @@ ARG MVN_RELEASE_REPO_URL ARG http_proxy ENV BUILD_VERSION_DROOLS $BUILD_VERSION_DROOLS -ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk +ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk ENV POLICY_INSTALL $POLICY_INSTALL ENV POLICY_INSTALL_INIT $POLICY_INSTALL/config ENV POLICY_LOGS $POLICY_LOGS diff --git a/packages/docker/src/main/docker/suse.Dockerfile b/packages/docker/src/main/docker/suse.Dockerfile index a4331f20..e6bf9dbd 100644 --- a/packages/docker/src/main/docker/suse.Dockerfile +++ b/packages/docker/src/main/docker/suse.Dockerfile @@ -38,7 +38,7 @@ ARG MVN_RELEASE_REPO_URL ARG http_proxy ENV BUILD_VERSION_DROOLS $BUILD_VERSION_DROOLS -ENV JAVA_HOME /usr/lib64/jvm/java-11-openjdk +ENV JAVA_HOME /usr/lib64/jvm/java-17-openjdk ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 ENV POLICY_INSTALL $POLICY_INSTALL ENV POLICY_INSTALL_INIT $POLICY_INSTALL/config @@ -54,7 +54,7 @@ ENV http_proxy $http_proxy RUN zypper -n -q install --no-recommends \ curl \ gzip \ - java-11-openjdk-devel \ + java-17-openjdk-devel \ maven \ mariadb-client \ netcat-openbsd \ diff --git a/packages/install/pom.xml b/packages/install/pom.xml index bfabe63b..97fbb7e8 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -20,15 +20,15 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.policy.drools-pdp drools-packages - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT install-drools diff --git a/packages/pom.xml b/packages/pom.xml index 696c84bb..3dbda7aa 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -21,12 +21,12 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.policy.drools-pdp drools-pdp - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT drools-packages pom @@ -34,7 +34,7 @@ ONAP Policy Drools PDP Installation Packages - + true -- cgit 1.2.3-korg