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 d02f11296 [AMORO-3302] Make plugin jar optional for packing (#3305)
d02f11296 is described below
commit d02f11296a4e66ad88b038294e11a1cfa7784966
Author: Congxian Qiu <[email protected]>
AuthorDate: Tue Oct 29 11:42:33 2024 +0800
[AMORO-3302] Make plugin jar optional for packing (#3305)
(cherry picked from commit 1d9de041550b3591bc0cf52c1e6024bc56984e32)
Signed-off-by: zhoujinsong <[email protected]>
---
amoro-ams/dist/pom.xml | 14 +++-
amoro-ams/dist/src/main/assemblies/release-bin.xml | 98 ++++++++++++++++++++++
2 files changed, 111 insertions(+), 1 deletion(-)
diff --git a/amoro-ams/dist/pom.xml b/amoro-ams/dist/pom.xml
index 046b0bb1e..e671e85ad 100644
--- a/amoro-ams/dist/pom.xml
+++ b/amoro-ams/dist/pom.xml
@@ -30,6 +30,10 @@
<name>Amoro Project AMS Dist</name>
<url>https://amoro.apache.org</url>
+ <properties>
+
<assembly.descriptor.file>src/main/assemblies/bin.xml</assembly.descriptor.file>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.amoro</groupId>
@@ -76,7 +80,7 @@
<phase>package</phase>
<configuration>
<descriptors>
-
<descriptor>src/main/assemblies/bin.xml</descriptor>
+
<descriptor>${assembly.descriptor.file}</descriptor>
</descriptors>
<finalName>apache-amoro-${project.version}-bin</finalName>
<appendAssemblyId>false</appendAssemblyId>
@@ -94,4 +98,12 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>no-plugin-bin</id>
+ <properties>
+
<assembly.descriptor.file>src/main/assemblies/release-bin.xml</assembly.descriptor.file>
+ </properties>
+ </profile>
+ </profiles>
</project>
diff --git a/amoro-ams/dist/src/main/assemblies/release-bin.xml
b/amoro-ams/dist/src/main/assemblies/release-bin.xml
new file mode 100644
index 000000000..23d8ba12d
--- /dev/null
+++ b/amoro-ams/dist/src/main/assemblies/release-bin.xml
@@ -0,0 +1,98 @@
+<!--
+ ~ 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.
+ -->
+<assembly
+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>amoro-${project.version}</baseDirectory>
+
+ <files>
+ <file>
+
<source>../amoro-ams/target/amoro-ams-${project.version}.jar</source>
+ <outputDirectory>lib/</outputDirectory>
+ <destName>amoro-ams-${project.version}.jar</destName>
+ <fileMode>0644</fileMode>
+ </file>
+ <file>
+ <source>src/main/amoro-bin/conf/env.sh</source>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>0755</fileMode>
+ </file>
+ <file>
+ <source>../LICENSE-binary</source>
+ <outputDirectory/>
+ <destName>LICENSE</destName>
+ <fileMode>0644</fileMode>
+ </file>
+ <file>
+ <source>../NOTICE-binary</source>
+ <outputDirectory/>
+ <destName>NOTICE</destName>
+ <fileMode>0644</fileMode>
+ </file>
+ <file>
+ <source>../DISCLAIMER</source>
+ <outputDirectory/>
+ <fileMode>0644</fileMode>
+ </file>
+ </files>
+ <fileSets>
+ <fileSet>
+ <directory>../licenses-binary</directory>
+ <outputDirectory>licenses</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/amoro-bin/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/amoro-bin/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../amoro-ams/src/main/resources/mysql</directory>
+ <outputDirectory>conf/mysql</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../amoro-ams/src/main/resources/postgres</directory>
+ <outputDirectory>conf/postgres</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../amoro-ams/src/main/resources/derby</directory>
+ <outputDirectory>conf/derby</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../amoro-ams/target/amoro-ams-dependency/lib</directory>
+ <outputDirectory>lib/</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ </fileSets>
+</assembly>