This is an automated email from the ASF dual-hosted git repository.
jinsongzhou pushed a commit to branch 0.7.x
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/0.7.x by this push:
new 65127eac4 [AMORO-3303] Optimize the final tarball to keep it within
the specified size for 0.7 (#3304)
65127eac4 is described below
commit 65127eac41fd7828b13af27f18ea26a556db961b
Author: Congxian Qiu <[email protected]>
AuthorDate: Wed Oct 30 10:30:51 2024 +0800
[AMORO-3303] Optimize the final tarball to keep it within the specified
size for 0.7 (#3304)
* [AMORO-3303] Optimize the final tarball to keep it within the specified
size for 0.7
* fixup! [AMORO-3303] Optimize the final tarball to keep it within the
specified size for 0.7
* fixup! [AMORO-3303] Optimize the final tarball to keep it within the
specified size for 0.7
---
amoro-ams/amoro-ams-server/pom.xml | 4 ++--
amoro-ams/dist/src/main/assemblies/release-bin.xml | 24 +++++++++++-----------
amoro-core/pom.xml | 1 +
.../amoro-mixed-format-flink-common/pom.xml | 7 +++++++
amoro-mixed-format/amoro-mixed-format-hive/pom.xml | 6 ++++++
pom.xml | 12 +++++++++++
6 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/amoro-ams/amoro-ams-server/pom.xml
b/amoro-ams/amoro-ams-server/pom.xml
index 1b4280d18..612af5977 100644
--- a/amoro-ams/amoro-ams-server/pom.xml
+++ b/amoro-ams/amoro-ams-server/pom.xml
@@ -310,14 +310,14 @@
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-s3</artifactId>
- <scope>runtime</scope>
+ <scope>${paimon-dependency-scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-common</artifactId>
<version>${paimon.version}</version>
- <scope>runtime</scope>
+ <scope>${paimon-bundle-scope}</scope>
</dependency>
<!-- test dependencies -->
diff --git a/amoro-ams/dist/src/main/assemblies/release-bin.xml
b/amoro-ams/dist/src/main/assemblies/release-bin.xml
index 23d8ba12d..9d172d4c9 100644
--- a/amoro-ams/dist/src/main/assemblies/release-bin.xml
+++ b/amoro-ams/dist/src/main/assemblies/release-bin.xml
@@ -29,37 +29,37 @@
<files>
<file>
-
<source>../amoro-ams/target/amoro-ams-${project.version}.jar</source>
+
<source>../amoro-ams-server/target/amoro-ams-server-${project.version}.jar</source>
<outputDirectory>lib/</outputDirectory>
- <destName>amoro-ams-${project.version}.jar</destName>
+ <destName>amoro-ams-server-${project.version}.jar</destName>
<fileMode>0644</fileMode>
</file>
<file>
- <source>src/main/amoro-bin/conf/env.sh</source>
+ <source>src/main/amoro-bin/conf/config.yaml</source>
<outputDirectory>conf</outputDirectory>
- <fileMode>0755</fileMode>
+ <fileMode>0644</fileMode>
</file>
<file>
- <source>../LICENSE-binary</source>
+ <source>../../LICENSE-binary</source>
<outputDirectory/>
<destName>LICENSE</destName>
<fileMode>0644</fileMode>
</file>
<file>
- <source>../NOTICE-binary</source>
+ <source>../../NOTICE-binary</source>
<outputDirectory/>
<destName>NOTICE</destName>
<fileMode>0644</fileMode>
</file>
<file>
- <source>../DISCLAIMER</source>
+ <source>../../DISCLAIMER</source>
<outputDirectory/>
<fileMode>0644</fileMode>
</file>
</files>
<fileSets>
<fileSet>
- <directory>../licenses-binary</directory>
+ <directory>../../licenses-binary</directory>
<outputDirectory>licenses</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
@@ -75,22 +75,22 @@
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>../amoro-ams/src/main/resources/mysql</directory>
+ <directory>../amoro-ams-server/src/main/resources/mysql</directory>
<outputDirectory>conf/mysql</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>../amoro-ams/src/main/resources/postgres</directory>
+
<directory>../amoro-ams-server/src/main/resources/postgres</directory>
<outputDirectory>conf/postgres</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>../amoro-ams/src/main/resources/derby</directory>
+ <directory>../amoro-ams-server/src/main/resources/derby</directory>
<outputDirectory>conf/derby</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>../amoro-ams/target/amoro-ams-dependency/lib</directory>
+
<directory>../amoro-ams-server/target/amoro-ams-server-dependency/lib</directory>
<outputDirectory>lib/</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
diff --git a/amoro-core/pom.xml b/amoro-core/pom.xml
index 87efbcbcd..ae9fa5d70 100644
--- a/amoro-core/pom.xml
+++ b/amoro-core/pom.xml
@@ -133,6 +133,7 @@
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-bundle</artifactId>
+ <scope>${paimon-bundle-scope}</scope>
</dependency>
<dependency>
diff --git
a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/pom.xml
b/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/pom.xml
index c54e66f52..d59919540 100644
---
a/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/pom.xml
+++
b/amoro-mixed-format/amoro-mixed-format-flink/amoro-mixed-format-flink-common/pom.xml
@@ -58,6 +58,13 @@
<artifactId>amoro-mixed-format-hive</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.rocksdb</groupId>
+ <artifactId>rocksdbjni</artifactId>
+ <version>${rocksdb.version}</version>
+ <scope>${rocksdb-dependency-scope}</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.amoro</groupId>
<artifactId>amoro-mixed-format-flink-common-iceberg-bridge</artifactId>
diff --git a/amoro-mixed-format/amoro-mixed-format-hive/pom.xml
b/amoro-mixed-format/amoro-mixed-format-hive/pom.xml
index 55f261df3..05c4589f4 100644
--- a/amoro-mixed-format/amoro-mixed-format-hive/pom.xml
+++ b/amoro-mixed-format/amoro-mixed-format-hive/pom.xml
@@ -47,6 +47,12 @@
<artifactId>hive-metastore</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-bundle</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.hive</groupId>
diff --git a/pom.xml b/pom.xml
index 5284900b6..f35f80e8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,9 @@
<rocksdb-dependency-scope>compile</rocksdb-dependency-scope>
<lucene-dependency-scope>compile</lucene-dependency-scope>
+
+ <paimon-dependency-scope>runtime</paimon-dependency-scope>
+ <paimon-bundle-scope>compile</paimon-bundle-scope>
</properties>
<dependencies>
@@ -533,12 +536,14 @@
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-bundle</artifactId>
<version>${paimon.version}</version>
+ <scope>${paimon-dependency-scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-s3</artifactId>
<version>${paimon.version}</version>
+ <scope>${paimon-dependency-scope}</scope>
</dependency>
<dependency>
@@ -1302,5 +1307,12 @@
<lucene-dependency-scope>provided</lucene-dependency-scope>
</properties>
</profile>
+ <profile>
+ <id>no-option-dependency</id>
+ <properties>
+ <paimon-dependency-scope>provided</paimon-dependency-scope>
+ <paimon-bundle-scope>provided</paimon-bundle-scope>
+ </properties>
+ </profile>
</profiles>
</project>
