Skip to content

Commit 2a91684

Browse files
ralf0131beiwei30
authored andcommitted
Fix license issues (#3382)
* Fix license issues * revert change to Netty's copyright
1 parent 9b89d41 commit 2a91684

File tree

9 files changed

+84
-362
lines changed

9 files changed

+84
-362
lines changed

LICENSE

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,6 @@ Apache Dubbo includes a number of submodules with separate copyright notices
208208
and license terms. Your use of these submodules is subject to the terms and
209209
conditions of the following licenses.
210210

211-
For the org.apache.dubbo.common.concurrent package:
212-
213-
This product bundles and repackages the following code in Google Guava 16.0.1, which is available under a
214-
"Apache License 2.0" license. For details, see https://github.com/google/guava/blob/v16.0.1/COPYING.
215-
216-
* com.google.common.util.concurrent.ExecutionList
217-
* com.google.common.util.concurrent.ListenableFuture
218-
* com.google.common.util.concurrent.ListenableFutureTask
219-
220211
For the package org.apache.dubbo.common.threadlocal and org.apache.dubbo.common.timer:
221212

222213
This product contains a modified portion of 'Netty', an event-driven asynchronous network application framework also

dubbo-common/src/main/java/org/apache/dubbo/common/concurrent/ExecutionList.java

Lines changed: 0 additions & 180 deletions
This file was deleted.

dubbo-common/src/test/java/org/apache/dubbo/common/concurrent/ExecutionListTest.java

Lines changed: 0 additions & 95 deletions
This file was deleted.

dubbo-common/src/test/resources/log4j.xml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
- Copyright 1999-2011 Alibaba Group.
4-
-
5-
- Licensed under the Apache License, Version 2.0 (the "License");
6-
- you may not use this file except in compliance with the License.
7-
- You may obtain a copy of the License at
8-
-
9-
- http://www.apache.org/licenses/LICENSE-2.0
10-
-
11-
- 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.
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to You under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
1617
-->
1718
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
1819
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">

dubbo-monitor/dubbo-monitor-api/pom.xml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<!--
2-
- Copyright 1999-2011 Alibaba Group.
3-
-
4-
- Licensed under the Apache License, Version 2.0 (the "License");
5-
- you may not use this file except in compliance with the License.
6-
- You may obtain a copy of the License at
7-
-
8-
- http://www.apache.org/licenses/LICENSE-2.0
9-
-
10-
- Unless required by applicable law or agreed to in writing, software
11-
- distributed under the License is distributed on an "AS IS" BASIS,
12-
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
- See the License for the specific language governing permissions and
14-
- limitations under the License.
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
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
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.
1516
-->
1617
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1718
<modelVersion>4.0.0</modelVersion>

dubbo-remoting/dubbo-remoting-netty/pom.xml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<!--
2-
- Copyright 1999-2011 Alibaba Group.
3-
-
4-
- Licensed under the Apache License, Version 2.0 (the "License");
5-
- you may not use this file except in compliance with the License.
6-
- You may obtain a copy of the License at
7-
-
8-
- http://www.apache.org/licenses/LICENSE-2.0
9-
-
10-
- Unless required by applicable law or agreed to in writing, software
11-
- distributed under the License is distributed on an "AS IS" BASIS,
12-
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
- See the License for the specific language governing permissions and
14-
- limitations under the License.
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
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
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.
1516
-->
1617
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1718
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)