migrate dist to sulfur-sr0

add odl sulfur dist

(djtimoney) Fixed some dependencies to resolve issues in local build,
installed odl-restconf-nb-bierman02 karaf package to enable Bierman
RESTCONF API support

Issue-ID: CCSDK-3695
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: Ifd98f04f9a68c0c3923802839cdb71e12a115d09
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>

diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml
index ca1a9fc..d014d20 100644 (file)
--- a/alpine/java11/pom.xml
+++ b/alpine/java11/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-alpine-root</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-j11-alpine</artifactId>

diff --git a/alpine/pom.xml b/alpine/pom.xml
index a6b78d8..827a2d9 100644 (file)
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-alpine-root</artifactId>

diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 6d1068c..73443bb 100644 (file)
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>ansible-server</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: ${project.artifactId}</name>

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 9f064a6..1bbfaee 100755 (executable)
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dependencies</artifactId>
@@ -38,10 +38,12 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
         </dependency>
         <dependency>
             <groupId>com.att.eelf</groupId>
@@ -200,7 +202,7 @@
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_annotations</artifactId>
-            <version>2.5.1</version>
+            <version>2.11.0</version>
         </dependency>
     </dependencies>
 

diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index ec8ef65..748a32e 100644 (file)
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>

diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index e53fb28..ba57415 100644 (file)
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index a49449b..8101fa9 100644 (file)
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-odlsli</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odlsli-alpine</artifactId>
@@ -18,7 +18,7 @@
     </organization>
 
     <properties>
-        <base.image.name>onap/ccsdk-odl-phosphorus-alpine-image</base.image.name>
+        <base.image.name>onap/ccsdk-odl-sulfur-alpine-image</base.image.name>
         <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
 
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
@@ -33,7 +33,7 @@
         <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
         <!-- ODL Features Boot -->
         <extra.odl.features>
-            odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040
+            odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040,odl-restconf-nb-bierman02,odl-controller-blueprint
         </extra.odl.features>
         <!-- SLI Features Boot -->
         <ccsdk.sli.features>

diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index f85161a..4214149 100644 (file)
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odlsli</artifactId>

diff --git a/opendaylight/phosphorus/phosphorus-alpine/pom.xml b/opendaylight/phosphorus/phosphorus-alpine/pom.xml
index 9abc7ea..264131a 100644 (file)
--- a/opendaylight/phosphorus/phosphorus-alpine/pom.xml
+++ b/opendaylight/phosphorus/phosphorus-alpine/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-odl-phosphorus</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odl-phosphorus-docker</artifactId>

diff --git a/opendaylight/phosphorus/pom.xml b/opendaylight/phosphorus/pom.xml
index fb39fcd..f7d7525 100644 (file)
--- a/opendaylight/phosphorus/pom.xml
+++ b/opendaylight/phosphorus/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-opendaylight</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odl-phosphorus</artifactId>

diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 55df294..a2d70f2 100644 (file)
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-opendaylight</artifactId>
@@ -15,7 +15,7 @@
     <description>Creates OpenDaylight container</description>
 
     <modules>
-        <module>silicon</module>
+        <module>sulfur</module>
         <module>phosphorus</module>
     </modules>
 </project>

