summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-04-27 14:58:54 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-27 14:58:54 +0000
commit8ca210b4162f01d160171607cf27d6fe059db73e (patch)
tree1035368679489d2b1529410ba5bc19a05ccb6df9
parent7047ebfdadbaff197bb1aa976cd1b331cd77e614 (diff)
parent0fa4ccfa20b2a4971b5d1d34339ae9191060eba9 (diff)
Merge "Roll to next snapshot version" into frankfurt
-rw-r--r--dependencies-bom/pom.xml2
-rw-r--r--dependencies-odl-bom/pom.xml2
-rw-r--r--odlparent/binding-parent/pom.xml4
-rw-r--r--odlparent/bundle-parent/pom.xml4
-rw-r--r--odlparent/client-parent/pom.xml2
-rw-r--r--odlparent/feature-repo-parent/pom.xml4
-rw-r--r--odlparent/karaf4-parent/pom.xml4
-rw-r--r--odlparent/mdsal-it-parent/pom.xml4
-rw-r--r--odlparent/odlparent-lite/pom.xml4
-rw-r--r--odlparent/odlparent/pom.xml4
-rwxr-xr-xodlparent/pom.xml4
-rwxr-xr-xodlparent/setup/pom.xml4
-rw-r--r--odlparent/single-feature-parent/pom.xml4
-rwxr-xr-xpom.xml2
-rwxr-xr-xspringboot/pom.xml4
-rw-r--r--springboot/spring-boot-setup/pom.xml4
-rw-r--r--springboot/springboot1/pom.xml4
-rw-r--r--springboot/springboot2/pom.xml4
-rwxr-xr-xstandalone/pom.xml2
-rw-r--r--version.properties2
20 files changed, 34 insertions, 34 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 4887c72e..e17268f1 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<distributionManagement>
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 9ddefdfd..359f3533 100644
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<distributionManagement>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 2ba7c8d9..b13b22b4 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -191,7 +191,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 796c5434..7c7f6d58 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -191,7 +191,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index 7261e76d..833fafd3 100644
--- a/odlparent/client-parent/pom.xml
+++ b/odlparent/client-parent/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>client-parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index cfba5c72..8bf6026c 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -191,7 +191,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 7b8cdd63..4e37e2ae 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -191,7 +191,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 17bbba4d..966e6f1e 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>mdsal-it-parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -191,7 +191,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 6c13cab1..08fa4b3d 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -191,7 +191,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 55eadb37..447901e7 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -191,7 +191,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 3194f989..65f259b1 100755
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-aggregator</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml
index 2c14e29c..d8b7bce6 100755
--- a/odlparent/setup/pom.xml
+++ b/odlparent/setup/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-aggregator</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>setup</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 4208cf4b..69cfd995 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -191,7 +191,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index cfce9d37..2ccc4e44 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
diff --git a/springboot/pom.xml b/springboot/pom.xml
index ce54573c..23a758df 100755
--- a/springboot/pom.xml
+++ b/springboot/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>springboot-aggregator</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml
index b2375cef..402e05bd 100644
--- a/springboot/spring-boot-setup/pom.xml
+++ b/springboot/spring-boot-setup/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>springboot-aggregator</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-setup</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 1522522c..1a3ee9c2 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-1-starter-parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -143,7 +143,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index f2c55644..862336d6 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -143,7 +143,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 585d5b2b..d092d14a 100755
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>standalone-parent</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
diff --git a/version.properties b/version.properties
index fe1dbc40..8c9f6cb9 100644
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
release_name=1
sprint_number=5
-feature_revision=3
+feature_revision=4
base_version=${release_name}.${sprint_number}.${feature_revision}