This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 2ced0e1 [IOTDB-1110] the assembly descriptor of the cluster module
contains / (#2496)
2ced0e1 is described below
commit 2ced0e1a3bd0127364fa9d7ab7729790c35b2bd2
Author: wangchao316 <[email protected]>
AuthorDate: Fri Jan 15 00:25:02 2021 +0800
[IOTDB-1110] the assembly descriptor of the cluster module contains /
(#2496)
---
cluster/pom.xml | 6 ++++--
cluster/src/assembly/cluster.xml | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/cluster/pom.xml b/cluster/pom.xml
index 5529690..251c310 100644
--- a/cluster/pom.xml
+++ b/cluster/pom.xml
@@ -20,12 +20,13 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
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>
- <artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
+ <artifactId>iotdb-parent</artifactId>
<version>0.12.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>cluster</artifactId>
<name>cluster</name>
<properties>
@@ -168,6 +169,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.version}</version>
<executions>
<!-- Package binaries-->
<execution>
diff --git a/cluster/src/assembly/cluster.xml b/cluster/src/assembly/cluster.xml
index 5c0c581..9fa6af5 100644
--- a/cluster/src/assembly/cluster.xml
+++ b/cluster/src/assembly/cluster.xml
@@ -17,11 +17,11 @@
<fileSets>
<fileSet>
<directory>src/assembly/resources</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${file.separator}</outputDirectory>
</fileSet>
<fileSet>
<directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${file.separator}</outputDirectory>
</fileSet>
</fileSets>
</assembly>
