ODL Chlorine changes

Update ccsdk/sli for OpenDaylight Chlorine release.

Issue-ID: CCSDK-3812
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I886292c4232e7028967f1518d9f0b09f2d0a6106

31 files changed, 48 insertions, 34 deletions

diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml
index d7b1a0508..255f6541f 100755
--- a/plugins/artifacts/pom.xml
+++ b/plugins/artifacts/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml
index fda13a67e..0c771bb49 100644
--- a/plugins/features/ccsdk-gr-toolkit/pom.xml
+++ b/plugins/features/ccsdk-gr-toolkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml
index 012a30d97..d18462023 100644
--- a/plugins/features/ccsdk-properties-node/pom.xml
+++ b/plugins/features/ccsdk-properties-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml
index 14bb01ff0..82b89ba1a 100644
--- a/plugins/features/ccsdk-restapi-call-node/pom.xml
+++ b/plugins/features/ccsdk-restapi-call-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml
index fdb355893..1fa8a25ff 100644
--- a/plugins/features/ccsdk-restconf-client/pom.xml
+++ b/plugins/features/ccsdk-restconf-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml
index a5bcf4ec0..fcd4781cf 100644
--- a/plugins/features/ccsdk-sli-plugins-all/pom.xml
+++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml
index 1a78510f4..43660028e 100644
--- a/plugins/features/ccsdk-sshapi-call-node/pom.xml
+++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-template-node/pom.xml b/plugins/features/ccsdk-template-node/pom.xml
index db46594c2..033069b59 100644
--- a/plugins/features/ccsdk-template-node/pom.xml
+++ b/plugins/features/ccsdk-template-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/features-sli-plugins/pom.xml b/plugins/features/features-sli-plugins/pom.xml
index 900873349..9278c0295 100644
--- a/plugins/features/features-sli-plugins/pom.xml
+++ b/plugins/features/features-sli-plugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml
index bc4d5afe6..73ff780fb 100755
--- a/plugins/features/installer/pom.xml
+++ b/plugins/features/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml
index 5cd95e7eb..7f7aa435a 100755
--- a/plugins/features/pom.xml
+++ b/plugins/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml
index 3d3ba0514..f06a639cd 100755
--- a/plugins/grToolkit/installer/pom.xml
+++ b/plugins/grToolkit/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml
index d9128e023..7f3f16198 100755
--- a/plugins/grToolkit/model/pom.xml
+++ b/plugins/grToolkit/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml
index c2b88fd33..983af7f8e 100755
--- a/plugins/grToolkit/pom.xml
+++ b/plugins/grToolkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml
index 3c7aed24c..b932b831e 100755
--- a/plugins/grToolkit/provider/pom.xml
+++ b/plugins/grToolkit/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/pom.xml b/plugins/pom.xml
index f62dc4396..315803c4b 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml
index bb96db935..4fd22b356 100755
--- a/plugins/properties-node/installer/pom.xml
+++ b/plugins/properties-node/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml
index 46be5a7ad..870ad03bc 100755
--- a/plugins/properties-node/pom.xml
+++ b/plugins/properties-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml
index 7d29c9dbb..f740de68d 100755
--- a/plugins/properties-node/provider/pom.xml
+++ b/plugins/properties-node/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml
index ae8560a77..6bf437b54 100755
--- a/plugins/restapi-call-node/installer/pom.xml
+++ b/plugins/restapi-call-node/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml
index d959caa81..4a0af7b60 100755
--- a/plugins/restapi-call-node/pom.xml
+++ b/plugins/restapi-call-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml
index ee1f421a5..bbfbfedd9 100755
--- a/plugins/restapi-call-node/provider/pom.xml
+++ b/plugins/restapi-call-node/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -72,6 +72,10 @@
             <artifactId>jersey-media-multipart</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-filter-base</artifactId>
         </dependency>
diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml
index d86e4dd03..33fe9a09c 100755
--- a/plugins/restconf-client/installer/pom.xml
+++ b/plugins/restconf-client/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml
index 20c525b32..13013e41d 100755
--- a/plugins/restconf-client/pom.xml
+++ b/plugins/restconf-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml
index 244fd5c8b..09e8f43fa 100755
--- a/plugins/restconf-client/provider/pom.xml
+++ b/plugins/restconf-client/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -15,6 +15,10 @@
 
     <name>ccsdk-sli-plugins :: ${project.artifactId}</name>
 
+    <properties>
+        <jaxb-api.version>2.3.3</jaxb-api.version>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -27,7 +31,7 @@
             <dependency>
                 <groupId>org.glassfish.jersey</groupId>
                 <artifactId>jersey-bom</artifactId>
-                <version>2.27</version>
+                <version>2.37</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -97,8 +101,8 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>restconf-nb-rfc8040</artifactId>
-            <scope>provided</scope>
+            <artifactId>restconf-nb</artifactId>
+            <version>4.0.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.xml</groupId>
@@ -116,6 +120,12 @@
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb-api.version}</version>
+        </dependency>
+
 
         <!-- For test -->
         <dependency>
diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml
index 5bcb6e574..350fdfe78 100755
--- a/plugins/sshapi-call-node/installer/pom.xml
+++ b/plugins/sshapi-call-node/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml
index d5e8d2bd4..1b7b577d5 100755
--- a/plugins/sshapi-call-node/pom.xml
+++ b/plugins/sshapi-call-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml
index 40dc90e12..c2335fb66 100755
--- a/plugins/sshapi-call-node/provider/pom.xml
+++ b/plugins/sshapi-call-node/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml
index 0b11810c6..0c30ca4d0 100644
--- a/plugins/template-node/installer/pom.xml
+++ b/plugins/template-node/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/template-node/pom.xml b/plugins/template-node/pom.xml
index 0a8e928f6..affa3db9a 100644
--- a/plugins/template-node/pom.xml
+++ b/plugins/template-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml
index 641590501..eb9c751af 100644
--- a/plugins/template-node/provider/pom.xml
+++ b/plugins/template-node/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>