From bc18e2c019f4b16752ae25fa50b436e7cd65c8e8 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Fri, 13 Dec 2019 12:42:39 -0500
Subject: Refactor features to separate installer

Refactor karaf feature.xml files to separate installer

Change-Id: I4dc4ad3c139522b12f41f1786ef16bfdd556f2b9
Issue-ID: CCSDK-1754
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 features/ccsdk-saltstack-adapter/pom.xml | 39 ++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 features/ccsdk-saltstack-adapter/pom.xml

(limited to 'features/ccsdk-saltstack-adapter')

diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
new file mode 100644
index 000000000..fc0598ecd
--- /dev/null
+++ b/features/ccsdk-saltstack-adapter/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+    <artifactId>ccsdk-saltstack-adapter</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId}</name>
+
+    <properties>
+        <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>ccsdk-sli</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>saltstack-adapter-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
-- 
cgit 


From 4de5e6cbb62b3588a916f7696e7a9ecc73061782 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Thu, 23 Jan 2020 14:40:14 -0500
Subject: Use released parent pom

Use released version of ccsdk/parent poms

Change-Id: Ifa7059c687e09de9977b94d92fbf1869d510b00d
Issue-ID: CCSDK-1963
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 features/ccsdk-saltstack-adapter/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'features/ccsdk-saltstack-adapter')

diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
index fc0598ecd..215931f5f 100644
--- a/features/ccsdk-saltstack-adapter/pom.xml
+++ b/features/ccsdk-saltstack-adapter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.1</version>
         <relativePath/>
     </parent>
 
-- 
cgit 


From 6b1ac1200e74ff91e74df595c8e2a025b1bcd842 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 24 Jan 2020 16:03:21 -0500
Subject: Roll versions to next snapshot

Roll CCSDK to next snapshot version

Change-Id: Ib08be10d412384fcf791805c0101cfdb6375c178
Issue-ID: CCSDK-1963
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 features/ccsdk-saltstack-adapter/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'features/ccsdk-saltstack-adapter')

diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
index 215931f5f..a547e2eb0 100644
--- a/features/ccsdk-saltstack-adapter/pom.xml
+++ b/features/ccsdk-saltstack-adapter/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
     <artifactId>ccsdk-saltstack-adapter</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.7.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId}</name>
-- 
cgit 


From d95c9b66abae3570cd9d0bf86e9fc0d348e2ef1e Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 3 Mar 2020 12:23:18 -0500
Subject: Use released 1.5.2 CCSDK parent

Update to use released version of CCSDK parent pom

Change-Id: I24f981aaaca40909690d8118f7c0cdb8faa57d3a
Issue-ID: CCSDK-2152
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 features/ccsdk-saltstack-adapter/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'features/ccsdk-saltstack-adapter')

diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
index a547e2eb0..1c4014096 100644
--- a/features/ccsdk-saltstack-adapter/pom.xml
+++ b/features/ccsdk-saltstack-adapter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 
-- 
cgit 


From a612cdd3fbed35c4d5b454c6f0329fa6ecec22e1 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Thu, 5 Mar 2020 11:51:01 -0500
Subject: Roll master to Guilin

Roll versions of master for early Guilin development

Change-Id: Id725abd9ecb3c67b2687e15286cb2f2bcd50be1a
Issue-ID: CCSDK-2152
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 features/ccsdk-saltstack-adapter/pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'features/ccsdk-saltstack-adapter')

diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
index 1c4014096..ffc43e152 100644
--- a/features/ccsdk-saltstack-adapter/pom.xml
+++ b/features/ccsdk-saltstack-adapter/pom.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
     <artifactId>ccsdk-saltstack-adapter</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId}</name>
@@ -35,5 +35,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-
 </project>
-- 
cgit 


From 6fb8dfad11c84c0833e842183ec43a4ee95e81de Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 14 Jul 2020 08:55:33 -0400
Subject: Update adaptors to sodium

Update sli/adaptors to OpenDaylight Sodium release.  2 changes were
needed:

- mdsal-resource : needed to add unimplemented abstract methods in
inner anonymous BundleContext class in test case.
- resource-assignment: needed to correct unit test problems that were
ignored in earlier versions of h2

Change-Id: Ice63bfce64768e46c4376db55e3e9e97d0b934ad
Issue-ID: CCSDK-2551
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 features/ccsdk-saltstack-adapter/pom.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'features/ccsdk-saltstack-adapter')

diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
index ffc43e152..2e51c83be 100644
--- a/features/ccsdk-saltstack-adapter/pom.xml
+++ b/features/ccsdk-saltstack-adapter/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -33,6 +34,13 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>saltstack-adapter-provider</artifactId>
             <version>${project.version}</version>
+
+            <exclusions>
+                <exclusion>
+                    <artifactId>powermock-api-mockito</artifactId>
+                    <groupId>org.powermock</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>
-- 
cgit 


From 8bc3696b7c7c56671b2e9e09e6afbf0a57254421 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Thu, 6 Aug 2020 15:17:17 -0400
Subject: Roll to next snapshot

Roll to snapshot version 1.0.1-SNAPSHOT

Change-Id: Ie09ba5c2bedcd8cddf3e8cca0eff8e05c2ad268a
Issue-ID: CCSDK-2635
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 features/ccsdk-saltstack-adapter/pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'features/ccsdk-saltstack-adapter')

diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
index 2e51c83be..07e62c576 100644
--- a/features/ccsdk-saltstack-adapter/pom.xml
+++ b/features/ccsdk-saltstack-adapter/pom.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
     <artifactId>ccsdk-saltstack-adapter</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId}</name>
-- 
cgit 


From 3a489bb37be36b72bc584c530f2c514032e12b8c Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 9 Sep 2020 17:32:42 -0400
Subject: Roll to initial Honolulu release version

Roll master branch to initial Honolulu release version

Change-Id: Id7829542cb5981c11b38367952e6bc29ffa4cfe8
Issue-ID: CCSDK-2742
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 features/ccsdk-saltstack-adapter/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'features/ccsdk-saltstack-adapter')

diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
index 07e62c576..c7fbefbd6 100644
--- a/features/ccsdk-saltstack-adapter/pom.xml
+++ b/features/ccsdk-saltstack-adapter/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
     <artifactId>ccsdk-saltstack-adapter</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId}</name>
-- 
cgit 


From 2173e3e37bbb7648b97bcdfa734508686f176727 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 25 Nov 2020 14:51:48 -0500
Subject: Release version 1.1.0 of sli/adaptors

Release initial Honolulu version of sli/adaptors and roll
version to next snapshot

Change-Id: I3a59f29d7819e8d777dd02aede9a263ea0be8e36
Issue-ID: CCSDK-3002
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 features/ccsdk-saltstack-adapter/pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'features/ccsdk-saltstack-adapter')

diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml
index c7fbefbd6..3ac7fcf14 100644
--- a/features/ccsdk-saltstack-adapter/pom.xml
+++ b/features/ccsdk-saltstack-adapter/pom.xml
@@ -5,19 +5,18 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
     <artifactId>ccsdk-saltstack-adapter</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId}</name>
 
     <properties>
-        <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
     </properties>
 
-- 
cgit