You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/06/04 05:45:22 UTC
[dubbo] branch master updated: Fix license (#7977)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 8deb821 Fix license (#7977)
8deb821 is described below
commit 8deb82168c7543af953efaf1601d32ad6596e4a1
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Fri Jun 4 13:45:01 2021 +0800
Fix license (#7977)
* Fix thrift ASF license header
* add .mvn ignore
* add ASF header
* remove protobuf notice
---
NOTICE | 8 --------
.../rpc/cluster/router/file/availablerule.javascript | 17 ++++++++++++++++-
.../dubbo/rpc/cluster/router/file/methodrule.javascript | 17 ++++++++++++++++-
.../rpc/cluster/router/file/notAvailablerule.javascript | 17 ++++++++++++++++-
.../src/test/idls/DemoService.thrift | 16 ++++++++++++++++
.../src/test/idls/UserService.thrift | 16 ++++++++++++++++
.../src/test/thrift/ClassNameTestDubbo.thrift | 16 ++++++++++++++++
.../src/test/thrift/ClassNameTestThrift.thrift | 16 ++++++++++++++++
dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/Demo.thrift | 16 ++++++++++++++++
pom.xml | 5 ++---
10 files changed, 130 insertions(+), 14 deletions(-)
diff --git a/NOTICE b/NOTICE
index e414ebf..9e952c6 100644
--- a/NOTICE
+++ b/NOTICE
@@ -12,11 +12,3 @@ Please visit the Netty web site for more information:
* http://netty.io/
Copyright 2014 The Netty Project
-
-The product contains code form the Google Protocol Buffers project:
-
-Please visit the following site for more information:
-https://developers.google.com/protocol-buffers/
-
-Copyright 2008 Google Inc. All rights reserved.
-
diff --git a/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/availablerule.javascript b/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/availablerule.javascript
index c76de32..40b72b4 100644
--- a/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/availablerule.javascript
+++ b/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/availablerule.javascript
@@ -1,4 +1,19 @@
-function route(invokers,invocation,context){
+// 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
+//
+// 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.
+
+function route(invokers,invocation,context){
var result = new java.util.ArrayList(invokers.size());
for (i=0;i<invokers.size(); i++){
diff --git a/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/methodrule.javascript b/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/methodrule.javascript
index 77ff456..13561dc 100644
--- a/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/methodrule.javascript
+++ b/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/methodrule.javascript
@@ -1,4 +1,19 @@
-function route(invokers,invocation,context){
+// 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
+//
+// 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.
+
+function route(invokers,invocation,context){
var result = new java.util.ArrayList();
if (invokers.size()>1 && invocation.getMethodName() .equals("method1")) {
result.add(invokers.get(0)) ;
diff --git a/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/notAvailablerule.javascript b/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/notAvailablerule.javascript
index 1fcdcae..e323d54 100644
--- a/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/notAvailablerule.javascript
+++ b/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/notAvailablerule.javascript
@@ -1,4 +1,19 @@
-function route(invokers,invocation,context){
+// 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
+//
+// 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.
+
+function route(invokers,invocation,context){
var result = new java.util.ArrayList(invokers.size());
for (i=0;i<invokers.size(); i++){
diff --git a/dubbo-rpc/dubbo-rpc-native-thrift/src/test/idls/DemoService.thrift b/dubbo-rpc/dubbo-rpc-native-thrift/src/test/idls/DemoService.thrift
index 12154f8..dbd3ec9 100644
--- a/dubbo-rpc/dubbo-rpc-native-thrift/src/test/idls/DemoService.thrift
+++ b/dubbo-rpc/dubbo-rpc-native-thrift/src/test/idls/DemoService.thrift
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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.
+ */
namespace java org.apache.dubbo.rpc.protocol.nativethrift
namespace go demo
/*Demo service define file,can be generated to interface files*/
diff --git a/dubbo-rpc/dubbo-rpc-native-thrift/src/test/idls/UserService.thrift b/dubbo-rpc/dubbo-rpc-native-thrift/src/test/idls/UserService.thrift
index c2f18e4..9178c6a 100644
--- a/dubbo-rpc/dubbo-rpc-native-thrift/src/test/idls/UserService.thrift
+++ b/dubbo-rpc/dubbo-rpc-native-thrift/src/test/idls/UserService.thrift
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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.
+ */
namespace java org.apache.dubbo.rpc.protocol.nativethrift
namespace go demo
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/ClassNameTestDubbo.thrift b/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/ClassNameTestDubbo.thrift
index 3e2023a..f0b4df1 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/ClassNameTestDubbo.thrift
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/ClassNameTestDubbo.thrift
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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.
+ */
service ClassNameTestDubbo {
string echo(1:required string arg);
}
\ No newline at end of file
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/ClassNameTestThrift.thrift b/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/ClassNameTestThrift.thrift
index ccac7a1..294010b 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/ClassNameTestThrift.thrift
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/ClassNameTestThrift.thrift
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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.
+ */
service ClassNameTestThrift {
string echo(1:required string arg);
}
\ No newline at end of file
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/Demo.thrift b/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/Demo.thrift
index 8e66074..c784338 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/Demo.thrift
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/Demo.thrift
@@ -1,3 +1,19 @@
+/*
+ * 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
+ *
+ * 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.
+ */
namespace dubbo_java org.apache.dubbo.rpc.gen.dubbo
namespace dubbo_cpp org.apache.dubbo.rpc.gen.dubbo
diff --git a/pom.xml b/pom.xml
index f3aca25..407b226 100644
--- a/pom.xml
+++ b/pom.xml
@@ -541,17 +541,16 @@
<excludes>
<exclude>**/*.versionsBackup</exclude>
<exclude>**/.idea/</exclude>
+ <exclude>**/.mvn/</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/*.txt</exclude>
<exclude>**/*.load</exclude>
<exclude>**/*.flex</exclude>
<exclude>**/*.fc</exclude>
- <exclude>**/*.javascript</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.thrift</exclude>
<exclude>**/*.sh</exclude>
<exclude>**/*.bat</exclude>
<exclude>**/*.md</exclude>
+ <exclude>**/*.properties</exclude>
<exclude>.git/</exclude>
<exclude>.gitignore</exclude>
<!-- ASF jenkins box puts the Maven repo in our root directory. -->