You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by jf...@apache.org on 2019/08/06 13:00:00 UTC
[incubator-iotdb] 01/01: Merge pull request #332 from
apache/feature/clean-up-maven-build
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit bbb8b4be5b4d6d345c7a7e7af9b4902ef5ecaa6d
Merge: eef4f0a 9b35595
Author: Julian <j....@pragmaticminds.de>
AuthorDate: Tue Aug 6 14:59:54 2019 +0200
Merge pull request #332 from apache/feature/clean-up-maven-build
Major cleanup of the maven-build
.gitignore | 1 -
client/pom.xml | 65 ++--
.../src/assembly/client.xml | 20 +-
.../assembly/resources}/sbin/start-client.bat | 0
.../assembly/resources}/sbin/start-client.sh | 0
.../assembly/resources}/tools/export-csv.bat | 0
.../assembly/resources}/tools/export-csv.sh | 0
.../assembly/resources}/tools/import-csv.bat | 0
.../assembly/resources}/tools/import-csv.sh | 0
.../apache/iotdb/cli/client/AbstractScript.java | 29 +-
.../iotdb/cli/client/StartClientScriptIT.java | 8 +-
.../org/apache/iotdb/cli/tool/ExportCsvTestIT.java | 8 +-
.../org/apache/iotdb/cli/tool/ImportCsvTestIT.java | 8 +-
distribution/pom.xml | 14 +
distribution/src/assembly/distribution.xml | 40 +--
example/kafka/pom.xml | 24 +-
example/pom.xml | 51 ++-
example/rocketmq/pom.xml | 14 +-
grafana/pom.xml | 2 +-
hadoop/pom.xml | 6 +-
jdbc/pom.xml | 15 +-
pom.xml | 386 +++++++++++++++++++--
server/pom.xml | 85 ++---
.../resources}/conf/iotdb-engine.properties | 0
.../assembly/resources}/conf/iotdb-env.bat | 0
.../assembly/resources}/conf/iotdb-env.sh | 0
.../resources}/conf/iotdb-sync-client.properties | 0
.../assembly/resources}/conf/logback-tool.xml | 0
.../assembly/resources}/conf/logback.xml | 0
.../resources}/conf/tsfile-format.properties | 0
.../assembly/resources}/sbin/start-server.bat | 0
.../assembly/resources}/sbin/start-server.sh | 0
.../assembly/resources}/sbin/stop-server.bat | 0
.../assembly/resources}/sbin/stop-server.sh | 0
.../assembly/resources}/tools/memory-tool.bat | 0
.../assembly/resources}/tools/memory-tool.sh | 0
.../assembly/resources}/tools/start-WalChecker.bat | 0
.../assembly/resources}/tools/start-WalChecker.sh | 0
.../resources}/tools/start-sync-client.bat | 0
.../assembly/resources}/tools/start-sync-client.sh | 0
.../assembly/resources}/tools/stop-sync-client.bat | 0
.../assembly/resources}/tools/stop-sync-client.sh | 0
.../logback-tool.xml => src/assembly/server.xml} | 20 +-
.../org/apache/iotdb/db/script/EnvScriptIT.java | 34 +-
spark-tsfile/pom.xml | 32 +-
.../org/apache/iotdb/tsfile/HDFSInputTest.java | 2 +-
tsfile/pom.xml | 3 -
47 files changed, 597 insertions(+), 270 deletions(-)