Skip to content

Commit d32cee8

Browse files
carryxyhchickenlj
authored andcommitted
Merge pull request apache#1866, clarify license for codes referencing thirdparty repositories.
Clarify netty License.
1 parent 6b907a5 commit d32cee8

File tree

4 files changed

+33
-23
lines changed

4 files changed

+33
-23
lines changed

LICENSE

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,4 +263,13 @@ This product bundles and repackages the following code in Google Guava 16.0.1, w
263263

264264
* com.google.common.util.concurrent.ExecutionList
265265
* com.google.common.util.concurrent.ListenableFuture
266-
* com.google.common.util.concurrent.ListenableFutureTask
266+
* com.google.common.util.concurrent.ListenableFutureTask
267+
268+
For the package com.alibaba.dubbo.common.threadlocal:
269+
270+
This product contains a modified portion of 'Netty', an event-driven asynchronous network application framework also
271+
under a "Apache License 2.0" license, see https://github.com/netty/netty/blob/4.1/LICENSE.txt:
272+
273+
* io.netty.util.concurrent.FastThreadLocal
274+
* io.netty.util.internal.InternalThreadLocalMap
275+

dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/InternalThreadLocal.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache License, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
2+
* Copyright 2014 The Netty Project
83
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
4+
* The Netty Project licenses this file to you under the Apache License,
5+
* version 2.0 (the "License"); you may not use this file except in compliance
6+
* with the License. You may obtain a copy of the License at:
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
109
*
1110
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations
14+
* under the License.
1615
*/
1716

1817
package com.alibaba.dubbo.common.threadlocal;

dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/InternalThreadLocalMap.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache License, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
2+
* Copyright 2014 The Netty Project
83
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
4+
* The Netty Project licenses this file to you under the Apache License,
5+
* version 2.0 (the "License"); you may not use this file except in compliance
6+
* with the License. You may obtain a copy of the License at:
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
109
*
1110
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations
14+
* under the License.
1615
*/
1716

1817
package com.alibaba.dubbo.common.threadlocal;

pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,9 @@
494494
<exclude>**/resources/META-INF/**</exclude>
495495
<!-- exclude the hessian-lite files -->
496496
<exclude>**/com/caucho/hessian/**</exclude>
497+
<!-- exclude the internal threadlocal files -->
498+
<exclude>**/com/alibaba/common/threadlocal/InternalThreadLocal.java</exclude>
499+
<exclude>**/com/alibaba/common/threadlocal/InternalThreadLocalMap.java</exclude>
497500
</excludes>
498501
</configuration>
499502
</execution>

0 commit comments

Comments
 (0)