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>
(cherry picked from commit
c3e800149c947ecc9b76a2e3b990664fc5d41ce1)
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
<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>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sliPluginUtils-provider</artifactId>
<id>get-sliapi-yaml</id>
<phase>initialize</phase>
<goals>
<id>get-sliapi-yaml</id>
<phase>initialize</phase>
<goals>
+ <goal>copy-dependencies</goal>
- <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>
</configuration>
</execution>
<execution>
<phase>prepare-package</phase>
<configuration>
<excludeTransitive>true</excludeTransitive>
<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>
<outputDirectory>${project.build.directory}/docker-stage/opt/onap/ccsdk/lib</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</goals>
<configuration>
<output>target/generated-sources</output>
</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>
<language>spring</language>
<apiPackage>org.onap.ccsdk.apps.ms.sliboot.swagger</apiPackage>
<modelPackage>org.onap.ccsdk.apps.ms.sliboot.swagger.model</modelPackage>