summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-08-28 01:36:32 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-28 01:36:32 +0000
commit8f0ee69b21cb6035805f8e8e74d7237484c60cb0 (patch)
tree4bc75594ef8c0ad346fb85ce5629329fe0c215b3
parent79f08990c052c01712d332460ba386b99fb4bb99 (diff)
parentf529f8a945e35db350b14a5f0d86281904004e35 (diff)
Merge "Roll elalto-fluorine version" into elalto-fluorine
-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.xml12
-rw-r--r--odlsli/odlsli-ubuntu/pom.xml12
-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/neon/neon-alpine/pom.xml4
-rw-r--r--opendaylight/neon/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
24 files changed, 55 insertions, 55 deletions
diff --git a/alpine/pom.xml b/alpine/pom.xml
index 21a458a5..818d9ac8 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-alpine</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: alpine</name>
diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 3e29bba9..fc6b6735 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.3.3</version>
+ <version>1.3.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>ansible-server</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-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 a45ed4fd..b1830e00 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.3.3</version>
+ <version>1.3.4-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>dependencies</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution:: dependencies</name>
diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index a51f3922..ac90401f 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-dgbuilder-docker</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: dgbuilder-docker</name>
diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index 55c233db..e44baf63 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-dgbuilder</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-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 723b088e..db2551e8 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.3.3</version>
+ <version>1.3.4-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odlsli-alpine</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: odlsli-alpine</name>
@@ -36,10 +36,10 @@
<ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features>
<odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
- <ccsdk.sli.core.version>0.5.2</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>0.5.2</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>0.5.2</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>0.5.2</ccsdk.sli.plugins.version>
+ <ccsdk.sli.core.version>0.5.3-SNAPSHOT</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>0.5.3-SNAPSHOT</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>0.5.3-SNAPSHOT</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>0.5.3-SNAPSHOT</ccsdk.sli.plugins.version>
</properties>
<dependencies>
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index 63da0daa..a28d0eae 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.3.3</version>
+ <version>1.3.4-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odlsli-ubuntu</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: odlsli-ubuntu</name>
@@ -36,10 +36,10 @@
<ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features>
<odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
- <ccsdk.sli.core.version>0.5.2</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>0.5.2</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>0.5.2</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>0.5.2</ccsdk.sli.plugins.version>
+ <ccsdk.sli.core.version>0.5.3-SNAPSHOT</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>0.5.3-SNAPSHOT</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>0.5.3-SNAPSHOT</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>0.5.3-SNAPSHOT</ccsdk.sli.plugins.version>
</properties>
<dependencies>
diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index 98986b01..d8f45af0 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-odlsli</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-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 ca2d2270..2622e258 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-fluorine-alpine</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-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 b3a1be76..2e17fdeb 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-fluorine-ubuntu</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-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 bae95c24..3b9afa6a 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-fluorine</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight</name>
diff --git a/opendaylight/neon/neon-alpine/pom.xml b/opendaylight/neon/neon-alpine/pom.xml
index 0213c3a9..2cb3f275 100644
--- a/opendaylight/neon/neon-alpine/pom.xml
+++ b/opendaylight/neon/neon-alpine/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odl-neon</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-neon-alpine</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
diff --git a/opendaylight/neon/pom.xml b/opendaylight/neon/pom.xml
index 6564b682..d677471e 100644
--- a/opendaylight/neon/pom.xml
+++ b/opendaylight/neon/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-opendaylight</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-neon</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: opendaylight</name>
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 6fe03144..120f6485 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-opendaylight</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-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 f92b6ad6..971af0c1 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-asdcapi</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-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 f49d1a57..240f2ea5 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-installer</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-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 b7ec28c3..14b93980 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-oofpcipocapi</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-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 0051aca3..1027b99d 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-platform-logic</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-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 d89e1f57..3a436e5d 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-restapi-templates</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-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 896120b6..c8d2ee2f 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-sliapi</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
diff --git a/pom.xml b/pom.xml
index a4dc0fc0..b8bf4cb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3</version>
+ <version>1.3.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution</name>
diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index 9310b1a2..d60aa64e 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>saltstack-server</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: saltstack-server</name>
diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index 55a05586..bdfea707 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.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
</parent>
<artifactId>distribution-ubuntu</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.5.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: ubuntu</name>
diff --git a/version.properties b/version.properties
index 6a35b903..7780343a 100644
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
release_name=0
sprint_number=5
-feature_revision=2
+feature_revision=3
base_version=${release_name}.${sprint_number}.${feature_revision}