This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 9862678 Merge pull request #1672, improve LICENSE and NOTICE
according to ASF policy.
9862678 is described below
commit 98626783ab0ff92a66d432d3c3959100ea88f0c7
Author: Huxing Zhang <[email protected]>
AuthorDate: Thu Apr 26 14:12:33 2018 +0800
Merge pull request #1672, improve LICENSE and NOTICE according to ASF
policy.
---
LICENSE | 66 +++++++++++++++-
NOTICE | 272 +---------------------------------------------------------------
2 files changed, 69 insertions(+), 269 deletions(-)
diff --git a/LICENSE b/LICENSE
index 9e87f44..7b279f1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,4 @@
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -187,6 +186,7 @@
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
+
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
@@ -200,3 +200,67 @@
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.
+
+
+Apache Dubbo Submodules:
+
+Apache Dubbo includes a number of submodules with separate copyright notices
+and license terms. Your use of these submodules is subject to the terms and
+conditions of the following licenses.
+
+
+For the hessian-lite submodule:
+
+The Apache Software License, Version 1.1
+
+ Copyright (c) 2001-2004 Caucho Technology, Inc. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ 3. The end-user documentation included with the redistribution, if
+ any, must include the following acknowlegement:
+ "This product includes software developed by the
+ Caucho Technology (http://www.caucho.com/)."
+ Alternately, this acknowlegement may appear in the software itself,
+ if and wherever such third-party acknowlegements normally appear.
+
+ 4. The names "Hessian", "Resin", and "Caucho" must not be used to
+ endorse or promote products derived from this software without prior
+ written permission. For written permission, please contact
+ [email protected].
+
+ 5. Products derived from this software may not be called "Resin"
+ nor may "Resin" appear in their names without prior written
+ permission of Caucho Technology.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL CAUCHO TECHNOLOGY OR ITS CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+For the com.alibaba.dubbo.common.concurrent package:
+
+This product bundles and repackages the following code in Google Guava 16.0.1,
which is available under a
+"Apache License 2.0" license. For details, see
https://github.com/google/guava/blob/v16.0.1/COPYING.
+
+ * com.google.common.util.concurrent.ExecutionList
+ * com.google.common.util.concurrent.ListenableFuture
+ * com.google.common.util.concurrent.ListenableFutureTask
\ No newline at end of file
diff --git a/NOTICE b/NOTICE
index cbff3d5..84d3fe1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,269 +1,5 @@
-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
+Apache Dubbo (incubating)
+Copyright 2018 The Apache Software Foundation
- 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.
-
-================================================================
-Dependencies:
-
-Spring:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://www.springsource.org
-
-Javassist:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://www.jboss.org/javassist
-
-Netty:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://netty.io
-
-Mina:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://mina.apache.org
-
-Grizzly:
-
- * LICENSE:
- * https://opensource.org/licenses/cddl-1.0 (CDDL 1.1)
- * HOMEPAGE:
- * https://javaee.github.io/grizzly/
-
-HttpClient:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://hc.apache.org
-
-Hessian:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://hessian.caucho.com
-
-XStream:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://xstream.codehaus.org
-
-FastJson:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/alibaba/fastjson
-
-Zookeeper:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://zookeeper.apache.org
-
-Jedis:
-
- * LICENSE:
- * https://opensource.org/licenses/MIT (MIT)
- * HOMEPAGE:
- * https://github.com/xetorthio/jedis
-
-XMemcached:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://code.google.com/p/xmemcached
-
-Jetty:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://jetty.mortbay.org
-
-Thrift:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://thrift.apache.org
-
-CXF:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://cxf.apache.org
-
-ZKClient:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/sgroschupf/zkclient
-
-Curator
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/Netflix/curator
-
-JFreeChart:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://www.jfree.org
-
-validation-api:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://beanvalidation.org
-
-HibernateValidator:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://www.hibernate.org/subprojects/validator.html
-
-CommonsLogging:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://commons.apache.org/logging
-
-SLF4J:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://www.slf4j.org
-
-Log4j:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://log4j.apache.org
-
-Tomcat:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://tomcat.apache.org
-
-cache-api:
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/jsr107/jsr107spec
-
-easymock
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://easymock.org
-
-cglib-nodep
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * https://sourceforge.net/projects/cglib/
-
-resteasy
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://resteasy.jboss.org/
-
-fst
-
- * LICENSE:
- * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0)
- * HOMEPAGE:
- * http://ruedigermoeller.github.io/fast-serialization
-
-jmockit
-
- * LICENSE:
- * https://opensource.org/licenses/MIT (MIT)
- * HOMEPAGE:
- * http://www.jmockit.org
-
-jedis
-
- * LICENSE:
- * https://opensource.org/licenses/MIT (MIT)
- * HOMEPAGE:
- * http://www.jmockit.org
-
-javax.servlet-api:
-
- * LICENSE:
- * https://opensource.org/licenses/cddl-1.0 (CDDL 1.1)
- * HOMEPAGE:
- * http://servlet-spec.java.net
-
-javax.el:
-
- * LICENSE:
- * https://opensource.org/licenses/cddl-1.0 (CDDL 1.1)
- * HOMEPAGE:
- * https://javaee.github.io/uel-ri/
-
-logback-classic:
-
- * LICENSE:
- * http://www.eclipse.org/legal/epl-v10.html (EPL 1.0)
- * HOMEPAGE:
- * https://logback.qos.ch/
-
-junit:
-
- * LICENSE:
- * http://www.eclipse.org/legal/epl-v10.html (EPL 1.0)
- * HOMEPAGE:
- * http://www.junit.org
-
-kryo:
-
- * LICENSE:
- * https://opensource.org/licenses/BSD-3-Clause (BSD 3-clause)
- * HOMEPAGE:
- * https://github.com/EsotericSoftware/kryo
\ No newline at end of file
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
[email protected].
