Skip to content
Permalink
Browse files
Merge pull request #1866, clarify license for codes referencing third…
…party repositories.

Clarify netty License.
  • Loading branch information
carryxyh authored and chickenlj committed May 31, 2018
1 parent 900ab0b commit fd7bab3cdf2650168e9eca625fd5311ffc7b1f5a
Showing 4 changed files with 33 additions and 23 deletions.
11 LICENSE
@@ -263,4 +263,13 @@ This product bundles and repackages the following code in Google Guava 16.0.1, w

* com.google.common.util.concurrent.ExecutionList
* com.google.common.util.concurrent.ListenableFuture
* com.google.common.util.concurrent.ListenableFutureTask
* com.google.common.util.concurrent.ListenableFutureTask

For the package com.alibaba.dubbo.common.threadlocal:

This product contains a modified portion of 'Netty', an event-driven asynchronous network application framework also
under a "Apache License 2.0" license, see https://github.com/netty/netty/blob/4.1/LICENSE.txt:

* io.netty.util.concurrent.FastThreadLocal
* io.netty.util.internal.InternalThreadLocalMap

@@ -1,18 +1,17 @@
/*
* 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
* Copyright 2014 The Netty Project
*
* http://www.apache.org/licenses/LICENSE-2.0
* 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:
*
* 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.
* 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.
*/

package com.alibaba.dubbo.common.threadlocal;
@@ -1,18 +1,17 @@
/*
* 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
* Copyright 2014 The Netty Project
*
* http://www.apache.org/licenses/LICENSE-2.0
* 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:
*
* 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.
* 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.
*/

package com.alibaba.dubbo.common.threadlocal;
@@ -494,6 +494,9 @@
<exclude>**/resources/META-INF/**</exclude>
<!-- exclude the hessian-lite files -->
<exclude>**/com/caucho/hessian/**</exclude>
<!-- exclude the internal threadlocal files -->
<exclude>**/com/alibaba/common/threadlocal/InternalThreadLocal.java</exclude>
<exclude>**/com/alibaba/common/threadlocal/InternalThreadLocalMap.java</exclude>
</excludes>
</configuration>
</execution>

0 comments on commit fd7bab3

Please sign in to comment.