From 7de29bfea89ff53a446bea07d8f74d1aaa87045b Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 25 Nov 2020 08:29:23 -0500
Subject: Limit use of odlparent poms

Updated pom.xmls to use standard maven project structure (i.e. parent
of pom is pom in directory above), and updated top level pom to
use org.ccsdk.parent:oparent as parent - EXCEPT in cases where
module has true OpenDaylight dependencies and therefore needs
to use ODL parent pom.

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

(limited to 'core/pom.xml')

diff --git a/core/pom.xml b/core/pom.xml
index d53f5a8bc..d74d84b8a 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,14 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
-		<relativePath/>
+		<groupId>org.onap.ccsdk.sli</groupId>
+		<artifactId>sli-root</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.core</groupId>
-	<artifactId>ccsdk-sli-core</artifactId>
+	<artifactId>core-root</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
@@ -22,7 +21,7 @@
 	</organization>
 
 	<modules>
-        <module>utils</module>
+		<module>utils</module>
 		<module>dblib</module>
 		<module>sli</module>
 		<module>filters</module>
@@ -58,27 +57,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