summaryrefslogtreecommitdiffstats
path: root/javatoscachecker/kwalify/LICENSE
diff options
context:
space:
mode:
authorSerban Jora <jora@research.att.com>2017-11-02 11:16:04 -0400
committerSerban Jora <jora@research.att.com>2017-11-02 11:17:34 -0400
commit865fda0963590e5f103f51d7e32f5c4ddc27c7dc (patch)
tree95acd7110b69b778837b608f9d8820704154fcd7 /javatoscachecker/kwalify/LICENSE
parentb9ec66dc4aa26d6cfb9b94ca8acc629c8821f3ed (diff)
Change license header
New license header includes the original MIT license and the Apache 2.0 license for teh updates Change-Id: If5805ec0c7eb67300b908d7737b5a37f233b6f5e Issue-Id: MODELING-35 Signed-off-by: Serban Jora <jora@research.att.com>
Diffstat (limited to 'javatoscachecker/kwalify/LICENSE')
-rw-r--r--javatoscachecker/kwalify/LICENSE28
1 files changed, 24 insertions, 4 deletions
diff --git a/javatoscachecker/kwalify/LICENSE b/javatoscachecker/kwalify/LICENSE
index 369d782..03b8a26 100644
--- a/javatoscachecker/kwalify/LICENSE
+++ b/javatoscachecker/kwalify/LICENSE
@@ -1,4 +1,7 @@
-copyright(c) 2005 kuwata-lab all rights reserved.
+The original version of this software package was provided under the MIT
+license, as follows:
+
+Copyright(c) 2005 kuwata-lab all rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -6,9 +9,9 @@ in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -18,3 +21,20 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+Modifications to this software package are provided under the Apache 2.0
+license, as follows:
+
+Copyright (c) 2017 <AT&T>. 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.
+