summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2021-03-12 16:01:34 -0500
committerKAPIL SINGAL <ks220y@att.com>2021-03-15 17:51:19 +0000
commitc3e800149c947ecc9b76a2e3b990664fc5d41ce1 (patch)
tree42c2bdf980729d9a068ffe9b44dd425cf952c436
parent39a425769af091e8234fc05ebbe04628eeb1598f (diff)
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>
-rw-r--r--ms/sliboot/pom.xml25
1 files 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
@@ -133,6 +133,12 @@
</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>
<version>${ccsdk.sli.core.version}</version>
</dependency>
@@ -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>