You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2017/02/11 03:22:34 UTC

incubator-rocketmq git commit: [ROCKETMQ-87] Polish the LICENSE and NOTICE files.

Repository: incubator-rocketmq
Updated Branches:
  refs/heads/master 767775838 -> 23e9df20a


[ROCKETMQ-87] Polish the LICENSE and NOTICE files.


Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/23e9df20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/23e9df20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/23e9df20

Branch: refs/heads/master
Commit: 23e9df20aae9310580cca86f58b8ed5bbe1ed5fb
Parents: 7677758
Author: yukon <yu...@apache.org>
Authored: Sat Feb 11 11:22:20 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Sat Feb 11 11:22:20 2017 +0800

----------------------------------------------------------------------
 LICENSE | 45 +++++++++++++++++++++++++++++++++++++++++++++
 NOTICE  | 41 +++++++++++++++++++++++------------------
 2 files changed, 68 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/23e9df20/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index c2441e8..64ce289 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,3 +199,48 @@
    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.
+
+------
+This product has a binary dependency on logback, which is available under the EPL v1.0 License.
+The source code of logback can be found at https://github.com/qos-ch/logback.
+
+Logback LICENSE
+---------------
+
+Logback: the reliable, generic, fast and flexible logging framework.
+Copyright (C) 1999-2015, QOS.ch. All rights reserved.
+
+This program and the accompanying materials are dual-licensed under
+either the terms of the Eclipse Public License v1.0 as published by
+the Eclipse Foundation
+
+  or (per the licensee's choosing)
+
+under the terms of the GNU Lesser General Public License version 2.1
+as published by the Free Software Foundation.
+
+------
+This product has a binary dependency on slf4j, which is available under the MIT License.
+The source code of slf4j can be found at https://github.com/qos-ch/slf4j.
+
+Copyright (c) 2004-2017 QOS.ch
+ 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 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

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/23e9df20/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 7d76e00..f407b67 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,28 +4,33 @@ Copyright 2016-2017 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
--------------------------------------------------------------------------------
-This distribution has a binary dependency on netty, which is available under the ASL2 License.
-The source code of netty can be found at https://github.com/netty/netty.
+------
+This product has a binary dependency on netty:
+                            The Netty Project
+                            =================
 
-This distribution has a binary dependency on commons-cli, which is available under the ASL2 License.
-The source code of commons-cli can be found at https://github.com/apache/commons-cli.
+Please visit the Netty web site for more information:
 
-This distribution has a binary dependency on commons-lang, which is available under the ASL2 License.
-The source code of commons-lang can be found at https://github.com/apache/commons-lang.
+  * http://netty.io/
 
-This distribution has a binary dependency on fastjson, which is available under the ASL2 License.
-The source code of fastjson can be found at https://github.com/alibaba/fastjson.
+Copyright 2014 The Netty Project
 
-This distribution has a binary dependency on javassist, which is available under
-the Mozilla Public License Version 1.1, the GNU Lesser General Public License Version 2.1 or later, or the ASL2 License.
-The source code of javassist can be found at https://github.com/jboss-javassist/javassist.
+The Netty Project 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:
 
-This distribution has a binary dependency on jna, which is available under the LGPL, version 2.1 or later, and (from version 4.0 onward) the ASL2 License.
-The source code of jna can be found at https://github.com/java-native-access/jna.
+  http://www.apache.org/licenses/LICENSE-2.0
 
-This distribution has a binary dependency on logback, which is available under the EPL v1.0 and the LGPL 2.1 License.
-The source code of logback can be found at https://github.com/qos-ch/logback.
+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.
 
-This distribution has a binary dependency on slf4j, which is available under the MIT License.
-The source code of slf4j can be found at https://github.com/qos-ch/slf4j.
\ No newline at end of file
+Also, please refer to each LICENSE.<component>.txt file, which is located in
+the 'license' directory of the distribution file, for the license terms of the
+components that this product depends on.
+
+------
+This product has a binary dependency on commons-lang, which includes software from the Spring Framework,
+under the Apache License 2.0 (see: StringUtils.containsWhitespace())
\ No newline at end of file