diff --git a/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml b/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml
deleted file mode 100755 (executable)
index 52bc1d4..0000000
--- a/opendaylight/silicon/silicon-alpine/src/main/resources/framework-4.3.2-features.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
-      Licensed to the Apache Software Foundation (ASF) under one or more
-      contributor license agreements.  See the NOTICE file distributed with
-      this work for additional information regarding copyright ownership.
-      The ASF licenses this file to You under the Apache License, Version 2.0
-      (the "License"); you may not use this file except in compliance with
-      the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-<features name="framework-4.3.2" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
-
-    <!-- This file is not used in the assembly., This file is used by the karaf-maven-plugin to generate a "final" feature.xml
-              including the correct start-level for the generation of the startup.propertie file -->
-
-    <feature version="4.3.2" description="Karaf core feature" name="framework" hidden="true">
-        <!-- persistent wiring extension -->
-        <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.2</bundle>
-        <!-- mvn: url handlers -->
-        <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/2.6.7</bundle>
-        <!-- logging -->
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version}</bundle>
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${patch.pax.logging.version}</bundle>
-        <bundle start-level="8">mvn:org.fusesource.jansi/jansi/1.18</bundle>
-        <!-- config admin -->
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle>
-        <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.9.22</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.2</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/1.0.6</bundle>
-        <bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/1.0.14</bundle>
-        <!-- file install -->
-        <bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/3.6.8</bundle>
-        <!-- features service -->
-        <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/4.3.2</bundle>
-        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/2.9.0</bundle>
-    </feature>
-
-    <feature version="4.3.2" description="Karaf core feature" name="framework-logback" hidden="true">
-        <!-- persistent wiring extension -->
-        <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.2</bundle>
-        <!-- mvn: url handlers -->
-        <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/2.6.7</bundle>
-        <!-- logging -->
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version}</bundle>
-        <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-logback/${patch.pax.logging.version}</bundle>
-        <!-- config admin -->
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
-        <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle>
-        <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle>
-        <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.9.22</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.2</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/1.0.6</bundle>
-        <bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6</bundle>
-        <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/1.0.14</bundle>
-        <!-- file install -->
-        <bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/3.6.8</bundle>
-        <!-- features service -->
-        <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/4.3.2</bundle>
-    </feature>
-
-</features>

diff --git a/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties b/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties
deleted file mode 100755 (executable)
index 40baf70..0000000
--- a/opendaylight/silicon/silicon-alpine/src/main/resources/startup.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Bundles to be started on startup, with startlevel
-mvn\:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.2 = 1
-mvn\:org.ops4j.pax.url/pax-url-aether/2.6.7 = 5
-mvn\:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version} = 8
-mvn\:org.ops4j.pax.logging/pax-logging-log4j2/${patch.pax.logging.version} = 8
-mvn\:org.fusesource.jansi/jansi/1.18 = 8
-mvn\:org.osgi/org.osgi.util.promise/1.1.1 = 9
-mvn\:org.apache.felix/org.apache.felix.coordinator/1.0.2 = 9
-mvn\:org.apache.felix/org.apache.felix.converter/1.0.14 = 9
-mvn\:org.osgi/org.osgi.util.function/1.1.0 = 9
-mvn\:org.apache.felix/org.apache.felix.configadmin/1.9.22 = 10
-mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.2 = 11
-mvn\:org.apache.felix/org.apache.felix.configurator/1.0.14 = 11
-mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6 = 11
-mvn\:org.apache.felix/org.apache.felix.cm.json/1.0.6 = 11
-mvn\:org.apache.felix/org.apache.felix.fileinstall/3.6.8 = 12
-mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.3.2 = 15
-# The following are added by opendaylight-karaf-resources
-mvn\:org.osgi/org.osgi.service.event/1.4.0 = 7
-mvn\:org.apache.felix/org.apache.felix.metatype/1.2.4 = 8
-mvn\:org.opendaylight.odlparent/bcprov-framework-ext/8.1.3 = 14
-mvn\:org.opendaylight.odlparent/bcpkix-framework-ext/8.1.3 = 14
-mvn\:org.opendaylight.odlparent/logging-markers/8.1.3 = 14
-mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 = 14

diff --git a/opendaylight/silicon/pom.xml b/opendaylight/sulfur/pom.xml
similarity index 78%
rename from opendaylight/silicon/pom.xml
rename to opendaylight/sulfur/pom.xml
index 9f789c9..c7f3ce5 100644 (file)
--- a/opendaylight/silicon/pom.xml
+++ b/opendaylight/sulfur/pom.xml
@@ -5,21 +5,21 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-opendaylight</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>distribution-odl-silicon</artifactId>
+    <artifactId>distribution-odl-sulfur</artifactId>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: opendaylight :: silicon</name>
+    <name>ccsdk-distribution :: opendaylight :: sulfur</name>
     <description>Creates OpenDaylight container</description>
 
     <modules>
