summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--alpine/pom.xml4
-rw-r--r--ansible-server/pom.xml4
-rwxr-xr-xdependencies/pom.xml6
-rw-r--r--dgbuilder-docker/pom.xml4
-rw-r--r--dgbuilder/pom.xml4
-rw-r--r--odlsli/odlsli-alpine/pom.xml9
-rw-r--r--odlsli/odlsli-alpine/src/main/docker/Dockerfile2
-rw-r--r--odlsli/odlsli-ubuntu/pom.xml9
-rw-r--r--odlsli/odlsli-ubuntu/src/main/docker/Dockerfile2
-rw-r--r--odlsli/pom.xml8
-rw-r--r--opendaylight/fluorine/fluorine-alpine/pom.xml4
-rw-r--r--opendaylight/fluorine/fluorine-ubuntu/pom.xml4
-rw-r--r--opendaylight/fluorine/pom.xml4
-rw-r--r--opendaylight/oxygen/oxygen-alpine/pom.xml4
-rw-r--r--opendaylight/oxygen/oxygen-ubuntu/pom.xml4
-rw-r--r--opendaylight/oxygen/pom.xml4
-rw-r--r--opendaylight/pom.xml5
-rw-r--r--platform-logic/asdc-api/pom.xml4
-rw-r--r--platform-logic/installer/pom.xml16
-rw-r--r--platform-logic/pom.xml4
-rw-r--r--platform-logic/sliapi/pom.xml4
-rw-r--r--pom.xml4
-rw-r--r--ubuntu/pom.xml4
-rw-r--r--version.properties2
24 files changed, 65 insertions, 54 deletions
diff --git a/alpine/pom.xml b/alpine/pom.xml
index a60dd1a2..8e3a1642 100644
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-alpine</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: alpine</name>
diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 4ea5ae3c..29b5e639 100644
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -4,13 +4,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>ansible-server</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<name>ccsdk :: distribution :: ${project.artifactId}</name>
<description>Creates ansible-server Docker container</description>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 6e41e26c..481fb0ca 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>dependencies</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution:: dependencies</name>
@@ -104,7 +104,7 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.1</version>
+ <version>2.1.1</version>
</dependency>
</dependencies>
diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index a2ec354e..998bc3b5 100644
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-dgbuilder-docker</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: dgbuilder-docker</name>
diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index 63a617b6..31ee9ba4 100644
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-dgbuilder</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: dgbuilder</name>
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 29ee8082..3c4e9836 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,22 +5,23 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odlsli-alpine</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: odlsli-alpine</name>
- <description>Creates SDN Controller Docker container</description>
+ <description>Creates Alpine-based ODLSLI Docker container</description>
<organization>
<name>openECOMP</name>
</organization>
<properties>
+ <base.image.name>onap/ccsdk-odl-fluorine-alpine-image</base.image.name>
<image.name>onap/ccsdk-odlsli-alpine-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.features.version>${project.version}</ccsdk.features.version>
@@ -31,7 +32,7 @@
<docker.verbose>true</docker.verbose>
<ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
</properties>
-
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index edd1f0f2..c6088b02 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
# Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-odl-oxygen-alpine-image:${project.version}
+FROM ${base.image.name}:${project.version}
MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
ENV ODL_HOME /opt/opendaylight
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index b6c5d142..93d527b9 100644
--- a/odlsli/odlsli-ubuntu/pom.xml
+++ b/odlsli/odlsli-ubuntu/pom.xml
@@ -5,22 +5,23 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odlsli-ubuntu</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-distribution :: odlsli</name>
- <description>Creates SDN Controller Docker container</description>
+ <name>ccsdk-distribution :: odlsli-ubuntu</name>
+ <description>Creates Ubuntu-based ODLSLI Docker container</description>
<organization>
<name>openECOMP</name>
</organization>
<properties>
+ <base.image.name>onap/ccsdk-odl-fluorine-ubuntu-image</base.image.name>
<image.name>onap/ccsdk-odlsli-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.features.version>${project.version}</ccsdk.features.version>
diff --git a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile
index 80cd95b2..455bdd79 100644
--- a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
# Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-odl-oxygen-ubuntu-image:${project.version}
+FROM ${base.image.name}:${project.version}
MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
ENV ODL_HOME /opt/opendaylight
diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index b4ebe1fe..89d3fc28 100644
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -5,15 +5,15 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-odlsli</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ccsdk-distribution :: opendaylight</name>
- <description>Creates OpenDaylight container</description>
+ <name>ccsdk-distribution :: odlsli</name>
+ <description>Creates ODLSLI containers</description>
<modules>
<module>odlsli-ubuntu</module>
diff --git a/opendaylight/fluorine/fluorine-alpine/pom.xml b/opendaylight/fluorine/fluorine-alpine/pom.xml
index dc7e96cd..477effa6 100644
--- a/opendaylight/fluorine/fluorine-alpine/pom.xml
+++ b/opendaylight/fluorine/fluorine-alpine/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odl-fluorine</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-fluorine-alpine</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
diff --git a/opendaylight/fluorine/fluorine-ubuntu/pom.xml b/opendaylight/fluorine/fluorine-ubuntu/pom.xml
index da85bf1e..d1849571 100644
--- a/opendaylight/fluorine/fluorine-ubuntu/pom.xml
+++ b/opendaylight/fluorine/fluorine-ubuntu/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odl-fluorine</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-fluorine-ubuntu</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
diff --git a/opendaylight/fluorine/pom.xml b/opendaylight/fluorine/pom.xml
index bcb07db7..8d4fa4bf 100644
--- a/opendaylight/fluorine/pom.xml
+++ b/opendaylight/fluorine/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-opendaylight</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-fluorine</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight</name>
diff --git a/opendaylight/oxygen/oxygen-alpine/pom.xml b/opendaylight/oxygen/oxygen-alpine/pom.xml
index a6ef2484..c913955c 100644
--- a/opendaylight/oxygen/oxygen-alpine/pom.xml
+++ b/opendaylight/oxygen/oxygen-alpine/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odl-oxygen</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-oxygen-alpine</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
diff --git a/opendaylight/oxygen/oxygen-ubuntu/pom.xml b/opendaylight/oxygen/oxygen-ubuntu/pom.xml
index 7756b304..42407bf9 100644
--- a/opendaylight/oxygen/oxygen-ubuntu/pom.xml
+++ b/opendaylight/oxygen/oxygen-ubuntu/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odl-oxygen</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-oxygen-ubuntu</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
diff --git a/opendaylight/oxygen/pom.xml b/opendaylight/oxygen/pom.xml
index 4f057a92..8b2b02f9 100644
--- a/opendaylight/oxygen/pom.xml
+++ b/opendaylight/oxygen/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-opendaylight</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-oxygen</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight</name>
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index f51bbbca..93efd670 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -5,18 +5,17 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-opendaylight</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight</name>
<description>Creates OpenDaylight container</description>
<modules>
- <module>oxygen</module>
<module>fluorine</module>
</modules>
</project>
diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml
index 95f5b4ef..e4cacf76 100644
--- a/platform-logic/asdc-api/pom.xml
+++ b/platform-logic/asdc-api/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-asdcapi</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index e741cdfe..351c40aa 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,16 +5,26 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-installer</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
<description>Contains platform-level service logic installer</description>
-
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-core-artifacts</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index cd3eeb9d..e307430e 100644
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-platform-logic</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: platform-logic</name>
diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml
index e7328d56..c8a7a128 100644
--- a/platform-logic/sliapi/pom.xml
+++ b/platform-logic/sliapi/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-sliapi</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
diff --git a/pom.xml b/pom.xml
index 0d30ea26..851307b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution</name>
diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index fb655b01..8f17a987 100644
--- a/ubuntu/pom.xml
+++ b/ubuntu/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<artifactId>distribution-ubuntu</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: ubuntu</name>
diff --git a/version.properties b/version.properties
index ffee02fc..b1967d0a 100644
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
release_name=0
sprint_number=4
-feature_revision=0
+feature_revision=1
base_version=${release_name}.${sprint_number}.${feature_revision}