Repository: incubator-unomi Updated Branches: refs/heads/master c65f9897e -> 58ccb1daf
Update LICENSE and NOTICE files to remove obsolete MIT license reference Signed-off-by: Serge Huber <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/58ccb1da Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/58ccb1da Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/58ccb1da Branch: refs/heads/master Commit: 58ccb1dafbe40898a786f9f595eb69b2e984875a Parents: c65f989 Author: Serge Huber <[email protected]> Authored: Thu Sep 14 14:55:18 2017 +0200 Committer: Serge Huber <[email protected]> Committed: Thu Sep 14 14:55:18 2017 +0200 ---------------------------------------------------------------------- LICENSE | 26 +------------------------- NOTICE | 4 ---- 2 files changed, 1 insertion(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/58ccb1da/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 13f2054..f49a4e1 100644 --- a/LICENSE +++ b/LICENSE @@ -198,28 +198,4 @@ 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. - -For persistence-elasticsearch/plugins/security/src/main/java/org/apache/unomi/elasticsearch/plugin/security/IPRangeMatcher.java : - -The MIT License - -Copyright (c) 2013 Edin Dazdarevic ([email protected]) - -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 + limitations under the License. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/58ccb1da/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index d457b8e..1bebe81 100644 --- a/NOTICE +++ b/NOTICE @@ -6,7 +6,3 @@ The Apache Software Foundation (http://www.apache.org/). Based on source code originally developed by Jahia Solutions Software (http://www.jahia.com/). - -This product includes software developed by -Edin Dazdarevic ([email protected]). -Copyright (c) 2013 Edin Dazdarevic ([email protected])
