From 131cb46f6109a6099a445cb8e1b12ff5b68ae6de Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Thu, 1 Feb 2018 16:57:00 -0500
Subject: Upgrade sli/core to Nitrogen

Use Apache derby for dblib SingleFeatureTest

Change-Id: I6b41f7ede1a98b33824fceea9100e75c1ce8dda4
Issue-ID: CCSDK-175
Signed-off-by: Dan Timoney <dtimoney@att.com>

Generalization of CCSDK core/utils framework

Changes made:
* Created generalized version of core/utils/dblib as core/utils/common
* Deprecated core/utils/dblib package

Change-Id: I0992c43910278fbe254674d1e39d7e4fcad0a592
Issue-ID: CCSDK-168
Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>

Use Apache derby for dblib test

Use Apache derby for dblib SingleFeatureTest

Change-Id: Ie497557f162e203fa5c5c82c17ddc55ba0c11b38
Issue-ID: CCSDK-175
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 pom.xml | 92 +++++++++++++++++------------------------------------------------
 1 file changed, 23 insertions(+), 69 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index c7885a9b..7ab4d463 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,34 @@
 <?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/maven-v4_0_0.xsd">
-
+<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>
-	<packaging>pom</packaging>
+
+	<parent>
+		<groupId>org.onap.ccsdk.parent</groupId>
+		<artifactId>odlparent-lite</artifactId>
+		<version>1.0.1-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
 	<groupId>org.onap.ccsdk.sli.core</groupId>
 	<artifactId>ccsdk-sli-core</artifactId>
+	<version>0.2.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<name>ccsdk-sli-core</name>
-	<url>https://wiki.onap.org</url>
 	<description>CCSDK core components contains the SLI, dblib</description>
+	<url>https://wiki.onap.org</url>
+	<organization>
+		<name>ONAP</name>
+	</organization>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-carbon-sr1</artifactId>
-		<version>0.2.0-SNAPSHOT</version>
-	</parent>
+	<modules>
+        <module>utils</module>
+		<module>dblib</module>
+		<module>sli</module>
+		<module>filters</module>
+		<module>sliPluginUtils</module>
+		<module>sliapi</module>
+	</modules>
 
 	<scm>
 		<connection>scm:git:ssh://git@${onap.git.host}/sdnc-code.git</connection>
@@ -24,25 +38,6 @@
 	</scm>
 
 
-<!--
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>onap-repository-releases</name>
-			<url>${onap.nexus.release-url}</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>onap-repository-snapshots</name>
-			<url>${onap.nexus.snapshot-url}</url>
-		</snapshotRepository>
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:https://${onap.nexus.host}/content/sites/site/org/onap/sdnc/core/${project.artifactId}/${project.version}</url>
-		</site>
-	</distributionManagement>
--->
-
 	<profiles>
 		<profile>
 			<id>blackduck</id>
@@ -81,45 +76,4 @@
 		</profile>
 
 	</profiles>
-
-	<build>
-		<plugins>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.17</version>
-				<configuration>
-					<skipTests>false</skipTests>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<nexusUrl>https://${onap.nexus.host}</nexusUrl>
-					<stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
-					<serverId>${onap.nexus.staging.server-id}</serverId>
-				</configuration>
-			</plugin>
-
-		</plugins>
-
-	</build>
-	<modules>
-        <module>utils</module>
-		<module>dblib</module>
-		<module>sli</module>
-		<module>filters</module>
-		<module>sliPluginUtils</module>
-		<module>sliapi</module>
-	</modules>
-	<organization>
-		<name>ONAP</name>
-	</organization>
-	<version>0.2.0-SNAPSHOT</version>
-
-
 </project>
-- 
cgit 1.2.3-korg