This is an automated email from the ASF dual-hosted git repository.
yihua pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new 16c066561e0d [MINOR] Revert license check to exclude hudi-trino-plugin
and cleanup script (#13689)
16c066561e0d is described below
commit 16c066561e0d73b24d5f7e1fa5f597e2d6c26b3e
Author: voonhous <[email protected]>
AuthorDate: Thu Aug 7 10:56:09 2025 +0800
[MINOR] Revert license check to exclude hudi-trino-plugin and cleanup
script (#13689)
---
.../modernizer/violations-production-code-only.xml | 18 ------------------
hudi-trino-plugin/.mvn/modernizer/violations.xml | 18 ------------------
hudi-trino-plugin/pom.xml | 18 ------------------
scripts/release/validate_source_copyright.sh | 15 +++++++++++----
4 files changed, 11 insertions(+), 58 deletions(-)
diff --git
a/hudi-trino-plugin/.mvn/modernizer/violations-production-code-only.xml
b/hudi-trino-plugin/.mvn/modernizer/violations-production-code-only.xml
index 4653d63fafc2..c814b1746cae 100644
--- a/hudi-trino-plugin/.mvn/modernizer/violations-production-code-only.xml
+++ b/hudi-trino-plugin/.mvn/modernizer/violations-production-code-only.xml
@@ -1,22 +1,4 @@
<?xml version="1.0"?>
-<!--
- ~ 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.
- -->
<modernizer>
<violation>
<name>java/util/concurrent/ThreadPoolExecutor."<init>":(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;)V</name>
diff --git a/hudi-trino-plugin/.mvn/modernizer/violations.xml
b/hudi-trino-plugin/.mvn/modernizer/violations.xml
index eae8ea39b591..eddc9222574f 100644
--- a/hudi-trino-plugin/.mvn/modernizer/violations.xml
+++ b/hudi-trino-plugin/.mvn/modernizer/violations.xml
@@ -1,22 +1,4 @@
<?xml version="1.0"?>
-<!--
- ~ 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.
- -->
<modernizer>
<violation>
<name>java/lang/Class.newInstance:()Ljava/lang/Object;</name>
diff --git a/hudi-trino-plugin/pom.xml b/hudi-trino-plugin/pom.xml
index d819b3093e23..7ce3a658af8c 100644
--- a/hudi-trino-plugin/pom.xml
+++ b/hudi-trino-plugin/pom.xml
@@ -1,22 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
<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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
diff --git a/scripts/release/validate_source_copyright.sh
b/scripts/release/validate_source_copyright.sh
index 7d7e2914f328..788e5ec53a22 100755
--- a/scripts/release/validate_source_copyright.sh
+++ b/scripts/release/validate_source_copyright.sh
@@ -46,10 +46,17 @@ echo -e "\t\tNotice file exists ? [OK]\n"
### Licensing Check
echo "Performing custom Licensing Check "
-numfilesWithNoLicense=`find . -iname '*' -type f | grep -v NOTICE | grep -v
LICENSE | grep -v '.jpg' | grep -v '.json' | grep -v '.parquet' | grep -v
'.hfile' | grep -v '.data' | grep -v '.commit' | grep -v emptyFile | grep -v
DISCLAIMER | grep -v KEYS | grep -v '.mailmap' | grep -v '.sqltemplate' | grep
-v 'banner.txt' | grep -v '.txt' | grep -v "fixtures" | xargs grep -L -E
"(Licensed to the Apache Software Foundation \(ASF\)|Licensed under the Apache
License, Version 2\.0)" | wc -l`
-if [ "$numfilesWithNoLicense" -gt "0" ]; then
- echo "There were some source files that did not have Apache License [ERROR]"
- find . -iname '*' -type f | grep -v NOTICE | grep -v LICENSE | grep -v
'.jpg' | grep -v '.json' | grep -v '.parquet' | grep -v '.hfile' | grep -v
'.data' | grep -v '.commit' | grep -v emptyFile | grep -v DISCLAIMER | grep -v
'.sqltemplate' | grep -v KEYS | grep -v '.mailmap' | grep -v 'banner.txt' |
grep -v '.txt' | grep -v "fixtures" | xargs grep -L -E "(Licensed to the Apache
Software Foundation \(ASF\)|Licensed under the Apache License, Version 2\.0)"
+# ---
+# Exclude the 'hudi-trino-plugin' directory. Its license checks are handled by
airlift:
+#
https://github.com/airlift/airbase/blob/823101482dbc60600d7862f0f5c93aded6190996/airbase/pom.xml#L1239
+# ---
+numfilesWithNoLicense=$(find . -path './hudi-trino-plugin' -prune -o -type f
-iname '*' | grep -v './hudi-trino-plugin' | grep -v NOTICE | grep -v LICENSE |
grep -v '.jpg' | grep -v '.json' | grep -v '.hfile' | grep -v '.data' | grep -v
'.commit' | grep -v emptyFile | grep -v DISCLAIMER | grep -v '.sqltemplate' |
grep -v KEYS | grep -v '.mailmap' | grep -v 'banner.txt' | grep -v '.txt' |
grep -v "fixtures" | xargs grep -L "Licensed to the Apache Software Foundation
(ASF)")
+# Check if the variable holding the list of files is non-empty
+if [ -n "$numfilesWithNoLicense" ]; then
+ # If the list isn't empty, count the files and report the error
+ numFiles=$(echo "$numfilesWithNoLicense" | wc -l)
+ echo "There were ${num_files} source files that did not have Apache License
[ERROR]"
+ echo "$numfilesWithNoLicense"
exit 1
fi
echo -e "\t\tLicensing Check Passed [OK]\n"
