From 5de81966f5574ae83e85aa7d5aa8865ea5deef24 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 26 Jan 2021 13:15:47 -0500
Subject: Revert "Limit use of odlparent poms"

This reverts commit 7de29bfea89ff53a446bea07d8f74d1aaa87045b,
due to issues encountered in the odlsli container in ccsdk/distribution.

Issue-ID: CCSDK-3001
Issue-ID: CCSDK-3099
Change-Id: I79252b74693895f483eb390c575bb244195fe7ed
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 core/pom.xml | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

(limited to 'core/pom.xml')

diff --git a/core/pom.xml b/core/pom.xml
index d74d84b8a..a80158872 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,13 +3,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.onap.ccsdk.sli</groupId>
-		<artifactId>sli-root</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<groupId>org.onap.ccsdk.parent</groupId>
+		<artifactId>odlparent-lite</artifactId>
+		<version>2.1.1-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.core</groupId>
-	<artifactId>core-root</artifactId>
+	<artifactId>ccsdk-sli-core</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
@@ -21,7 +22,7 @@
 	</organization>
 
 	<modules>
-		<module>utils</module>
+        <module>utils</module>
 		<module>dblib</module>
 		<module>sli</module>
 		<module>filters</module>
@@ -57,27 +58,27 @@
 				</property>
 			</activation>
 			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.blackducksoftware.integration</groupId>
-						<artifactId>hub-maven-plugin</artifactId>
-						<version>1.4.0</version>
-						<inherited>false</inherited>
-						<configuration>
-							<hubProjectName>${project.name}</hubProjectName>
-							<outputDirectory>${project.basedir}</outputDirectory>
-						</configuration>
-						<executions>
-							<execution>
-								<id>create-bdio-file</id>
-								<phase>package</phase>
-								<goals>
-									<goal>createHubOutput</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
+					<plugins>
+						<plugin>
+							<groupId>com.blackducksoftware.integration</groupId>
+							<artifactId>hub-maven-plugin</artifactId>
+							<version>1.4.0</version>
+							<inherited>false</inherited>
+							<configuration>
+								<hubProjectName>${project.name}</hubProjectName>
+								<outputDirectory>${project.basedir}</outputDirectory>
+							</configuration>
+							<executions>
+								<execution>
+									<id>create-bdio-file</id>
+									<phase>package</phase>
+									<goals>
+										<goal>createHubOutput</goal>
+									</goals>
+								</execution>
+							</executions>
+						</plugin>
+					</plugins>
 			</build>
 
 		</profile>
-- 
cgit 1.2.3-korg