Merge "Migrate sli to sulfur sr1"

62 files changed, 64 insertions, 63 deletions

diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml
index 2d05f3ab8..fd579dbbe 100755
--- a/adaptors/aai-service/installer/pom.xml
+++ b/adaptors/aai-service/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml
index 14039a833..8547e6382 100755
--- a/adaptors/aai-service/pom.xml
+++ b/adaptors/aai-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml
index 1bb7505b2..118abfbcf 100755
--- a/adaptors/aai-service/provider/pom.xml
+++ b/adaptors/aai-service/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
@@ -36,6 +36,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <version>3.12.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml b/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml
index bc79c58e3..b1b129a0c 100644
--- a/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml
+++ b/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml b/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml
index ae5eb9edf..6ef7cf650 100644
--- a/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml
+++ b/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/ansible-adaptor/pom.xml b/adaptors/ansible-adaptor/pom.xml
index c6c6b2b7d..3bee1d0f3 100644
--- a/adaptors/ansible-adaptor/pom.xml
+++ b/adaptors/ansible-adaptor/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml
index 1b21f1cf4..8c2a5f492 100755
--- a/adaptors/artifacts/pom.xml
+++ b/adaptors/artifacts/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/base/http/installer/pom.xml b/adaptors/base/http/installer/pom.xml
index 8c41718cf..efb6b4870 100644
--- a/adaptors/base/http/installer/pom.xml
+++ b/adaptors/base/http/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/base/http/pom.xml b/adaptors/base/http/pom.xml
index 9f3d710da..6e1bd2740 100644
--- a/adaptors/base/http/pom.xml
+++ b/adaptors/base/http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml
index 5b815d96c..57eb95aa2 100644
--- a/adaptors/base/http/provider/pom.xml
+++ b/adaptors/base/http/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml
index 94b358a34..2d032e452 100644
--- a/adaptors/base/pom.xml
+++ b/adaptors/base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml b/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml
index 4fa571e53..15169d1ab 100644
--- a/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml
+++ b/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml b/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml
index 096003be1..2bc20e26d 100644
--- a/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml
+++ b/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/chef-adaptor/pom.xml b/adaptors/chef-adaptor/pom.xml
index c511ab4a3..903d757d2 100644
--- a/adaptors/chef-adaptor/pom.xml
+++ b/adaptors/chef-adaptor/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml
index c68e69c5c..42f0f36ad 100644
--- a/adaptors/features/ccsdk-aai-service/pom.xml
+++ b/adaptors/features/ccsdk-aai-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-ansible-adaptor/pom.xml b/adaptors/features/ccsdk-ansible-adaptor/pom.xml
index e101575e2..8eaf3b336 100644
--- a/adaptors/features/ccsdk-ansible-adaptor/pom.xml
+++ b/adaptors/features/ccsdk-ansible-adaptor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-base-http/pom.xml b/adaptors/features/ccsdk-base-http/pom.xml
index 0910550ac..f06337a0f 100644
--- a/adaptors/features/ccsdk-base-http/pom.xml
+++ b/adaptors/features/ccsdk-base-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-chef-adaptor/pom.xml b/adaptors/features/ccsdk-chef-adaptor/pom.xml
index f2ffc4af9..42aba476b 100644
--- a/adaptors/features/ccsdk-chef-adaptor/pom.xml
+++ b/adaptors/features/ccsdk-chef-adaptor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-iaas-adaptor/pom.xml b/adaptors/features/ccsdk-iaas-adaptor/pom.xml
index cec7777e9..b721099b9 100644
--- a/adaptors/features/ccsdk-iaas-adaptor/pom.xml
+++ b/adaptors/features/ccsdk-iaas-adaptor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml
index 07e6caa06..3963a2dc9 100644
--- a/adaptors/features/ccsdk-mdsal-resource/pom.xml
+++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml
index edf903757..a1a0ea47c 100755
--- a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml
+++ b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
diff --git a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml
index c502b4131..c3e9f032b 100755
--- a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml
+++ b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
diff --git a/adaptors/features/ccsdk-netbox-client/pom.xml b/adaptors/features/ccsdk-netbox-client/pom.xml
index 06461a433..9f404e718 100644
--- a/adaptors/features/ccsdk-netbox-client/pom.xml
+++ b/adaptors/features/ccsdk-netbox-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-netconf-adaptor/pom.xml b/adaptors/features/ccsdk-netconf-adaptor/pom.xml
index 304d4bc6f..0bfc4ce4e 100644
--- a/adaptors/features/ccsdk-netconf-adaptor/pom.xml
+++ b/adaptors/features/ccsdk-netconf-adaptor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml
index a8ef7d0ce..fb253d9c7 100644
--- a/adaptors/features/ccsdk-resource-assignment/pom.xml
+++ b/adaptors/features/ccsdk-resource-assignment/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-rest-adaptor/pom.xml b/adaptors/features/ccsdk-rest-adaptor/pom.xml
index 416da908c..1a8d31bf0 100644
--- a/adaptors/features/ccsdk-rest-adaptor/pom.xml
+++ b/adaptors/features/ccsdk-rest-adaptor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-saltstack-adaptor/pom.xml b/adaptors/features/ccsdk-saltstack-adaptor/pom.xml
index 51db938b4..7b1067195 100644
--- a/adaptors/features/ccsdk-saltstack-adaptor/pom.xml
+++ b/adaptors/features/ccsdk-saltstack-adaptor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
index 286c8c2c0..448b4584b 100644
--- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
+++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-sql-resource/pom.xml b/adaptors/features/ccsdk-sql-resource/pom.xml
index ea2b8a137..4c5bfde44 100644
--- a/adaptors/features/ccsdk-sql-resource/pom.xml
+++ b/adaptors/features/ccsdk-sql-resource/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/ccsdk-ssh-adaptor/pom.xml b/adaptors/features/ccsdk-ssh-adaptor/pom.xml
index aa240b491..957510abc 100644
--- a/adaptors/features/ccsdk-ssh-adaptor/pom.xml
+++ b/adaptors/features/ccsdk-ssh-adaptor/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/features-sli-adaptors/pom.xml b/adaptors/features/features-sli-adaptors/pom.xml
index 23bb0cc6a..2f91f3a20 100644
--- a/adaptors/features/features-sli-adaptors/pom.xml
+++ b/adaptors/features/features-sli-adaptors/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/installer/pom.xml b/adaptors/features/installer/pom.xml
index 649432038..1a1cc822c 100755
--- a/adaptors/features/installer/pom.xml
+++ b/adaptors/features/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/features/pom.xml b/adaptors/features/pom.xml
index 2a4c2fee1..099a861f3 100755
--- a/adaptors/features/pom.xml
+++ b/adaptors/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml b/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml
index 6c25fb7bc..506343427 100644
--- a/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml
+++ b/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml b/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml
index 7eb74c720..cd8aa9638 100644
--- a/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml
+++ b/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/iaas-adaptor/pom.xml b/adaptors/iaas-adaptor/pom.xml
index 6ea37a083..941c6492c 100644
--- a/adaptors/iaas-adaptor/pom.xml
+++ b/adaptors/iaas-adaptor/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/mdsal-resource/installer/pom.xml b/adaptors/mdsal-resource/installer/pom.xml
index 57a612b9e..9c10cd117 100755
--- a/adaptors/mdsal-resource/installer/pom.xml
+++ b/adaptors/mdsal-resource/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/mdsal-resource/pom.xml b/adaptors/mdsal-resource/pom.xml
index 47867dad1..00c0f86e2 100755
--- a/adaptors/mdsal-resource/pom.xml
+++ b/adaptors/mdsal-resource/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/mdsal-resource/provider/pom.xml b/adaptors/mdsal-resource/provider/pom.xml
index 686f298f3..6a5d501fc 100755
--- a/adaptors/mdsal-resource/provider/pom.xml
+++ b/adaptors/mdsal-resource/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/message-router/pom.xml b/adaptors/message-router/pom.xml
index 52ba8427a..9a6cbaa7b 100755
--- a/adaptors/message-router/pom.xml
+++ b/adaptors/message-router/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/netbox-client/installer/pom.xml b/adaptors/netbox-client/installer/pom.xml
index f2d5f425a..9ac2f4ebb 100755
--- a/adaptors/netbox-client/installer/pom.xml
+++ b/adaptors/netbox-client/installer/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml
index 8bc70e7fb..09caca16b 100644
--- a/adaptors/netbox-client/pom.xml
+++ b/adaptors/netbox-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml
index 984fa6a85..dddb2faa7 100644
--- a/adaptors/netbox-client/provider/pom.xml
+++ b/adaptors/netbox-client/provider/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml
index c2a8fbca7..611831654 100644
--- a/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml
+++ b/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml
index 543185493..7c47b8dcb 100644
--- a/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml
+++ b/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/netconf-adaptor/pom.xml b/adaptors/netconf-adaptor/pom.xml
index 47dd907e8..c9734e865 100644
--- a/adaptors/netconf-adaptor/pom.xml
+++ b/adaptors/netconf-adaptor/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/pom.xml b/adaptors/pom.xml
index 75fbeb034..256ad1717 100755
--- a/adaptors/pom.xml
+++ b/adaptors/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
diff --git a/adaptors/resource-assignment/installer/pom.xml b/adaptors/resource-assignment/installer/pom.xml
index b7893d06d..2bba624e2 100755
--- a/adaptors/resource-assignment/installer/pom.xml
+++ b/adaptors/resource-assignment/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/resource-assignment/pom.xml b/adaptors/resource-assignment/pom.xml
index d6e87e81c..5d4788a84 100755
--- a/adaptors/resource-assignment/pom.xml
+++ b/adaptors/resource-assignment/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/resource-assignment/provider/pom.xml b/adaptors/resource-assignment/provider/pom.xml
index 5ec3993bf..04a5a175b 100755
--- a/adaptors/resource-assignment/provider/pom.xml
+++ b/adaptors/resource-assignment/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/rest-adaptor/pom.xml b/adaptors/rest-adaptor/pom.xml
index 7cb0f30ee..f7575fce5 100644
--- a/adaptors/rest-adaptor/pom.xml
+++ b/adaptors/rest-adaptor/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml b/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml
index 534a418f2..d1327fae1 100644
--- a/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml
+++ b/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml b/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml
index 7ff665916..96564c7a7 100644
--- a/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml
+++ b/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/saltstack-adaptor/pom.xml b/adaptors/saltstack-adaptor/pom.xml
index 1c40935d1..5c880a2c5 100644
--- a/adaptors/saltstack-adaptor/pom.xml
+++ b/adaptors/saltstack-adaptor/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml b/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml
index 51b6ab8d5..b0e570021 100644
--- a/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml
+++ b/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml b/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml
index 698edab1f..f9cdf3919 100644
--- a/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml
+++ b/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/sql-resource/installer/pom.xml b/adaptors/sql-resource/installer/pom.xml
index ce5d17e3b..a0faefca9 100755
--- a/adaptors/sql-resource/installer/pom.xml
+++ b/adaptors/sql-resource/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/sql-resource/pom.xml b/adaptors/sql-resource/pom.xml
index e425019fc..85c07d8b9 100755
--- a/adaptors/sql-resource/pom.xml
+++ b/adaptors/sql-resource/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml
index d1cdac488..2a3b8a17d 100755
--- a/adaptors/sql-resource/provider/pom.xml
+++ b/adaptors/sql-resource/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/ssh-adaptor/pom.xml b/adaptors/ssh-adaptor/pom.xml
index d951ea9d9..74cde3c48 100644
--- a/adaptors/ssh-adaptor/pom.xml
+++ b/adaptors/ssh-adaptor/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml
index f32fc823c..2be4adca2 100644
--- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml
+++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java
index fecb42fc2..038a6aaf4 100644
--- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java
+++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java
@@ -32,11 +32,11 @@ import java.net.BindException;
 import java.nio.file.Paths;
 import java.util.Collections;
 import org.apache.sshd.common.util.OsUtils;
+import org.apache.sshd.scp.server.ScpCommandFactory;
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.ServerFactoryManager;
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
-import org.apache.sshd.server.scp.ScpCommandFactory;
-import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
+import org.apache.sshd.sftp.server.SftpSubsystemFactory;
 import org.hamcrest.CoreMatchers;
 import org.junit.After;
 import org.junit.Assert;