summaryrefslogtreecommitdiffstats
path: root/opendaylight
diff options
context:
space:
mode:
authorMichael Dürre <michael.duerre@highstreet-technologies.com>2023-01-12 12:18:31 +0100
committerMichael Dürre <michael.duerre@highstreet-technologies.com>2023-01-12 12:23:59 +0100
commit408cd42086aa968374c7ebb1d9125a93d7a0a10c (patch)
treef128ddc188608258ee4434ec6e8c5118cf3c3df6 /opendaylight
parent5774938b481d179a2eb43c090c2702c41cf18fb7 (diff)
prepare dist for chlorine
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>
Diffstat (limited to 'opendaylight')
-rw-r--r--opendaylight/chlorine/chlorine-alpine/pom.xml8
-rw-r--r--opendaylight/chlorine/chlorine-alpine/src/main/docker/Dockerfile2
2 files changed, 5 insertions, 5 deletions
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