You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2024/03/27 13:09:45 UTC
(doris) 02/02: [revert](jni) revert part of #32455 #32904
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 9c6180d9baa52548b0994e3e98b86e76ef968b9b
Author: morningman <mo...@163.com>
AuthorDate: Wed Mar 27 18:20:39 2024 +0800
[revert](jni) revert part of #32455 #32904
---
.../hudi-scanner/src/main/resources/package.xml | 20 ++++++++++++--------
.../java-common/src/main/resources/package.xml | 20 ++++++++++++--------
.../jdbc-scanner/src/main/resources/package.xml | 20 ++++++++++++--------
.../src/main/resources/package.xml | 20 ++++++++++++--------
.../paimon-scanner/src/main/resources/package.xml | 20 ++++++++++++--------
.../src/main/resources/package-deps.xml | 5 +++++
6 files changed, 65 insertions(+), 40 deletions(-)
diff --git a/fe/be-java-extensions/hudi-scanner/src/main/resources/package.xml b/fe/be-java-extensions/hudi-scanner/src/main/resources/package.xml
index 206b7d3a7ca..4bbb2610603 100644
--- a/fe/be-java-extensions/hudi-scanner/src/main/resources/package.xml
+++ b/fe/be-java-extensions/hudi-scanner/src/main/resources/package.xml
@@ -25,13 +25,17 @@ under the License.
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
+ <dependencySets>
+ <dependencySet>
<outputDirectory>/</outputDirectory>
- <includes>
- <include>**/*.class</include>
- </includes>
- </fileSet>
- </fileSets>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/Log4j2Plugins.dat</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
</assembly>
diff --git a/fe/be-java-extensions/java-common/src/main/resources/package.xml b/fe/be-java-extensions/java-common/src/main/resources/package.xml
index 206b7d3a7ca..4bbb2610603 100644
--- a/fe/be-java-extensions/java-common/src/main/resources/package.xml
+++ b/fe/be-java-extensions/java-common/src/main/resources/package.xml
@@ -25,13 +25,17 @@ under the License.
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
+ <dependencySets>
+ <dependencySet>
<outputDirectory>/</outputDirectory>
- <includes>
- <include>**/*.class</include>
- </includes>
- </fileSet>
- </fileSets>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/Log4j2Plugins.dat</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
</assembly>
diff --git a/fe/be-java-extensions/jdbc-scanner/src/main/resources/package.xml b/fe/be-java-extensions/jdbc-scanner/src/main/resources/package.xml
index 206b7d3a7ca..4bbb2610603 100644
--- a/fe/be-java-extensions/jdbc-scanner/src/main/resources/package.xml
+++ b/fe/be-java-extensions/jdbc-scanner/src/main/resources/package.xml
@@ -25,13 +25,17 @@ under the License.
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
+ <dependencySets>
+ <dependencySet>
<outputDirectory>/</outputDirectory>
- <includes>
- <include>**/*.class</include>
- </includes>
- </fileSet>
- </fileSets>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/Log4j2Plugins.dat</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
</assembly>
diff --git a/fe/be-java-extensions/max-compute-scanner/src/main/resources/package.xml b/fe/be-java-extensions/max-compute-scanner/src/main/resources/package.xml
index 206b7d3a7ca..4bbb2610603 100644
--- a/fe/be-java-extensions/max-compute-scanner/src/main/resources/package.xml
+++ b/fe/be-java-extensions/max-compute-scanner/src/main/resources/package.xml
@@ -25,13 +25,17 @@ under the License.
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
+ <dependencySets>
+ <dependencySet>
<outputDirectory>/</outputDirectory>
- <includes>
- <include>**/*.class</include>
- </includes>
- </fileSet>
- </fileSets>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/Log4j2Plugins.dat</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
</assembly>
diff --git a/fe/be-java-extensions/paimon-scanner/src/main/resources/package.xml b/fe/be-java-extensions/paimon-scanner/src/main/resources/package.xml
index 206b7d3a7ca..4bbb2610603 100644
--- a/fe/be-java-extensions/paimon-scanner/src/main/resources/package.xml
+++ b/fe/be-java-extensions/paimon-scanner/src/main/resources/package.xml
@@ -25,13 +25,17 @@ under the License.
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
+ <dependencySets>
+ <dependencySet>
<outputDirectory>/</outputDirectory>
- <includes>
- <include>**/*.class</include>
- </includes>
- </fileSet>
- </fileSets>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/Log4j2Plugins.dat</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
</assembly>
diff --git a/fe/be-java-extensions/preload-extensions/src/main/resources/package-deps.xml b/fe/be-java-extensions/preload-extensions/src/main/resources/package-deps.xml
index 3ace22a7870..1fe322c0bf3 100644
--- a/fe/be-java-extensions/preload-extensions/src/main/resources/package-deps.xml
+++ b/fe/be-java-extensions/preload-extensions/src/main/resources/package-deps.xml
@@ -31,6 +31,11 @@ under the License.
<useProjectArtifact>false</useProjectArtifact>
<unpack>true</unpack>
<scope>runtime</scope>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/Log4j2Plugins.dat</exclude>
+ </excludes>
+ </unpackOptions>
</dependencySet>
</dependencySets>
</assembly>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org