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 12:59:59 UTC
[incubator-iotdb] branch master updated (eef4f0a -> bbb8b4b)
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from eef4f0a fix link problem
add 9b35595 - Nothing is built outside the target directory anymore o I moved the static parts of the client and server distributions to “src/assembly/resources” and added an assembly that builds the client and server inside the target directory (You need to update the documentation on this) o The sever is now available at server/target/iotdb-server-0.9.0-SNAPSHOT o The client is now available at client/target/iotdb-client-0.9.0-SNAPSHOT o I updated the integration tests to work wit [...]
new bbb8b4b Merge pull request #332 from apache/feature/clean-up-maven-build
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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(-)
copy server/iotdb/conf/logback-tool.xml => client/src/assembly/client.xml (63%)
rename client/{cli => src/assembly/resources}/sbin/start-client.bat (100%)
rename client/{cli => src/assembly/resources}/sbin/start-client.sh (100%)
rename client/{cli => src/assembly/resources}/tools/export-csv.bat (100%)
rename client/{cli => src/assembly/resources}/tools/export-csv.sh (100%)
rename client/{cli => src/assembly/resources}/tools/import-csv.bat (100%)
rename client/{cli => src/assembly/resources}/tools/import-csv.sh (100%)
rename server/{iotdb => src/assembly/resources}/conf/iotdb-engine.properties (100%)
rename server/{iotdb => src/assembly/resources}/conf/iotdb-env.bat (100%)
rename server/{iotdb => src/assembly/resources}/conf/iotdb-env.sh (100%)
rename server/{iotdb => src/assembly/resources}/conf/iotdb-sync-client.properties (100%)
copy server/{iotdb => src/assembly/resources}/conf/logback-tool.xml (100%)
rename server/{iotdb => src/assembly/resources}/conf/logback.xml (100%)
rename server/{iotdb => src/assembly/resources}/conf/tsfile-format.properties (100%)
rename server/{iotdb => src/assembly/resources}/sbin/start-server.bat (100%)
rename server/{iotdb => src/assembly/resources}/sbin/start-server.sh (100%)
rename server/{iotdb => src/assembly/resources}/sbin/stop-server.bat (100%)
rename server/{iotdb => src/assembly/resources}/sbin/stop-server.sh (100%)
rename server/{iotdb => src/assembly/resources}/tools/memory-tool.bat (100%)
rename server/{iotdb => src/assembly/resources}/tools/memory-tool.sh (100%)
rename server/{iotdb => src/assembly/resources}/tools/start-WalChecker.bat (100%)
rename server/{iotdb => src/assembly/resources}/tools/start-WalChecker.sh (100%)
rename server/{iotdb => src/assembly/resources}/tools/start-sync-client.bat (100%)
rename server/{iotdb => src/assembly/resources}/tools/start-sync-client.sh (100%)
rename server/{iotdb => src/assembly/resources}/tools/stop-sync-client.bat (100%)
rename server/{iotdb => src/assembly/resources}/tools/stop-sync-client.sh (100%)
rename server/{iotdb/conf/logback-tool.xml => src/assembly/server.xml} (63%)
[incubator-iotdb] 01/01: Merge pull request #332 from
apache/feature/clean-up-maven-build
Posted by jf...@apache.org.
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(-)