From 03b4fd0a6e6bc0ce88b8904cfa01869b74a2f210 Mon Sep 17 00:00:00 2001 From: Michael Hwang 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 --- license/src/main/resources/licenses/att_license/header.txt | 4 ---- license/src/main/resources/licenses/att_license/license.txt | 2 -- license/src/main/resources/licenses/licenses.properties | 1 - 3 files changed, 7 deletions(-) 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/src/main/resources/licenses') 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