From 03b4fd0a6e6bc0ce88b8904cfa01869b74a2f210 Mon Sep 17 00:00:00 2001
From: Michael Hwang <mhwang@research.att.com>
Date: Tue, 9 May 2017 09:52:15 -0400
Subject: [DCAE-16] Merge changes from internal AT&T 1707

Non-functional changes like licensing, pom consolidation, filtering of
keywords.
Functional changes include support for integration with asdc which
caused an API breaking change.

Change-Id: I5a52d968c6403a7d35c4bbf49f7ddf7a5ba4428e
Signed-off-by: Michael Hwang <mhwang@research.att.com>
---
 license/pom.xml                                    | 29 ----------------------
 .../main/resources/licenses/att_license/header.txt |  4 ---
 .../resources/licenses/att_license/license.txt     |  2 --
 .../main/resources/licenses/licenses.properties    |  1 -
 4 files changed, 36 deletions(-)
 delete mode 100644 license/pom.xml
 delete mode 100644 license/src/main/resources/licenses/att_license/header.txt
 delete mode 100644 license/src/main/resources/licenses/att_license/license.txt
 delete mode 100644 license/src/main/resources/licenses/licenses.properties

(limited to 'license')

diff --git a/license/pom.xml b/license/pom.xml
deleted file mode 100644
index 4a98c2a..0000000
--- a/license/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<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>
-    <groupId>org.openecomp.dcae.dcae-inventory</groupId>
-    <artifactId>license</artifactId>
-    <name>dcae-inventory</name>
-    <description>This Maven artifact is meant to provide licensing to all modules and submodules using the licensing
-        maven plugin.
-    </description>
-    <version>1.0.0-SNAPSHOT</version>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <jarname>license</jarname>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>license</finalName>
-    </build>
-</project>
diff --git a/license/src/main/resources/licenses/att_license/header.txt b/license/src/main/resources/licenses/att_license/header.txt
deleted file mode 100644
index dbff902..0000000
--- a/license/src/main/resources/licenses/att_license/header.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This code is licensed under the Apache License, Version 2.0; you may 
-not use this code for any purpose except in compliance with the Apache
-License. You may obtain a copy of the License at 
-       http://www.att.com/legal/openecomp.html
diff --git a/license/src/main/resources/licenses/att_license/license.txt b/license/src/main/resources/licenses/att_license/license.txt
deleted file mode 100644
index 5df403b..0000000
--- a/license/src/main/resources/licenses/att_license/license.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-You may obtain a copy of the License at
-    http://www.att.com/legal/openecomp.html
diff --git a/license/src/main/resources/licenses/licenses.properties b/license/src/main/resources/licenses/licenses.properties
deleted file mode 100644
index df0558d..0000000
--- a/license/src/main/resources/licenses/licenses.properties
+++ /dev/null
@@ -1 +0,0 @@
-att_license=ATT License
-- 
cgit 1.2.3-korg