From 1cd7d6526c05daed8c2de0452479ece1b12b62fd Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 19 Jun 2023 10:30:12 -0400
Subject: [PATCH] Create ODL Argon docker

Added code to create base OpenDaylight Argon SR1 docker

Issue-ID: CCSDK-3913

Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I9459a36e35d6291e9d85a7a907091b61610a971c
---
 .../{sulfur/sulfur-alpine => argon/argon-alpine}/pom.xml       | 10 +++++-----
 .../argon-alpine}/src/main/docker/Dockerfile                   |  2 +-
 opendaylight/{sulfur => argon}/pom.xml                         |  8 ++++----
 opendaylight/pom.xml                                           |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename opendaylight/{sulfur/sulfur-alpine => argon/argon-alpine}/pom.xml (96%)
 rename opendaylight/{sulfur/sulfur-alpine => argon/argon-alpine}/src/main/docker/Dockerfile (96%)
 rename opendaylight/{sulfur => argon}/pom.xml (82%)

diff --git a/opendaylight/sulfur/sulfur-alpine/pom.xml b/opendaylight/argon/argon-alpine/pom.xml
similarity index 96%
rename from opendaylight/sulfur/sulfur-alpine/pom.xml
rename to opendaylight/argon/argon-alpine/pom.xml
index 43821870..a7ca5cc2 100644
--- a/opendaylight/sulfur/sulfur-alpine/pom.xml
+++ b/opendaylight/argon/argon-alpine/pom.xml
@@ -4,23 +4,23 @@
 
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
-        <artifactId>distribution-odl-sulfur</artifactId>
+        <artifactId>distribution-odl-argon</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>distribution-odl-sulfur-docker</artifactId>
+    <artifactId>distribution-odl-chlorine-argon</artifactId>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: opendaylight :: sulfur :: docker</name>
+    <name>ccsdk-distribution :: opendaylight :: argon :: docker</name>
     <description>Creates OpenDaylight container</description>
     <organization>
         <name>ONAP</name>
     </organization>
 
     <properties>
-        <image.name>onap/ccsdk-odl-sulfur-alpine-image</image.name>
+        <image.name>onap/ccsdk-odl-argon-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>
diff --git a/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile b/opendaylight/argon/argon-alpine/src/main/docker/Dockerfile
similarity index 96%
rename from opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile
rename to opendaylight/argon/argon-alpine/src/main/docker/Dockerfile
index 15b17d80..45063110 100644
--- a/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/argon/argon-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
diff --git a/opendaylight/sulfur/pom.xml b/opendaylight/argon/pom.xml
similarity index 82%
rename from opendaylight/sulfur/pom.xml
rename to opendaylight/argon/pom.xml
index e1c7071e..7b21e3a1 100644
--- a/opendaylight/sulfur/pom.xml
+++ b/opendaylight/argon/pom.xml
@@ -8,18 +8,18 @@
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>distribution-odl-sulfur</artifactId>
+    <artifactId>distribution-odl-argon</artifactId>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: opendaylight :: sulfur</name>
+    <name>ccsdk-distribution :: opendaylight :: argon</name>
     <description>Creates OpenDaylight container</description>
 
     <modules>
-        <module>sulfur-alpine</module>
+        <module>argon-alpine</module>
     </modules>
 
     <properties>
-        <ccsdk.opendaylight.version>0.16.1</ccsdk.opendaylight.version>
+        <ccsdk.opendaylight.version>0.18.1</ccsdk.opendaylight.version>
     </properties>
 
     <dependencyManagement>
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 931664a6..999001f3 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -15,7 +15,7 @@
     <description>Creates OpenDaylight container</description>
 
     <modules>
-        <module>sulfur</module>
         <module>chlorine</module>
+        <module>argon</module>
     </modules>
 </project>
-- 
2.16.6