You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2017/10/23 17:19:30 UTC
[15/28] tomee git commit: Fix licence issues
Fix licence issues
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f2015d5a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f2015d5a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f2015d5a
Branch: refs/heads/fb_tomee8
Commit: f2015d5aefb4b828ed6fe7063430a0a387b52bf0
Parents: 5df2bd8
Author: andygumbrecht <an...@gmx.de>
Authored: Fri Sep 15 10:57:16 2017 +0200
Committer: andygumbrecht <an...@gmx.de>
Committed: Fri Sep 15 10:57:16 2017 +0200
----------------------------------------------------------------------
rat.xml | 3 +++
.../src/main/resources/META-INF/LICENSE | 18 ++++++++---------
.../src/main/resources/js/livereload.js | 21 +++++++-------------
3 files changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f2015d5a/rat.xml
----------------------------------------------------------------------
diff --git a/rat.xml b/rat.xml
index 91f9d31..7c1dbe8 100644
--- a/rat.xml
+++ b/rat.xml
@@ -175,6 +175,9 @@
<!-- CDDL licensed -->
<exclude name="container/openejb-jee/src/main/resources/META-INF/schema/*.xsd"/>
+
+ <!-- MIT licensed -->
+ <exclude name="utils/livereload-tomee/src/main/resources/js/livereload.js"/>
</patternset>
</fileset>
</rat:report>
http://git-wip-us.apache.org/repos/asf/tomee/blob/f2015d5a/utils/livereload-tomee/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/utils/livereload-tomee/src/main/resources/META-INF/LICENSE b/utils/livereload-tomee/src/main/resources/META-INF/LICENSE
index be29f50..45ee948 100644
--- a/utils/livereload-tomee/src/main/resources/META-INF/LICENSE
+++ b/utils/livereload-tomee/src/main/resources/META-INF/LICENSE
@@ -1,4 +1,12 @@
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+---------------------------------------------------------------------------
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -201,12 +209,4 @@
See the License for the specific language governing permissions and
limitations under the License.
------------------------------
-
-The MIT License (MIT)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
\ No newline at end of file
+-----------------------------
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/f2015d5a/utils/livereload-tomee/src/main/resources/js/livereload.js
----------------------------------------------------------------------
diff --git a/utils/livereload-tomee/src/main/resources/js/livereload.js b/utils/livereload-tomee/src/main/resources/js/livereload.js
index 156d707..3eedc30 100644
--- a/utils/livereload-tomee/src/main/resources/js/livereload.js
+++ b/utils/livereload-tomee/src/main/resources/js/livereload.js
@@ -1,18 +1,11 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
*/
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
(function() {