From: Singal, Kapil (ks220y) <ks220y@att.com>
Date: Wed, 9 Jun 2021 16:14:54 +0000 (-0400)
Subject: Making changes as per SILICON ODL
X-Git-Tag: 1.2.0~25
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=94a7c372094fb6c8f342dfd04984a34c975eb849

Making changes as per SILICON ODL
Adding few dependencies and refactoring sli versioning

Issue-ID: CCSDK-3331
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I9678e4b4401791a98499ab3c39ef5b24e404aea8
---

diff --git a/alpine/java11/src/main/docker/Dockerfile b/alpine/java11/src/main/docker/Dockerfile
index 341965d8..6480fe50 100644
--- a/alpine/java11/src/main/docker/Dockerfile
+++ b/alpine/java11/src/main/docker/Dockerfile
@@ -1,6 +1,7 @@
 # Base alpine with added packages needed for open ecomp
 FROM ${base.image}:${base.image.version}
 MAINTAINER CCSDK  Team (onap-ccsdk@lists.onap.org)
+USER root
 
 ARG HTTP_PROXY
 ARG HTTPS_PROXY
@@ -11,7 +12,8 @@ ENV HTTPS_PROXY ${HTTPS_PROXY}
 ENV https_proxy ${HTTPS_PROXY}
 
 ENV JAVA_HOME /opt/java/openjdk
+
 # Add tools needed for OpenDaylight
-USER root
 RUN apk update && apk --no-cache add bash git  mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss
-USER onap
\ No newline at end of file
+
+USER onap
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 190559a1..5d02b381 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -8,9 +8,7 @@
         <version>1.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>dependencies</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: ${project.artifactId}</name>
@@ -21,17 +19,10 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-              <groupId>org.glassfish.jersey</groupId>
-              <artifactId>jersey-bom</artifactId>
-              <version>2.27</version>
-              <scope>import</scope>
-              <type>pom</type>
-          </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.1.1</version>
+                <version>2.2.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -43,7 +34,6 @@
         </dependencies>
     </dependencyManagement>
 
-
     <dependencies>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -77,10 +67,6 @@
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
@@ -89,6 +75,20 @@
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+        </dependency>
+        <!-- Below provides javax.jws -->
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-ri</artifactId>
+            <type>pom</type>
+        </dependency>
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
@@ -154,6 +154,10 @@
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-filter-base</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.onap.logging-analytics</groupId>
+            <artifactId>logging-slf4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
@@ -179,6 +183,16 @@
             <artifactId>org.apache.servicemix.specs.jaxws-api-2.3</artifactId>
             <version>2.3_1</version>
         </dependency>
+        <!-- Below is required by com.google.guava : guava : jar : 28.2-jre -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>listenablefuture</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <version>2.3.4</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 827ab4a7..9f6a986b 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -8,9 +8,7 @@
         <version>1.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odlsli-alpine</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli-alpine</name>
@@ -20,7 +18,7 @@
     </organization>
 
     <properties>
-        <base.image.name>onap/ccsdk-odl-aluminum-alpine-image</base.image.name>
+        <base.image.name>onap/ccsdk-odl-silicon-alpine-image</base.image.name>
         <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
 
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
@@ -33,12 +31,14 @@
         <opendaylight.root>opt/opendaylight</opendaylight.root>
 
         <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
-        <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040</odl.features.extra>
+        <odl.features.extra>
+            odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040
+        </odl.features.extra>
         <ccsdk.odl.features>
-            ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all
+            ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all
         </ccsdk.odl.features>
         <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
-        <!-- Version definition is placed in org.onap.ccsdk.parent/oparent -->
+        <!-- All Version definition is placed in org.onap.ccsdk.parent/oparent -->
         <ccsdk.oran.a1adapter.version>1.2.0-SNAPSHOT</ccsdk.oran.a1adapter.version>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
     </properties>
@@ -51,193 +51,192 @@
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
-
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>dblib-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>filters-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliapi-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>utils-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>slicore-features-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>aai-service-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>ansible-adaptor-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>base-http-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>mdsal-resource-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
             <artifactId>publisher.installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>netbox-client-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>resource-assignment-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>saltstack-adaptor-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sql-resource-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sliadaptors-features-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>asdcApi-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>dataChange-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>lcm-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>slinorthbound-features-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>properties-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>restapi-call-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>template-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>restconf-client-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>sshapi-call-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>sliplugins-features-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
@@ -332,7 +331,8 @@
                         <id>copy-dockerfile</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -351,7 +351,8 @@
                         <id>copy-scripts</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/bin</outputDirectory>
@@ -370,7 +371,8 @@
                         <id>copy-odl-resources</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -392,7 +394,8 @@
                         <id>copy-config</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -411,7 +414,8 @@
                         <id>copy-data</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data</outputDirectory>
@@ -430,7 +434,8 @@
                         <id>copy-properties</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties
@@ -451,7 +456,8 @@
                         <id>copy-keystores</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores</outputDirectory>
@@ -523,35 +529,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.5.0</version>
-                <executions>
-                    <execution>
-                        <id>change shell permissions</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>/usr/bin/find</executable>
-                            <arguments>
-                                <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                                <argument>-name</argument>
-                                <argument>*.sh</argument>
-                                <argument>-exec</argument>
-                                <argument>chmod</argument>
-                                <argument>+x</argument>
-                                <argument>{}</argument>
-                                <argument>;</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
@@ -695,7 +672,7 @@
                                                 </ports>
                                                 <wait>
                                                     <log>all warp coils are now operating at peak efficiency</log>
