You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/05/11 01:38:08 UTC
[iotdb] 01/01: add confignode to distribution package
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch addConfigNode
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1976184b634bb30676ed34d536696af1dc7da15b
Author: HTHou <hh...@outlook.com>
AuthorDate: Wed May 11 09:37:52 2022 +0800
add confignode to distribution package
---
distribution/pom.xml | 8 ++++++++
testcontainer/pom.xml | 52 +++++++++++++++++++++++++--------------------------
2 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 041d1d0c65..54e1f258d8 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -49,6 +49,7 @@
<descriptor>src/assembly/all.xml</descriptor>
<descriptor>src/assembly/server.xml</descriptor>
<!--descriptor>src/assembly/cluster.xml</descriptor-->
+ <descriptor>src/assembly/confignode.xml</descriptor>
<descriptor>src/assembly/cli.xml</descriptor>
<descriptor>src/assembly/grafana-connector.xml</descriptor>
<descriptor>src/assembly/client-cpp.xml</descriptor>
@@ -86,6 +87,7 @@
<include>apache-iotdb-${project.version}-server-bin.zip</include>
<include>apache-iotdb-${project.version}-cli-bin.zip</include>
<!--include>apache-iotdb-${project.version}-cluster-bin.zip</include-->
+ <include>apache-iotdb-${project.version}-confignode-bin.zip</include>
<include>apache-iotdb-${project.version}-grafana-connector-bin.zip</include>
<include>apache-iotdb-${project.version}-client-cpp-${os.classifier}-bin.zip</include>
<include>apache-iotdb-${project.version}-grafana-plugin-bin.zip</include>
@@ -129,6 +131,12 @@
<!-- <version>${project.version}</version>-->
<!-- <type>zip</type>-->
<!-- </dependency>-->
+ <dependency>
+ <groupId>org.apache.iotdb</groupId>
+ <artifactId>iotdb-confignode</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>client-cpp</artifactId>
diff --git a/testcontainer/pom.xml b/testcontainer/pom.xml
index e3067d56ab..debb00e7db 100644
--- a/testcontainer/pom.xml
+++ b/testcontainer/pom.xml
@@ -33,8 +33,8 @@
<docker.build.executable>docker</docker.build.executable>
<docker.build.single.argument>build -t apache/iotdb:maven-development -f ${basedir}/../docker/src/main/Dockerfile-single ${basedir}/../.</docker.build.single.argument>
<docker.clean.single.argument>image rm apache/iotdb:maven-development</docker.clean.single.argument>
-<!-- <docker.build.cluster.argument>build -t apache/iotdb:cluster-maven-development -f ${basedir}/../docker/src/main/Dockerfile-cluster ${basedir}/../.</docker.build.cluster.argument>-->
-<!-- <docker.clean.cluster.argument>image rm apache/iotdb:cluster-maven-development</docker.clean.cluster.argument>-->
+ <!-- <docker.build.cluster.argument>build -t apache/iotdb:cluster-maven-development -f ${basedir}/../docker/src/main/Dockerfile-cluster ${basedir}/../.</docker.build.cluster.argument>-->
+ <!-- <docker.clean.cluster.argument>image rm apache/iotdb:cluster-maven-development</docker.clean.cluster.argument>-->
<docker.build.sync.argument>build -t apache/iotdb:sync-maven-development -f ${basedir}/../docker/src/main/Dockerfile-single-tc ${basedir}/../.</docker.build.sync.argument>
<docker.clean.sync.argument>image rm apache/iotdb:sync-maven-development</docker.clean.sync.argument>
</properties>
@@ -90,18 +90,18 @@
<commandlineArgs>${docker.build.single.argument}</commandlineArgs>
</configuration>
</execution>
-<!-- <execution>-->
-<!-- <id>build-cluster-docker-image</id>-->
-<!-- <phase>pre-integration-test</phase>-->
-<!-- <goals>-->
-<!-- <goal>exec</goal>-->
-<!-- </goals>-->
-<!-- <configuration>-->
-<!-- <skip>${docker.test.skip}</skip>-->
-<!-- <executable>${docker.build.executable}</executable>-->
-<!-- <commandlineArgs>${docker.build.cluster.argument}</commandlineArgs>-->
-<!-- </configuration>-->
-<!-- </execution>-->
+ <!-- <execution>-->
+ <!-- <id>build-cluster-docker-image</id>-->
+ <!-- <phase>pre-integration-test</phase>-->
+ <!-- <goals>-->
+ <!-- <goal>exec</goal>-->
+ <!-- </goals>-->
+ <!-- <configuration>-->
+ <!-- <skip>${docker.test.skip}</skip>-->
+ <!-- <executable>${docker.build.executable}</executable>-->
+ <!-- <commandlineArgs>${docker.build.cluster.argument}</commandlineArgs>-->
+ <!-- </configuration>-->
+ <!-- </execution>-->
<execution>
<id>build-sync-docker-image</id>
<phase>pre-integration-test</phase>
@@ -126,18 +126,18 @@
<commandlineArgs>${docker.clean.single.argument}</commandlineArgs>
</configuration>
</execution>
-<!-- <execution>-->
-<!-- <id>clean-cluster-docker-image</id>-->
-<!-- <phase>post-integration-test</phase>-->
-<!-- <goals>-->
-<!-- <goal>exec</goal>-->
-<!-- </goals>-->
-<!-- <configuration>-->
-<!-- <skip>${docker.test.skip}</skip>-->
-<!-- <executable>${docker.build.executable}</executable>-->
-<!-- <commandlineArgs>${docker.clean.cluster.argument}</commandlineArgs>-->
-<!-- </configuration>-->
-<!-- </execution>-->
+ <!-- <execution>-->
+ <!-- <id>clean-cluster-docker-image</id>-->
+ <!-- <phase>post-integration-test</phase>-->
+ <!-- <goals>-->
+ <!-- <goal>exec</goal>-->
+ <!-- </goals>-->
+ <!-- <configuration>-->
+ <!-- <skip>${docker.test.skip}</skip>-->
+ <!-- <executable>${docker.build.executable}</executable>-->
+ <!-- <commandlineArgs>${docker.clean.cluster.argument}</commandlineArgs>-->
+ <!-- </configuration>-->
+ <!-- </execution>-->
<execution>
<id>clean-sync-docker-image</id>
<phase>post-integration-test</phase>