diff options
| author |   Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2018-03-20 11:24:08 +0200 |
|---|---|---|
| committer | Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2018-03-20 11:24:08 +0200 |
| commit | b80c5cd587888074a81cb0cf5c2083725b701dec (patch) | |
| tree | 5d1c86fdedac160f7e72008ad5a06d962e36127b | |
| parent | 845e43d10f0a1b8d64bb31f6ec84925c46401d9f (diff) | |
Fix license issues
Change-Id: I26ad90dca61a1aa3770f3a6d41aff9e420098a82
Issue-ID: VID-198
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
| -rw-r--r-- | LICENSE.TXT | 2 | ||||
| -rwxr-xr-x | epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp | 51 | ||||
| -rw-r--r-- | vid-app-common/src/main/resources/2f80c596.zip | bin | 86923 -> 87214 bytes | |||
| -rw-r--r-- | vid-app-common/src/main/resources/adiod.zip | bin | 81489 -> 81197 bytes | |||
| -rw-r--r-- | vid-app-common/src/main/resources/csar317927061915233480.zip | bin | 63368 -> 63170 bytes | |||
| -rw-r--r-- | vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip | bin | 68824 -> 68579 bytes | |||
| -rw-r--r-- | vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip | bin | 87075 -> 87367 bytes |
7 files changed, 17 insertions, 36 deletions
diff --git a/LICENSE.TXT b/LICENSE.TXT index 1127fc823..4ee1edf0d 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,7 +1,7 @@ /* * ============LICENSE_START========================================== * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2018 AT&T Intellectual Property. All rights reserved. * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp index 842eabd85..9d696a117 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp @@ -1,39 +1,20 @@ <%--
- ============LICENSE_START==========================================
- ONAP Portal SDK
- ===================================================================
- Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
-
- Unless otherwise specified, all software contained herein is licensed
- under the Apache License, Version 2.0 (the “License”);
- you may not use this software except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- 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.
-
- Unless otherwise specified, all documentation contained herein is licensed
- 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
-
- https://creativecommons.org/licenses/by/4.0/
-
- Unless required by applicable law or agreed to in writing, documentation
- distributed under the License is distributed on an "AS IS" BASIS,
- 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.
-
- ============LICENSE_END============================================
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.
+============LICENSE_START==========================================
+===================================================================
+Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+===================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+============LICENSE_END============================================
--%>
<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>
<!DOCTYPE html>
diff --git a/vid-app-common/src/main/resources/2f80c596.zip b/vid-app-common/src/main/resources/2f80c596.zip Binary files differindex 30935c6b9..0babeeb24 100644 --- a/vid-app-common/src/main/resources/2f80c596.zip +++ b/vid-app-common/src/main/resources/2f80c596.zip diff --git a/vid-app-common/src/main/resources/adiod.zip b/vid-app-common/src/main/resources/adiod.zip Binary files differindex 415fa4833..a0fddbedc 100644 --- a/vid-app-common/src/main/resources/adiod.zip +++ b/vid-app-common/src/main/resources/adiod.zip diff --git a/vid-app-common/src/main/resources/csar317927061915233480.zip b/vid-app-common/src/main/resources/csar317927061915233480.zip Binary files differindex 36ac9f9bc..dbf0df179 100644 --- a/vid-app-common/src/main/resources/csar317927061915233480.zip +++ b/vid-app-common/src/main/resources/csar317927061915233480.zip diff --git a/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip b/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip Binary files differindex 6d5002c6c..5b50f4d3f 100644 --- a/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip +++ b/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip b/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip Binary files differindex 6213c6443..8dc04a3c4 100644 --- a/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip +++ b/vid-ext-services-simulator/src/main/resources/download_files/2f80c596.zip |