You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2021/07/19 12:28:11 UTC
[incubator-inlong] branch master updated: [INLONG-761] unify all
modules target files to a singe directory (#563)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new e3e8b47 [INLONG-761] unify all modules target files to a singe directory (#563)
e3e8b47 is described below
commit e3e8b47701c4d7a7409fd879bf09b34045380616
Author: dockerzhang <do...@apache.org>
AuthorDate: Mon Jul 19 20:28:02 2021 +0800
[INLONG-761] unify all modules target files to a singe directory (#563)
Co-authored-by: dockerzhang <do...@tencent.com>
---
inlong-agent/agent-release/package.xml | 1 -
.../dataproxy-dist/src/main/assembly/bin.xml | 5 +-
inlong-distribution/distribution.xml | 75 ++++++++++++++++++++++
inlong-distribution/pom.xml | 68 ++++++++++++++++++++
inlong-manager/manager-api/assembly.xml | 3 +-
inlong-manager/manager-openapi/assembly.xml | 3 +-
.../tubemq-manager/src/main/assembly/assembly.xml | 2 +-
.../tubemq-server/src/main/assembly/assembly.xml | 2 +-
pom.xml | 1 +
9 files changed, 149 insertions(+), 11 deletions(-)
diff --git a/inlong-agent/agent-release/package.xml b/inlong-agent/agent-release/package.xml
index 80b6135..3458a7f 100644
--- a/inlong-agent/agent-release/package.xml
+++ b/inlong-agent/agent-release/package.xml
@@ -23,7 +23,6 @@
<id>bin</id>
<formats>
<format>dir</format>
- <format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
diff --git a/inlong-dataproxy/dataproxy-dist/src/main/assembly/bin.xml b/inlong-dataproxy/dataproxy-dist/src/main/assembly/bin.xml
index 70078f0..2c25a19 100644
--- a/inlong-dataproxy/dataproxy-dist/src/main/assembly/bin.xml
+++ b/inlong-dataproxy/dataproxy-dist/src/main/assembly/bin.xml
@@ -26,11 +26,8 @@
<formats>
<format>dir</format>
- <format>tar.gz</format>
</formats>
-
- <baseDirectory>apache-inlong-dataproxy-${project.version}-bin</baseDirectory>
-
+ <includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
diff --git a/inlong-distribution/distribution.xml b/inlong-distribution/distribution.xml
new file mode 100644
index 0000000..afdf832
--- /dev/null
+++ b/inlong-distribution/distribution.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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
+ ~ <p>
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ <p>
+ ~ 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>
+ <id>bin</id>
+
+ <!-- Types of packaging, if there are N, N types of packages will be printed -->
+ <formats>
+ <format>tar.gz</format>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <!-- package InLong-Agent-->
+ <fileSet>
+ <directory>../inlong-agent/agent-release/target/apache-inlong-agent-${project.version}-bin</directory>
+ <outputDirectory>inlong-agent</outputDirectory>
+ </fileSet>
+
+ <!-- package InLong-DataProxy-->
+ <fileSet>
+ <directory>../inlong-dataproxy/dataproxy-dist/target/apache-inlong-dataproxy-${project.version}-bin</directory>
+ <outputDirectory>inlong-dataproxy</outputDirectory>
+ </fileSet>
+
+ <!-- package InLong-Manager API-->
+ <fileSet>
+ <directory>../inlong-manager/manager-api/target/apache-inlong-manager-api-${project.version}-bin</directory>
+ <outputDirectory>inlong-manager-api</outputDirectory>
+ </fileSet>
+
+ <!-- package InLong-Manager OpenAPI-->
+ <fileSet>
+ <directory>../inlong-manager/manager-openapi/target/apache-inlong-manager-openapi-${project.version}-bin</directory>
+ <outputDirectory>inlong-manager-openapi</outputDirectory>
+ </fileSet>
+
+ <!-- package InLong-TubeMQ Server-->
+ <fileSet>
+ <directory>../inlong-tubemq/tubemq-server/target/apache-inlong-tubemq-server-${project.version}-bin</directory>
+ <outputDirectory>inlong-tubemq-server</outputDirectory>
+ </fileSet>
+
+ <!-- package InLong-TubeMQ Manager-->
+ <fileSet>
+ <directory>../inlong-tubemq/tubemq-manager/target/apache-inlong-tubemq-manager-${project.version}-bin</directory>
+ <outputDirectory>inlong-tubemq-manager</outputDirectory>
+ </fileSet>
+
+ <!-- package InLong-Sort-->
+ <fileSet>
+ <directory>../inlong-sort/sort-core/target</directory>
+ <outputDirectory>inlong-sort</outputDirectory>
+ <includes>
+ <include>sort-core-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
diff --git a/inlong-distribution/pom.xml b/inlong-distribution/pom.xml
new file mode 100644
index 0000000..07bb507
--- /dev/null
+++ b/inlong-distribution/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+// 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.
+-->
+
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>inlong</artifactId>
+ <version>0.9.0-incubating</version>
+ </parent>
+
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>inlong-distribution</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache InLong - Distribution</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <finalName>apache-${project.artifactId}-${project.version}</finalName>
+ <descriptors>
+ <descriptor>distribution.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>inlong-agent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
diff --git a/inlong-manager/manager-api/assembly.xml b/inlong-manager/manager-api/assembly.xml
index 1866441..94c7a0d 100755
--- a/inlong-manager/manager-api/assembly.xml
+++ b/inlong-manager/manager-api/assembly.xml
@@ -21,11 +21,10 @@
<!-- Types of packaging, if there are N, N types of packages will be printed -->
<formats>
- <format>tar.gz</format>
<format>dir</format>
</formats>
- <includeBaseDirectory>true</includeBaseDirectory>
+ <includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<!--
diff --git a/inlong-manager/manager-openapi/assembly.xml b/inlong-manager/manager-openapi/assembly.xml
index 1866441..94c7a0d 100755
--- a/inlong-manager/manager-openapi/assembly.xml
+++ b/inlong-manager/manager-openapi/assembly.xml
@@ -21,11 +21,10 @@
<!-- Types of packaging, if there are N, N types of packages will be printed -->
<formats>
- <format>tar.gz</format>
<format>dir</format>
</formats>
- <includeBaseDirectory>true</includeBaseDirectory>
+ <includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<!--
diff --git a/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml b/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml
index b10ad73..48537cf 100644
--- a/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml
+++ b/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml
@@ -21,8 +21,8 @@
<id>bin</id>
<formats>
<format>dir</format>
- <format>tar.gz</format>
</formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
diff --git a/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml b/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml
index ceb3012..a1cd0de 100644
--- a/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml
+++ b/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml
@@ -19,8 +19,8 @@
<id>bin</id>
<formats>
<format>dir</format>
- <format>tar.gz</format>
</formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<useProjectArtifact>true</useProjectArtifact>
diff --git a/pom.xml b/pom.xml
index d9a34e2..9bda7ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
<module>inlong-agent</module>
<module>inlong-manager</module>
<module>inlong-sort</module>
+ <module>inlong-distribution</module>
</modules>
<properties>