From a0f9f9bf12b06c894b980d4438ddae4cf5a4abd2 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 3 Mar 2020 10:56:20 -0500
Subject: Use released 1.5.2 CCSDK parent

Update to use released version of CCSDK parent pom

Change-Id: I573d5c30a799c1bf828b195aa0dff1b85c9a44ad
Issue-ID: CCSDK-2152
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 sliapi/installer/pom.xml  |   2 +-
 sliapi/model/pom.xml      |   2 +-
 sliapi/pom.xml            |   2 +-
 sliapi/provider/pom.xml   |   2 +-
 sliapi/springboot/pom.xml | 194 ++++++++++++++++++++++++----------------------
 5 files changed, 107 insertions(+), 95 deletions(-)

(limited to 'sliapi')

diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml
index 2f363ef5..304e0358 100755
--- a/sliapi/installer/pom.xml
+++ b/sliapi/installer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.2-SNAPSHOT</version>
+		<version>1.5.2</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml
index f25714bf..fee78a6f 100755
--- a/sliapi/model/pom.xml
+++ b/sliapi/model/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.5.2-SNAPSHOT</version>
+		<version>1.5.2</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sliapi/pom.xml b/sliapi/pom.xml
index c8bc164c..58589305 100755
--- a/sliapi/pom.xml
+++ b/sliapi/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.2-SNAPSHOT</version>
+		<version>1.5.2</version>
 		<relativePath/>
 	</parent>
 
diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml
index 5b277964..0ad2ce75 100755
--- a/sliapi/provider/pom.xml
+++ b/sliapi/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath/>
     </parent>
 
diff --git a/sliapi/springboot/pom.xml b/sliapi/springboot/pom.xml
index e3cca4bd..602c20af 100644
--- a/sliapi/springboot/pom.xml
+++ b/sliapi/springboot/pom.xml
@@ -1,18 +1,18 @@
 <?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">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.2-SNAPSHOT</version>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.2</version>
         <relativePath/>
-	</parent>
+    </parent>
 
-	<groupId>org.onap.ccsdk.sli.core</groupId>
-	<artifactId>sliapi-springboot</artifactId>
-	<version>0.7.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>sliapi-springboot</artifactId>
+    <version>0.7.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
 
@@ -20,96 +20,108 @@
           <start-class>org.onap.ccsdk.sli.core.sliapi.springboot.App</start-class>
     </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-annotations</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-			<version>2.9.2</version>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
-			<version>2.9.2</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>sli-provider-base</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<scope>runtime</scope>
-		</dependency>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <!-- Need to explicitly declare indirect sli-core dependencies -->
+        <!-- to force version to be same as $project.version -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>dblib-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sli-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sli-provider-base</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-	</dependencies>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>io.swagger</groupId>
-				<artifactId>swagger-codegen-maven-plugin</artifactId>
-				<version>2.3.1</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<output>target/generated-sources</output>
-							<inputSpec>${project.basedir}/../model/src/main/resources/sli-api.20161110.yaml</inputSpec>
-							<language>spring</language>
-							<apiPackage>org.onap.ccsdk.sli.core.sliapi.springboot.controllers.swagger</apiPackage>
-							<modelPackage>org.onap.ccsdk.sli.core.sliapi.model</modelPackage>
-							<invokerPackage>org.onap.ccsdk.sli.core.sliapi.springboot.controllers.swagger</invokerPackage>
-							<generateApis>true</generateApis>
-							<generateApiTests>true</generateApiTests>
-							<ignoreFileOverride>${project.basedir}/.swagger-codegen-ignore</ignoreFileOverride>
-							<withXml>true</withXml>
-							<configOptions>
-								<java8>true</java8>
-								<springBootVersion>2.2.4-RELEASE</springBootVersion>
-							</configOptions>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-  		<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-codegen-maven-plugin</artifactId>
+                <version>2.3.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <output>target/generated-sources</output>
+                            <inputSpec>${project.basedir}/../model/src/main/resources/sli-api.20161110.yaml</inputSpec>
+                            <language>spring</language>
+                            <apiPackage>org.onap.ccsdk.sli.core.sliapi.springboot.controllers.swagger</apiPackage>
+                            <modelPackage>org.onap.ccsdk.sli.core.sliapi.model</modelPackage>
+                            <invokerPackage>org.onap.ccsdk.sli.core.sliapi.springboot.controllers.swagger</invokerPackage>
+                            <generateApis>true</generateApis>
+                            <generateApiTests>true</generateApiTests>
+                            <ignoreFileOverride>${project.basedir}/.swagger-codegen-ignore</ignoreFileOverride>
+                            <withXml>true</withXml>
+                            <configOptions>
+                                <java8>true</java8>
+                                <springBootVersion>2.2.4-RELEASE</springBootVersion>
+                            </configOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+          <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
-- 
cgit 1.2.3-korg