This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 58e474f8ef1 [revert](jni) revert part of #32455 (#32904)
58e474f8ef1 is described below
commit 58e474f8ef1846e999135fbd3908d9bc8bd370fd
Author: Mingyu Chen <[email protected]>
AuthorDate: Wed Mar 27 22:36:18 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 +++++
.../src/main/resources/package.xml | 17 ++++-------------
7 files changed, 69 insertions(+), 53 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>
diff --git
a/fe/be-java-extensions/trino-connector-scanner/src/main/resources/package.xml
b/fe/be-java-extensions/trino-connector-scanner/src/main/resources/package.xml
index 98fb269a547..c4f838e54d1 100644
---
a/fe/be-java-extensions/trino-connector-scanner/src/main/resources/package.xml
+++
b/fe/be-java-extensions/trino-connector-scanner/src/main/resources/package.xml
@@ -23,20 +23,11 @@ under the License.
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>**/*.class</include>
- </includes>
- </fileSet>
- </fileSets>
- <!--dependencySets>
+ <dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
- <unpack>false</unpack>
+ <unpack>true</unpack>
<scope>runtime</scope>
<unpackOptions>
<excludes>
@@ -44,5 +35,5 @@ under the License.
</excludes>
</unpackOptions>
</dependencySet>
- </dependencySets-->
-</assembly>
+ </dependencySets>
+</assembly>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
