From cfe678d453a4c9d442b6d54a00a75c21d581fc22 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 27 Apr 2020 09:55:15 -0400
Subject: Use RC1 version of parent poms

Update to use RC1 version of parent poms and declared
bgp dependency as optional.

Change-Id: I3c4312e3d4be5b44eb85effa5176e3a014664591
Issue-ID: CCSDK-2344
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 artifacts/pom.xml                     | 2 +-
 dblib/installer/pom.xml               | 2 +-
 dblib/pom.xml                         | 2 +-
 dblib/provider/pom.xml                | 2 +-
 features/ccsdk-dblib/pom.xml          | 2 +-
 features/ccsdk-filters/pom.xml        | 2 +-
 features/ccsdk-sli-core-all/pom.xml   | 2 +-
 features/ccsdk-sli/pom.xml            | 2 +-
 features/ccsdk-sliPluginUtils/pom.xml | 2 +-
 features/ccsdk-sliapi/pom.xml         | 2 +-
 features/ccsdk-slicore-utils/pom.xml  | 2 +-
 features/features-sli-core/pom.xml    | 2 +-
 features/installer/pom.xml            | 2 +-
 features/pom.xml                      | 2 +-
 filters/installer/pom.xml             | 2 +-
 filters/pom.xml                       | 2 +-
 filters/provider/pom.xml              | 2 +-
 pom.xml                               | 2 +-
 sli/common/pom.xml                    | 2 +-
 sli/installer/pom.xml                 | 2 +-
 sli/model/pom.xml                     | 2 +-
 sli/pom.xml                           | 2 +-
 sli/provider-base/pom.xml             | 2 +-
 sli/provider/pom.xml                  | 3 ++-
 sliPluginUtils/installer/pom.xml      | 2 +-
 sliPluginUtils/pom.xml                | 2 +-
 sliPluginUtils/provider/pom.xml       | 2 +-
 sliapi/installer/pom.xml              | 2 +-
 sliapi/model/pom.xml                  | 2 +-
 sliapi/pom.xml                        | 2 +-
 sliapi/provider/pom.xml               | 2 +-
 sliapi/springboot/pom.xml             | 2 +-
 utils/installer/pom.xml               | 2 +-
 utils/pom.xml                         | 2 +-
 utils/provider/pom.xml                | 2 +-
 35 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 18d9caa9..98fdc4fd 100755
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 	</parent>
 
 	<dependencyManagement>
diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml
index fb296924..21f54b5c 100755
--- a/dblib/installer/pom.xml
+++ b/dblib/installer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/dblib/pom.xml b/dblib/pom.xml
index 6d0558d4..98c3069f 100755
--- a/dblib/pom.xml
+++ b/dblib/pom.xml
@@ -5,7 +5,7 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml
index 72809d7e..be74c9e7 100755
--- a/dblib/provider/pom.xml
+++ b/dblib/provider/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/features/ccsdk-dblib/pom.xml b/features/ccsdk-dblib/pom.xml
index ca022558..a12956e0 100644
--- a/features/ccsdk-dblib/pom.xml
+++ b/features/ccsdk-dblib/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/features/ccsdk-filters/pom.xml b/features/ccsdk-filters/pom.xml
index 1b1f1cf0..3ad01432 100644
--- a/features/ccsdk-filters/pom.xml
+++ b/features/ccsdk-filters/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/features/ccsdk-sli-core-all/pom.xml b/features/ccsdk-sli-core-all/pom.xml
index 8e60b7c1..76365096 100644
--- a/features/ccsdk-sli-core-all/pom.xml
+++ b/features/ccsdk-sli-core-all/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/features/ccsdk-sli/pom.xml b/features/ccsdk-sli/pom.xml
index 80c1e3d3..9fed8c26 100644
--- a/features/ccsdk-sli/pom.xml
+++ b/features/ccsdk-sli/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/features/ccsdk-sliPluginUtils/pom.xml b/features/ccsdk-sliPluginUtils/pom.xml
index 40f6e923..e1e3b1ae 100644
--- a/features/ccsdk-sliPluginUtils/pom.xml
+++ b/features/ccsdk-sliPluginUtils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/ccsdk-sliapi/pom.xml b/features/ccsdk-sliapi/pom.xml
index b5a4ea4b..3a0e514c 100644
--- a/features/ccsdk-sliapi/pom.xml
+++ b/features/ccsdk-sliapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/ccsdk-slicore-utils/pom.xml b/features/ccsdk-slicore-utils/pom.xml
index 4ee03b60..c92ec130 100644
--- a/features/ccsdk-slicore-utils/pom.xml
+++ b/features/ccsdk-slicore-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/features-sli-core/pom.xml b/features/features-sli-core/pom.xml
index 94c2d024..441a27c4 100644
--- a/features/features-sli-core/pom.xml
+++ b/features/features-sli-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index d17d13fd..b078e80c 100755
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index 78cfc0d1..ec9b45fd 100755
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml
index d11bcdaf..72cd1232 100755
--- a/filters/installer/pom.xml
+++ b/filters/installer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/filters/pom.xml b/filters/pom.xml
index b0ad6638..bf739135 100644
--- a/filters/pom.xml
+++ b/filters/pom.xml
@@ -5,7 +5,7 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml
index ac3f9d67..8d3a1c32 100755
--- a/filters/provider/pom.xml
+++ b/filters/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 19ddfd35..d1b939bc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index e469919d..ff4edffd 100755
--- a/sli/common/pom.xml
+++ b/sli/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
index a8725800..e16dd224 100755
--- a/sli/installer/pom.xml
+++ b/sli/installer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sli/model/pom.xml b/sli/model/pom.xml
index e873124d..5fe4310d 100755
--- a/sli/model/pom.xml
+++ b/sli/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/sli/pom.xml b/sli/pom.xml
index 5caab4a0..f7eeb904 100755
--- a/sli/pom.xml
+++ b/sli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/sli/provider-base/pom.xml b/sli/provider-base/pom.xml
index d461a123..31baa167 100644
--- a/sli/provider-base/pom.xml
+++ b/sli/provider-base/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml
index 1d599266..bb92e928 100755
--- a/sli/provider/pom.xml
+++ b/sli/provider/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
@@ -81,6 +81,7 @@
 			<artifactId>bgp-concepts</artifactId>
 			<version>0.11.1</version>
 			<scope>provided</scope>
+			<optional>true</optional>
 		</dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml
index f4e0afdb..a3a05b48 100755
--- a/sliPluginUtils/installer/pom.xml
+++ b/sliPluginUtils/installer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml
index f79980b2..d4f014e9 100755
--- a/sliPluginUtils/pom.xml
+++ b/sliPluginUtils/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml
index fad3a35c..6e654ec9 100755
--- a/sliPluginUtils/provider/pom.xml
+++ b/sliPluginUtils/provider/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml
index f052a45d..f6c66faa 100755
--- a/sliapi/installer/pom.xml
+++ b/sliapi/installer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml
index 24c33b7a..28807804 100755
--- a/sliapi/model/pom.xml
+++ b/sliapi/model/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sliapi/pom.xml b/sliapi/pom.xml
index 2d57fce8..5bfd220a 100755
--- a/sliapi/pom.xml
+++ b/sliapi/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml
index d5b7a180..75953a03 100755
--- a/sliapi/provider/pom.xml
+++ b/sliapi/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/sliapi/springboot/pom.xml b/sliapi/springboot/pom.xml
index 1c074a58..14d875c0 100644
--- a/sliapi/springboot/pom.xml
+++ b/sliapi/springboot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml
index 8455656f..96a69dee 100755
--- a/utils/installer/pom.xml
+++ b/utils/installer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.5.4</version>
 		<relativePath/>
 	</parent>
 
diff --git a/utils/pom.xml b/utils/pom.xml
index 632f4280..c7905877 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -5,7 +5,7 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml
index f631e9ea..8f5bbcb0 100644
--- a/utils/provider/pom.xml
+++ b/utils/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.3-SNAPSHOT</version>
+        <version>1.5.4</version>
         <relativePath/>
     </parent>
 
-- 
cgit 1.2.3-korg