diff options
| -rw-r--r-- | opendaylight/argon/argon-alpine/pom.xml (renamed from opendaylight/sulfur/sulfur-alpine/pom.xml) | 10 | ||||
| -rw-r--r-- | opendaylight/argon/argon-alpine/src/main/docker/Dockerfile (renamed from opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile) | 2 | ||||
| -rw-r--r-- | opendaylight/argon/pom.xml (renamed from opendaylight/sulfur/pom.xml) | 8 | ||||
| -rw-r--r-- | opendaylight/pom.xml | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/opendaylight/sulfur/sulfur-alpine/pom.xml b/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 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 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> |