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>
---
 utils/pom.xml | 87 +++++++++++++----------------------------------------------
 1 file changed, 18 insertions(+), 69 deletions(-)

(limited to 'utils/pom.xml')

diff --git a/utils/pom.xml b/utils/pom.xml
index 17a0f6b6..cd342f77 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -1,77 +1,26 @@
 <?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">
-    <parent>
-        <groupId>org.onap.ccsdk.sli.core</groupId>
-        <artifactId>ccsdk-sli-core</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+<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>
+
+   <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>utils</artifactId>
+   <version>0.2.1-SNAPSHOT</version>
+   <packaging>pom</packaging>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-    <groupId>org.onap.ccsdk.sli.core</groupId>
-    <artifactId>utils</artifactId>
-
-
-    <name>SLI Utils</name>
-    <description>Utilities used across sli-core</description>
-
-    <version>0.2.0-SNAPSHOT</version>
-
-    <build>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${maven.compile.plugin.version}</version>
-                    <configuration>
-                        <source>${java.version.source}</source>
-                        <target>${java.version.target}</target>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10</version>
-
-                    <executions>
-                        <execution>
-                            <id>aggregate</id>
-                            <goals>
-                                <goal>aggregate</goal>
-                            </goals>
-                            <phase>site</phase>
-
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>2.1.1</version>
-                    <executions>
-                        <execution>
-                            <id>bundle-sources</id>
-                            <phase>package</phase>
-                            <goals>
-                                <!-- produce source artifact for main project sources -->
-                                <goal>jar-no-fork</goal>
-
-                                <!-- produce source artifact for project test sources -->
-                                <goal>test-jar-no-fork</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-
-        </pluginManagement>
-    </build>
-    <organization>
-        <name>AT&amp;T</name>
+   <name>ccsdk-sli-core :: utils</name>
+   <description>Utilities used across sli-core</description>
+   <organization>
+        <name>ONAP</name>
     </organization>
-  <modules>
+
+   <modules>
     <module>provider</module>
     <module>features</module>
     <module>installer</module>
-- 
cgit 1.2.3-korg