-                                                    <time>150000</time>
+                                                    <time>300000</time>
                                                 </wait>
                                                 <log>
                                                     <enabled>true</enabled>
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index dd96594c..fccf7f74 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -15,10 +15,10 @@ COPY opt /opt
 COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg
 
 # CCSDK SLI
-ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.core.version}/xml/features
-ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.version}/xml/features
-ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features
-ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features
+ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.version}/xml/features
+ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.version}/xml/features
+ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.version}/xml/features
+ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.version}/xml/features
 
 # CCSDK Features
 ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features
diff --git a/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile b/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile
index c4cced8a..9c8099a3 100644
--- a/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/aluminum/aluminum-alpine/src/main/docker/Dockerfile
@@ -8,7 +8,7 @@ ENV ODL_HOME /opt/opendaylight/current
 # copy the opendaylight tar and expand
 COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/
 RUN mkdir -p /opt/odl \
-    && tar zxvf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
+    && tar xzf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
     && rm -rf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz \
     && mv /opt/odl/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} /opt/opendaylight \
     && ln -s  /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index d624c2d2..7c949a4e 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -15,6 +15,6 @@
     <description>Creates OpenDaylight container</description>
 
     <modules>
-        <module>aluminum</module>
+        <module>silicon</module>
     </modules>
 </project>
diff --git a/opendaylight/silicon/pom.xml b/opendaylight/silicon/pom.xml
new file mode 100644
index 00000000..45107bf0
--- /dev/null
+++ b/opendaylight/silicon/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-opendaylight</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distribution-odl-silicon</artifactId>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-distribution :: opendaylight :: silicon</name>
+    <description>Creates OpenDaylight container</description>
+
+    <modules>
+        <module>silicon-alpine</module>
+    </modules>
+
+    <properties>
+        <ccsdk.opendaylight.version>0.14.0</ccsdk.opendaylight.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.integration</groupId>
+                <artifactId>onap-karaf</artifactId>
+                <version>${ccsdk.opendaylight.version}</version>
+                <type>tar.gz</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/opendaylight/silicon/silicon-alpine/pom.xml b/opendaylight/silicon/silicon-alpine/pom.xml
new file mode 100644
index 00000000..414f3766
--- /dev/null
+++ b/opendaylight/silicon/silicon-alpine/pom.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-odl-silicon</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distribution-odl-silicon-docker</artifactId>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-distribution :: opendaylight :: silicon :: docker</name>
+    <description>Creates OpenDaylight container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
+
+    <properties>
+        <image.name>onap/ccsdk-odl-silicon-alpine-image</image.name>
+        <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
+        <odl.shiro.version>0.13.2</odl.shiro.version>
+    </properties>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>${basedir}/../../../src/main/scripts/TagVersion.groovy</source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>get-odl-distribution</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.opendaylight.integration</groupId>
+                                    <artifactId>${odl.karaf.artifactId}</artifactId>
+                                    <version>${ccsdk.opendaylight.version}</version>
+                                    <type>tar.gz</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-with-alternalte-repo-2</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>com.highstreet-technologies.aaa</groupId>
+                                    <artifactId>aaa-shiro</artifactId>
+                                    <version>${odl.shiro.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-shiro/${odl.shiro.version}</outputDirectory>
+                                    <destFileName>aaa-shiro-${odl.shiro.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.highstreet-technologies.aaa</groupId>
+                                    <artifactId>aaa-authn-api</artifactId>
+                                    <version>${odl.shiro.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version}</outputDirectory>
+                                    <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-dockerfile</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <includes>
+                                        <include>Dockerfile</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                                <resource>
+                                    <directory>src/main/odlscripts</directory>
+                                    <includes>
+                                        <include>*</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.34.0</version>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${image.name}</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <noCache>true</noCache>
+                                        <contextDir>${basedir}/target/docker-stage</contextDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <tags>
+                                            <tag>${project.docker.latestminortag.version}</tag>
+                                            <tag>${project.docker.latestfulltag.version}</tag>
+                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                            <verbose>${docker.verbose}</verbose>
+                            <skipPush>${docker.skip.push}</skipPush>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>build-push-images</id>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
new file mode 100644
index 00000000..9c8099a3
--- /dev/null
+++ b/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Prepare stage for multistage image build
+## START OF STAGE0 ##
+FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} AS stage0
+USER root
+
+ENV ODL_HOME /opt/opendaylight/current
+
+# copy the opendaylight tar and expand
+COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/
+RUN mkdir -p /opt/odl \
+    && tar xzf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
+    && rm -rf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz \
+    && mv /opt/odl/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} /opt/opendaylight \
+    && ln -s  /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \
+    && ln -s /opt/opendaylight /opt/opendaylight/current
+
+# Patch some opendaylight artifacts
+COPY system $ODL_HOME/system
+# Add missing scripts see SDNC-1056
+#COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/
+#RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt
+
+## END OF STAGE0 ##
+
+
+## This will create actual image
+FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version}
+MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
+USER root
+
+ENV ODL_HOME /opt/opendaylight/current
+
+COPY --from=stage0 /opt /opt
+
+# ENTRYPOINT exec /opt/opendaylight/bin/karaf
+WORKDIR $ODL_HOME
+USER onap
+EXPOSE 8181
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 2c9239e9..3725333e 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-core-artifacts</artifactId>
-                <version>${ccsdk.sli.core.version}</version>
+                <version>${ccsdk.sli.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>