This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new 3711113f5 [#4040] Update Rat check to ignore Datastrato headers (#4044)
3711113f5 is described below
commit 3711113f5613d79db4b62373984ae2e3d1794d1f
Author: Justin Mclean <[email protected]>
AuthorDate: Wed Jul 3 17:42:05 2024 +1000
[#4040] Update Rat check to ignore Datastrato headers (#4044)
### What changes were proposed in this pull request?
No longer accept Datastrato headers.
### Why are the changes needed?
See above.
Fix: #4040
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Note that until all file headers have changed the Rat test will not
pass. I made it a separate PR for easy review.
---
build.gradle.kts | 21 ++++++++++++++++-----
.../client-python/tests/integration/test_catalog.py | 18 ++++++++++++++++--
2 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index 5c956e7ed..32e13d72c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,20 @@
/*
- * Copyright 2023 Datastrato Pvt Ltd.
- * This software is licensed under the Apache License version 2.
+ * 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.
*/
import com.github.gradle.node.NodeExtension
import com.github.gradle.node.NodePlugin
@@ -440,9 +454,6 @@ subprojects {
}
tasks.rat {
- substringMatcher("DS", "Datastrato", "Copyright 2023 Datastrato Pvt Ltd.")
- substringMatcher("DS", "Datastrato", "Copyright 2024 Datastrato Pvt Ltd.")
- approvedLicense("Datastrato")
approvedLicense("Apache License Version 2.0")
// Set input directory to that of the root project instead of the CWD. This
diff --git a/clients/client-python/tests/integration/test_catalog.py
b/clients/client-python/tests/integration/test_catalog.py
index 5b08edc23..1535e709c 100644
--- a/clients/client-python/tests/integration/test_catalog.py
+++ b/clients/client-python/tests/integration/test_catalog.py
@@ -1,6 +1,20 @@
"""
-Copyright 2024 Datastrato Pvt Ltd.
-This software is licensed under the Apache License version 2.
+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.
"""
import logging