mysql-connector-java to mariadb-java-client change

[portal.git] / LICENSE.txt

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

-Copyright © 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


@@ -18,7 +18,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 Unless otherwise specified, all documentation contained herein is licensed
 limitations under the License.
 
 Unless otherwise specified, all documentation contained herein is licensed

-under the Creative Commons License, Attribution 4.0 Intl. (the ¿License¿);
+under the Creative Commons License, Attribution 4.0 Intl. (the "License");

 you may not use this documentation except in compliance with the License.
 You may obtain a copy of the License at
 
 you may not use this documentation except in compliance with the License.
 You may obtain a copy of the License at
 


@@ -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.
+