summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-05-31 15:04:54 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-31 15:04:54 +0000
commita79f71879eaf98ada02adbeff3d21cb12d41af39 (patch)
tree823f4acc5f8c256b1bfee1e90555a7da708fa198
parent735c42c00da524d9ddd1da0d0b4dc2fd6b781fe3 (diff)
parent8f832f12840ed226a016de26e887d9f43fc3dd27 (diff)
Merge "Roll to next snapshot" into dublin
-rw-r--r--alpine/pom.xml4
-rw-r--r--ansible-server/pom.xml4
-rwxr-xr-xdependencies/pom.xml4
-rw-r--r--dgbuilder-docker/pom.xml4
-rw-r--r--dgbuilder/pom.xml4
-rw-r--r--odlsli/odlsli-alpine/pom.xml11
-rw-r--r--odlsli/odlsli-ubuntu/pom.xml11
-rw-r--r--odlsli/pom.xml4
-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/pom.xml4
-rw-r--r--platform-logic/asdc-api/pom.xml4
-rw-r--r--platform-logic/installer/pom.xml4
-rw-r--r--platform-logic/oofpcipoc-api/pom.xml4
-rw-r--r--platform-logic/pom.xml4
-rw-r--r--platform-logic/restapi-templates/pom.xml4
-rw-r--r--platform-logic/sliapi/pom.xml4
-rw-r--r--pom.xml4
-rw-r--r--saltstack-server/pom.xml4
-rw-r--r--ubuntu/pom.xml4
-rw-r--r--version.properties2
22 files changed, 53 insertions, 47 deletions
diff --git a/alpine/pom.xml b/alpine/pom.xml
index 4bbc21dd..9f944c3c 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.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>distribution-alpine</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: alpine</name>
diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 7d7ebad5..5ed61b38 100644
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.3</version>
+ <version>1.2.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>ansible-server</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-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 0075e74f..3ca3fcdd 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.3</version>
+ <version>1.2.4-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>dependencies</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution:: dependencies</name>
diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index 71fc9eb6..c9fd2643 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.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-dgbuilder-docker</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: dgbuilder-docker</name>
diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index 8f204daf..fb87c9a1 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.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-dgbuilder</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-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 8988424f..ec3c7263 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.3</version>
+ <version>1.2.4-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odlsli-alpine</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: odlsli-alpine</name>
@@ -25,8 +25,11 @@
<image.name>onap/ccsdk-odlsli-alpine-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
- <ccsdk.features.version>0.4.3-SNAPSHOT</ccsdk.features.version>
- <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+ <ccsdk.features.version>0.4.4-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.sli.core.version>0.4.4-SNAPSHOT</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>0.4.4-SNAPSHOT</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>0.4.4-SNAPSHOT</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>0.4.4-SNAPSHOT</ccsdk.sli.plugins.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<opendaylight.root>opt/opendaylight</opendaylight.root>
<docker.push.phase>deploy</docker.push.phase>
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index 89a7df01..132a065e 100644
--- a/odlsli/odlsli-ubuntu/pom.xml
+++ b/odlsli/odlsli-ubuntu/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.3</version>
+ <version>1.2.4-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odlsli-ubuntu</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: odlsli-ubuntu</name>
@@ -25,8 +25,11 @@
<image.name>onap/ccsdk-odlsli-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
- <ccsdk.features.version>0.4.3-SNAPSHOT</ccsdk.features.version>
- <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+ <ccsdk.features.version>0.4.4-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.sli.core.version>0.4.4-SNAPSHOT</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>0.4.4-SNAPSHOT</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>0.4.4-SNAPSHOT</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>0.4.4-SNAPSHOT</ccsdk.sli.plugins.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<opendaylight.root>opt/opendaylight</opendaylight.root>
<docker.push.phase>deploy</docker.push.phase>
diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index ffd85081..7dada83a 100644
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>distribution-odlsli</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: odlsli</name>
diff --git a/opendaylight/fluorine/fluorine-alpine/pom.xml b/opendaylight/fluorine/fluorine-alpine/pom.xml
index 2adffb97..17109c77 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.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-fluorine-alpine</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-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 2fdfa330..8a925098 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.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-fluorine-ubuntu</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-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 1d3546e9..6f9ac575 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.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-fluorine</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight</name>
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 72b93fa7..b3f31590 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>distribution-opendaylight</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight</name>
diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml
index 00fa949b..1d9d9261 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.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-asdcapi</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-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 02884ac0..fff1d45a 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-installer</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml
index 1385211c..b94a32cc 100644
--- a/platform-logic/oofpcipoc-api/pom.xml
+++ b/platform-logic/oofpcipoc-api/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-oofpcipocapi</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index c151f0e4..1a5a2b3d 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.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>distribution-platform-logic</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: platform-logic</name>
diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index 7c2e1ff9..ba537e7d 100644
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-restapi-templates</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml
index 1055c799..9ab72e68 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.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-sliapi</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
diff --git a/pom.xml b/pom.xml
index 09dca00b..e1b7fb8c 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.3</version>
+ <version>1.2.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution</name>
diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index c04bf76e..cf7c9603 100644
--- a/saltstack-server/pom.xml
+++ b/saltstack-server/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>saltstack-server</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: saltstack-server</name>
diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index 6a74541a..6a9e493b 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.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
</parent>
<artifactId>distribution-ubuntu</artifactId>
- <version>0.4.3-SNAPSHOT</version>
+ <version>0.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: ubuntu</name>
diff --git a/version.properties b/version.properties
index d64f94d7..ec907de7 100644
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
release_name=0
sprint_number=4
-feature_revision=3
+feature_revision=4
base_version=${release_name}.${sprint_number}.${feature_revision}