This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch opt_distri in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 395ebf9aeea40555f0b8b0e258baa7be61b879db Author: HTHou <[email protected]> AuthorDate: Tue Jun 28 10:54:52 2022 +0800 Remove grafana connector and rename server to datanode in distribution package --- distribution/pom.xml | 6 ++---- distribution/src/assembly/all.xml | 12 ------------ distribution/src/assembly/{server.xml => datanode.xml} | 2 +- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index c9bd405b0d..8afdbf586c 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -47,10 +47,9 @@ <configuration> <descriptors> <descriptor>src/assembly/all.xml</descriptor> - <descriptor>src/assembly/server.xml</descriptor> + <descriptor>src/assembly/datanode.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> <descriptor>src/assembly/grafana-plugin.xml</descriptor> <descriptor>src/assembly/library-udf.xml</descriptor> @@ -84,10 +83,9 @@ <directory>${project.build.directory}</directory> <includes> <include>apache-iotdb-${project.version}-all-bin.zip</include> - <include>apache-iotdb-${project.version}-server-bin.zip</include> + <include>apache-iotdb-${project.version}-datanode-bin.zip</include> <include>apache-iotdb-${project.version}-cli-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> <include>apache-iotdb-${project.version}-library-udf-bin.zip</include> diff --git a/distribution/src/assembly/all.xml b/distribution/src/assembly/all.xml index aa17f03e5d..e5909b2415 100644 --- a/distribution/src/assembly/all.xml +++ b/distribution/src/assembly/all.xml @@ -44,14 +44,6 @@ </excludes> </unpackOptions> </dependencySet> - <dependencySet> - <includes> - <include>*:iotdb-grafana-connector:war:*</include> - </includes> - <outputDirectory>tools/grafana/</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - <unpack>false</unpack> - </dependencySet> </dependencySets> <fileSets> <fileSet> @@ -113,10 +105,6 @@ </fileSet> </fileSets> <files> - <file> - <source>${maven.multiModuleProjectDirectory}/grafana-connector/src/main/resources/application.properties</source> - <destName>tools/grafana/application.properties</destName> - </file> <file> <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/datanode-env.sh</source> <destName>datanode/conf/datanode-env.sh</destName> diff --git a/distribution/src/assembly/server.xml b/distribution/src/assembly/datanode.xml similarity index 99% rename from distribution/src/assembly/server.xml rename to distribution/src/assembly/datanode.xml index e774d89711..0b923afa83 100644 --- a/distribution/src/assembly/server.xml +++ b/distribution/src/assembly/datanode.xml @@ -20,7 +20,7 @@ --> <assembly> - <id>server-bin</id> + <id>datanode-bin</id> <formats> <format>dir</format> <format>zip</format>
