Update to allow ranges for ccsdk.sli.version

[ccsdk/apps.git] / ms / sliboot / pom.xml

diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index 5d95969..cde828b 100644 (file)
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>sliboot</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ccsdk-apps :: sliboot :: ${project.artifactId}</name>
@@ -20,8 +20,8 @@
         <start-class>org.onap.ccsdk.apps.ms.sliboot.SlibootApp</start-class>
         <shiro.version>1.5.0</shiro.version>
         <aaf-shiro-bundle.version>2.1.13</aaf-shiro-bundle.version>
-        <base.image.name>onap/ccsdk-alpine-image</base.image.name>
-        <base.image.version>1.1-STAGING-latest</base.image.version>
+        <base.image.name>onap/ccsdk-alpine-j11-image</base.image.name>
+        <base.image.version>1.1.1</base.image.version>
         <image.name>onap/ccsdk-sliboot-alpine-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <ccsdk.distribution.version>1.1.0</ccsdk.distribution.version>
@@ -31,6 +31,8 @@
         <docker.push.phase>deploy</docker.push.phase>
         <docker.verbose>true</docker.verbose>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
+        <java.home>/opt/java/openjdk</java.home>
+        <java.security.dir>${java.home}/lib/security</java.security.dir>
     </properties>
 
     <dependencies>
@@ -129,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>
@@ -179,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>
@@ -202,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>
@@ -243,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>