Merge "Sonar fix in ecomp-portal-BE-common"

[portal.git] / LICENSE.txt

diff --git a/LICENSE.txt b/LICENSE.txt
index fd27b3e..7b8a2fc 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
 ============LICENSE_START==========================================
 ONAP Portal
 ===================================================================
 ============LICENSE_START==========================================
 ONAP Portal
 ===================================================================

-Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2017 - 2018 AT&T Intellectual Property. All rights reserved.

 ===================================================================
 
 Unless otherwise specified, all software contained herein is licensed
 ===================================================================
 
 Unless otherwise specified, all software contained herein is licensed


@@ -30,6 +30,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
 See the License for the specific language governing permissions and
 limitations under the License.
 

+For the files
+/ecomp-portal-BE-common/src/main/webapp/WEB-INF/static/ebz/angular_js/angular-sanitize.js
+and
+/ecomp-portal-BE-common/src/main/webapp/static/ebz/angular_js/angular-sanitize.js
+to the extent that they contain code originating from Erik Arvidsson,
+that code is used under the Apache-2.0 license,
+as permitted by http://erik.eae.net/simplehtmlparser/simplehtmlparser.js.
+

 ============LICENSE_END============================================
 
 ============LICENSE_END============================================
 

-ECOMP is a trademark and service mark of AT&T Intellectual Property.
+