-        <module>silicon-alpine</module>
+        <module>sulfur-alpine</module>
     </modules>
 
     <properties>
-        <ccsdk.opendaylight.version>0.14.2</ccsdk.opendaylight.version>
+        <ccsdk.opendaylight.version>0.16.1</ccsdk.opendaylight.version>
     </properties>
 
     <dependencyManagement>

diff --git a/opendaylight/silicon/silicon-alpine/pom.xml b/opendaylight/sulfur/sulfur-alpine/pom.xml
similarity index 56%
rename from opendaylight/silicon/silicon-alpine/pom.xml
rename to opendaylight/sulfur/sulfur-alpine/pom.xml
index a353ca9..36a3bc7 100644 (file)
--- a/opendaylight/silicon/silicon-alpine/pom.xml
+++ b/opendaylight/sulfur/sulfur-alpine/pom.xml
@@ -4,28 +4,23 @@
 
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
-        <artifactId>distribution-odl-silicon</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <artifactId>distribution-odl-sulfur</artifactId>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>distribution-odl-silicon-docker</artifactId>
+    <artifactId>distribution-odl-sulfur-docker</artifactId>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: opendaylight :: silicon :: docker</name>
+    <name>ccsdk-distribution :: opendaylight :: sulfur :: docker</name>
     <description>Creates OpenDaylight container</description>
     <organization>
         <name>ONAP</name>
     </organization>
 
     <properties>
-        <image.name>onap/ccsdk-odl-silicon-alpine-image</image.name>
+        <image.name>onap/ccsdk-odl-sulfur-alpine-image</image.name>
         <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
-        <odl.shiro.version>0.13.5</odl.shiro.version>
-        <odl.ops4j.version>7.3.16</odl.ops4j.version>
-        <odl.pax.logging.version>2.0.9</odl.pax.logging.version>
-        <patch.pax.logging.version>2.0.14</patch.pax.logging.version>
-        <odl.karaf.framework.version>4.3.2</odl.karaf.framework.version>
-        <odl.netconf.version>1.13.4</odl.netconf.version>
+        <odl.shiro.version>0.15.5</odl.shiro.version>
     </properties>
 
     <build>
@@ -75,7 +70,7 @@
                             <overWriteIfNewer>true</overWriteIfNewer>
                         </configuration>
                     </execution>
-                    <execution>
+                   <!--  <execution>
                         <id>copy-with-alternalte-repo-2</id>
                         <phase>generate-sources</phase>
                         <goals>
@@ -83,7 +78,7 @@
                         </goals>
                         <configuration>
                             <artifactItems>
-                                <artifactItem>
+                                <artifactItem> not yet ready
                                     <groupId>com.highstreet-technologies.aaa</groupId>
                                     <artifactId>aaa-authn-api</artifactId>
                                     <version>${odl.shiro.version}</version>
@@ -91,60 +86,12 @@
                                     <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName>
                                     <excludes>*</excludes>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>com.highstreet-technologies.ops4j.pax.web</groupId>
