From c3e800149c947ecc9b76a2e3b990664fc5d41ce1 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 12 Mar 2021 16:01:34 -0500
Subject: Update to allow ranges for ccsdk.sli.version

Update to allow ccsdk.sli.version to be passed with a range as a value

Change-Id: Ibb37082bf8162300ae2de37f33b0e4672b796293
Issue-ID: CCSDK-3209
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 ms/sliboot/pom.xml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index e272706d..cde828b7 100644
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -131,6 +131,12 @@
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sliapi-model-swagger</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>yaml</type>
+        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-provider</artifactId>
@@ -181,19 +187,13 @@
                         <id>get-sliapi-yaml</id>
                         <phase>initialize</phase>
                         <goals>
-                            <goal>copy</goal>
+                            <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.onap.ccsdk.sli.core</groupId>
-                                    <artifactId>sliapi-model-swagger</artifactId>
-                                    <version>${ccsdk.sli.core.version}</version>
-                                    <type>yaml</type>
-                                    <outputDirectory>${project.build.directory}/yaml</outputDirectory>
-                                    <destFileName>sliapi.yaml</destFileName>
-                                </artifactItem>
-                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/yaml</outputDirectory>
+                            <useRepositoryLayout>false</useRepositoryLayout>
+                            <includeTypes>yaml</includeTypes>
+                            <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
                     <execution>
@@ -204,6 +204,7 @@
                         <phase>prepare-package</phase>
                         <configuration>
                             <excludeTransitive>true</excludeTransitive>
+                            <excludeTypes>yaml</excludeTypes>
                             <outputDirectory>${project.build.directory}/docker-stage/opt/onap/ccsdk/lib</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
@@ -245,7 +246,7 @@
                         </goals>
                         <configuration>
                             <output>target/generated-sources</output>
-                            <inputSpec>${project.build.directory}/yaml/sliapi.yaml</inputSpec>
+                            <inputSpec>${project.build.directory}/yaml/sliapi-model-swagger.yaml</inputSpec>
                             <language>spring</language>
                             <apiPackage>org.onap.ccsdk.apps.ms.sliboot.swagger</apiPackage>
                             <modelPackage>org.onap.ccsdk.apps.ms.sliboot.swagger.model</modelPackage>
-- 
cgit 1.2.3-korg