From 408cd42086aa968374c7ebb1d9125a93d7a0a10c Mon Sep 17 00:00:00 2001
From: Michael Dürre <michael.duerre@highstreet-technologies.com>
Date: Thu, 12 Jan 2023 12:18:31 +0100
Subject: prepare dist for chlorine
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

add java17 base image. switch chlorine to j17

Issue-ID: CCSDK-3832
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: Ib2f3fd216eac4743a338299385e6bdbe52485275
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
---
 opendaylight/chlorine/chlorine-alpine/pom.xml                    | 8 ++++----
 opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'opendaylight/chlorine/chlorine-alpine')

diff --git a/opendaylight/chlorine/chlorine-alpine/pom.xml b/opendaylight/chlorine/chlorine-alpine/pom.xml
index b490fcd9..0ea3598b 100644
--- a/opendaylight/chlorine/chlorine-alpine/pom.xml
+++ b/opendaylight/chlorine/chlorine-alpine/pom.xml
@@ -20,16 +20,16 @@
     <properties>
         <image.name>onap/ccsdk-odl-chlorine-alpine-image</image.name>
         <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
-        <odl.shiro.version>0.15.5</odl.shiro.version>
+        <odl.shiro.version>0.16.6</odl.shiro.version>
     </properties>
 
     <build>
         <plugins>
 
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.0</version>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
diff --git a/opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile b/opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile
index 15b17d80..45063110 100644
--- a/opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Prepare stage for multistage image build
 ## START OF STAGE0 ##
-FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} AS stage0
+FROM onap/ccsdk-alpine-j17-image:${project.docker.latestfulltag.version} AS stage0
 USER root
 
 ENV ODL_HOME /opt/opendaylight/current
-- 
cgit 1.2.3-korg