From 4de70846d4c8f9d7c7e40cf21c61d525ff750c75 Mon Sep 17 00:00:00 2001 From: Jerry Shao Date: Wed, 13 Nov 2024 21:18:00 +0800 Subject: [PATCH] [#5535] fix(build,license): Fix the gradle publish issue and several license issues (#5544) ### What changes were proposed in this pull request? 1. Fix the release script to also publish `.module` file used for gradle. 2. Update the original place for gradle script. 3. Update the paths for codes referring from Ranger. ### Why are the changes needed? Fix the publish and license issue Fix: #5535 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Local verification. --- LICENSE | 5 ++++- dev/release/release-build.sh | 2 +- gradle/wrapper/gradle-wrapper.properties | 1 + gradlew | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index ed209aed93..16d1fbec58 100644 --- a/LICENSE +++ b/LICENSE @@ -206,6 +206,10 @@ This product bundles various third-party components also under the Apache Software License 2.0. + Gradle (https://github.com/gradle/gradle) + ./gradlew + ./gradle/wrapper/gradle-wrapper.properties + Apache Spark ./api/src/main/java/org/apache/gravitino/SchemaChange.java ./api/src/main/java/org/apache/gravitino/SupportsSchemas.java @@ -249,7 +253,6 @@ ./clients/client-java/src/main/java/org/apache/gravitino/client/OAuth2ClientUtil.java ./iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/IcebergExceptionMapper.java ./iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/utils/IcebergHiveCachedClientPool.java - ./gradlew Apache Paimon ./catalogs/catalog-lakehouse-paimon/src/main/java/org/apache/gravitino/catalog/lakehouse/paimon/utils/TypeUtils.java diff --git a/dev/release/release-build.sh b/dev/release/release-build.sh index d6ae00038d..c2ff5b6bae 100755 --- a/dev/release/release-build.sh +++ b/dev/release/release-build.sh @@ -339,7 +339,7 @@ if [[ "$1" == "publish-release" ]]; then pushd $tmp_repo/org/apache/gravitino # Remove any extra files generated during install - find . -type f |grep -v \.jar |grep -v \.pom |grep -v cyclonedx | xargs rm + find . -type f |grep -v \.jar |grep -v \.pom |grep -v cyclonedx | grep -v \.module | xargs rm echo "Creating hash and signature files" # this must have .asc, .md5 and .sha1 - it really doesn't like anything else there diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3f788ef6b5..18ed075b49 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -16,6 +16,7 @@ # specific language governing permissions and limitations # under the License. # +# Refer from https://github.com/gradle/gradle/blob/master/gradle/wrapper/gradle-wrapper.properties distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists # checksum was taken from https://gradle.org/release-checksums diff --git a/gradlew b/gradlew index cc4d977167..23efc17bab 100755 --- a/gradlew +++ b/gradlew @@ -62,6 +62,8 @@ # ############################################################################## +# Refer from https://github.com/gradle/gradle/blob/master/gradlew + # Attempt to set APP_HOME # Resolve links: $0 may be a link