-
Notifications
You must be signed in to change notification settings - Fork 380
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into iceberg-rest
- Loading branch information
Showing
61 changed files
with
969 additions
and
199 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * 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.jengelman.gradle.plugins.shadow.tasks.ShadowJar | ||
|
|
||
| plugins { | ||
| `maven-publish` | ||
| id("java") | ||
| alias(libs.plugins.shadow) | ||
| } | ||
|
|
||
| dependencies { | ||
| compileOnly(project(":api")) | ||
| compileOnly(project(":catalogs:catalog-common")) | ||
| compileOnly(project(":catalogs:catalog-hadoop")) | ||
| compileOnly(project(":core")) | ||
| compileOnly(libs.hadoop3.client.api) | ||
| compileOnly(libs.hadoop3.client.runtime) | ||
| compileOnly(libs.hadoop3.oss) | ||
|
|
||
| implementation(project(":catalogs:catalog-common")) { | ||
| exclude("*") | ||
| } | ||
| implementation(project(":catalogs:hadoop-common")) { | ||
| exclude("*") | ||
| } | ||
|
|
||
| implementation(libs.aliyun.credentials.sdk) | ||
| implementation(libs.commons.collections3) | ||
|
|
||
| // oss needs StringUtils from commons-lang3 or the following error will occur in 3.3.0 | ||
| // java.lang.NoClassDefFoundError: org/apache/commons/lang3/StringUtils | ||
| // org.apache.hadoop.fs.aliyun.oss.AliyunOSSFileSystemStore.initialize(AliyunOSSFileSystemStore.java:111) | ||
| // org.apache.hadoop.fs.aliyun.oss.AliyunOSSFileSystem.initialize(AliyunOSSFileSystem.java:323) | ||
| // org.apache.hadoop.fs.FileSystem.createFileSystem(FileSystem.java:3611) | ||
| implementation(libs.commons.lang3) | ||
| implementation(libs.guava) | ||
|
|
||
| implementation(libs.httpclient) | ||
| implementation(libs.jackson.databind) | ||
| implementation(libs.jackson.annotations) | ||
| implementation(libs.jackson.datatype.jdk8) | ||
| implementation(libs.jackson.datatype.jsr310) | ||
|
|
||
| // Aliyun oss SDK depends on this package, and JDK >= 9 requires manual add | ||
| // https://www.alibabacloud.com/help/en/oss/developer-reference/java-installation?spm=a2c63.p38356.0.i1 | ||
| implementation(libs.sun.activation) | ||
| } | ||
|
|
||
| tasks.withType(ShadowJar::class.java) { | ||
| isZip64 = true | ||
| configurations = listOf(project.configurations.runtimeClasspath.get()) | ||
| archiveClassifier.set("") | ||
| mergeServiceFiles() | ||
|
|
||
| // Relocate dependencies to avoid conflicts | ||
| relocate("org.jdom", "org.apache.gravitino.aliyun.shaded.org.jdom") | ||
| relocate("org.apache.commons.lang3", "org.apache.gravitino.aliyun.shaded.org.apache.commons.lang3") | ||
| relocate("com.fasterxml.jackson", "org.apache.gravitino.aliyun.shaded.com.fasterxml.jackson") | ||
| relocate("com.google.common", "org.apache.gravitino.aliyun.shaded.com.google.common") | ||
| relocate("org.apache.http", "org.apache.gravitino.aliyun.shaded.org.apache.http") | ||
| relocate("org.apache.commons.collections", "org.apache.gravitino.aliyun.shaded.org.apache.commons.collections") | ||
| } | ||
|
|
||
| tasks.jar { | ||
| dependsOn(tasks.named("shadowJar")) | ||
| archiveClassifier.set("empty") | ||
| } | ||
|
|
||
| tasks.compileJava { | ||
| dependsOn(":catalogs:catalog-hadoop:runtimeJars") | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * 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.jengelman.gradle.plugins.shadow.tasks.ShadowJar | ||
|
|
||
| plugins { | ||
| `maven-publish` | ||
| id("java") | ||
| alias(libs.plugins.shadow) | ||
| } | ||
|
|
||
| dependencies { | ||
| compileOnly(project(":api")) | ||
| compileOnly(project(":catalogs:catalog-common")) | ||
| compileOnly(project(":catalogs:catalog-hadoop")) | ||
| compileOnly(project(":core")) | ||
| compileOnly(libs.hadoop3.aws) | ||
| compileOnly(libs.hadoop3.client.api) | ||
| compileOnly(libs.hadoop3.client.runtime) | ||
|
|
||
| implementation(project(":catalogs:catalog-common")) { | ||
| exclude("*") | ||
| } | ||
| implementation(project(":catalogs:hadoop-common")) { | ||
| exclude("*") | ||
| } | ||
|
|
||
| implementation(libs.aws.iam) | ||
| implementation(libs.aws.policy) | ||
| implementation(libs.aws.sts) | ||
| implementation(libs.commons.lang3) | ||
| implementation(libs.hadoop3.aws) | ||
| implementation(libs.guava) | ||
| } | ||
|
|
||
| tasks.withType(ShadowJar::class.java) { | ||
| isZip64 = true | ||
| configurations = listOf(project.configurations.runtimeClasspath.get()) | ||
| archiveClassifier.set("") | ||
|
|
||
| relocate("org.apache.commons.lang3", "org.apache.gravitino.aws.shaded.org.apache.commons.lang3") | ||
| relocate("com.google.common", "org.apache.gravitino.aws.shaded.com.google.common") | ||
| relocate("com.fasterxml.jackson", "org.apache.gravitino.aws.shaded.com.fasterxml.jackson") | ||
| } | ||
|
|
||
| tasks.jar { | ||
| dependsOn(tasks.named("shadowJar")) | ||
| archiveClassifier.set("empty") | ||
| } | ||
|
|
||
| tasks.compileJava { | ||
| dependsOn(":catalogs:catalog-hadoop:runtimeJars") | ||
| } |
File renamed without changes.
File renamed without changes.
Oops, something went wrong.