diff options
| author |   Michael Hwang <mhwang@research.att.com> | 2017-05-09 09:52:15 -0400 |
|---|---|---|
| committer |   Vijay Venkatesh Kumar <vv770d@att.com> | 2017-05-10 20:23:54 +0000 |
| commit | 03b4fd0a6e6bc0ce88b8904cfa01869b74a2f210 (patch) | |
| tree | 8d76a527ed86807658a879df6153c6c6e73ba971 /license | |
| parent | 473bcb6c7dea189d9481f894b82358f6ec93629b (diff) | |
[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>
Diffstat (limited to 'license')
| -rw-r--r-- | license/pom.xml | 29 | ||||
| -rw-r--r-- | license/src/main/resources/licenses/att_license/header.txt | 4 | ||||
| -rw-r--r-- | license/src/main/resources/licenses/att_license/license.txt | 2 | ||||
| -rw-r--r-- | license/src/main/resources/licenses/licenses.properties | 1 |
4 files changed, 0 insertions, 36 deletions
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 |