-                                    <artifactId>pax-web-jetty</artifactId>
-                                    <version>${odl.ops4j.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/web/pax-web-jetty/${odl.ops4j.version}</outputDirectory>
-                                    <destFileName>pax-web-jetty-${odl.ops4j.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>com.highstreet-technologies.netconf</groupId>
-                                    <artifactId>netconf-util</artifactId>
-                                    <version>${odl.netconf.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/netconf-util/${odl.netconf.version}</outputDirectory>
-                                    <destFileName>netconf-util-${odl.netconf.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>com.highstreet-technologies.netconf</groupId>
-                                    <artifactId>sal-netconf-connector</artifactId>
-                                    <version>${odl.netconf.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/sal-netconf-connector/${odl.netconf.version}</outputDirectory>
-                                    <destFileName>sal-netconf-connector-${odl.netconf.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-log4j2</artifactId>
-                                    <version>${patch.pax.logging.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-log4j2/${patch.pax.logging.version}</outputDirectory>
-                                    <destFileName>pax-logging-log4j2-${patch.pax.logging.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-logback</artifactId>
-                                    <version>${patch.pax.logging.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-logback/${patch.pax.logging.version}</outputDirectory>
-                                    <destFileName>pax-logging-logback-${patch.pax.logging.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-api</artifactId>
-                                    <version>${patch.pax.logging.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-api/${patch.pax.logging.version}</outputDirectory>
-                                    <destFileName>pax-logging-api-${patch.pax.logging.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
                             </artifactItems>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
                         </configuration>
-                    </execution>
+                    </execution> -->
                 </executions>
             </plugin>
 
@@ -178,26 +125,6 @@
                             </resources>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-karaf-framework-features</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/resources</directory>
-                                    <includes>
-                                        <include>framework-${odl.karaf.framework.version}-features.xml</include>
-                                        <include>startup.properties</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
 

diff --git a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile b/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile
similarity index 75%
rename from opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
rename to opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile
index 19cd55f..4201b83 100644 (file)
--- a/opendaylight/silicon/silicon-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/sulfur/sulfur-alpine/src/main/docker/Dockerfile
@@ -21,20 +21,13 @@ RUN sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL
     && addgroup odl wheel
 
 # Patch some opendaylight artifacts
-COPY system $ODL_HOME/system
+#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
 
 
-# Remove vulnerable version of ops4j logging
-COPY framework-${odl.karaf.framework.version}-features.xml $ODL_HOME/system/org/apache/karaf/features/framework/${odl.karaf.framework.version}/framework-${odl.karaf.framework.version}-features.xml
-COPY startup.properties $ODL_HOME/etc/startup.properties
-RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-log4j2/${odl.pax.logging.version}
-RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-logback/${odl.pax.logging.version}
-RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-api/${odl.pax.logging.version}
-
 # Changing ownership and permission of /opt
 RUN chown -R odl:odl /opt && chmod -R 755 /opt
 

diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml
index 67d7567..569c859 100644 (file)
--- a/platform-logic/a1Adapter-api/pom.xml
+++ b/platform-logic/a1Adapter-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-a1Adapterapi</artifactId>

diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml
index 9199cd6..3048aed 100644 (file)
--- a/platform-logic/asdc-api/pom.xml
+++ b/platform-logic/asdc-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-asdcapi</artifactId>

diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml
index 56d394d..69a4fec 100644 (file)
--- a/platform-logic/cMNotify-api/pom.xml
+++ b/platform-logic/cMNotify-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-cMNotifyai</artifactId>

diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 61d43ea..0627b94 100644 (file)
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-installer</artifactId>

diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml
index 28bcad2..959676a 100644 (file)
--- a/platform-logic/oofpcipoc-api/pom.xml
+++ b/platform-logic/oofpcipoc-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-oofpcipocapi</artifactId>

diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index 9fa2673..97e01b0 100644 (file)
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-platform-logic</artifactId>

diff --git a/platform-logic/ran-slice-api/pom.xml b/platform-logic/ran-slice-api/pom.xml
index a253d15..b684bd8 100644 (file)
--- a/platform-logic/ran-slice-api/pom.xml
+++ b/platform-logic/ran-slice-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-ranSlice</artifactId>

diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index 882fe16..7fe0d60 100644 (file)
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-restapi-templates</artifactId>

diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml
index d157550..1284086 100644 (file)
--- a/platform-logic/sliapi/pom.xml
+++ b/platform-logic/sliapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-sliapi</artifactId>

diff --git a/pom.xml b/pom.xml
index b6d58d3..59d18ca 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-root</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution</name>

diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index 3f11bfa..a25ebcc 100644 (file)
--- a/saltstack-server/pom.xml
+++ b/saltstack-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>saltstack-server</artifactId>

diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index e428780..f2f074d 100644 (file)
--- a/ubuntu/pom.xml
+++ b/ubuntu/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-ubuntu</artifactId>

diff --git a/version.properties b/version.properties
index 4b7acda..4ad7122 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
 
 release_name=1
 sprint_number=4
-feature_revision=0
+feature_revision=1
 
 base_version=${release_name}.${sprint_number}.${feature_revision}