提交 efe1e809 编写于 作者: H Hongze Cheng

Merge branch 'develop' into feature/2.0tsdb

{ {
"name": "TDengine", "name": "TDengine",
"private": false, "private": false,
"version": "1.0.0", "version": "2.0.0",
"description": "grafana datasource plugin for tdengine", "description": "grafana datasource plugin for tdengine",
"scripts": { "scripts": {
"build": "./node_modules/grunt-cli/bin/grunt", "build": "./node_modules/grunt-cli/bin/grunt",
......
...@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED) ...@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME} ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME}
POST_BUILD POST_BUILD
COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-1.0.3-dist.jar ${LIBRARY_OUTPUT_PATH} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.0-dist.jar ${LIBRARY_OUTPUT_PATH}
COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
COMMENT "build jdbc driver") COMMENT "build jdbc driver")
ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME}) ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME})
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.taosdata.jdbc</groupId> <groupId>com.taosdata.jdbc</groupId>
<artifactId>taos-jdbcdriver</artifactId> <artifactId>taos-jdbcdriver</artifactId>
<version>1.0.3</version> <version>2.0.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>JDBCDriver</name> <name>JDBCDriver</name>
<url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url> <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
......
...@@ -8,7 +8,7 @@ import java.util.Properties; ...@@ -8,7 +8,7 @@ import java.util.Properties;
public class TestAsyncTSDBSubscribe { public class TestAsyncTSDBSubscribe {
public static void main(String[] args) throws SQLException { public static void main(String[] args) throws SQLException {
String usage = "java -cp taos-jdbcdriver-1.0.3_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName -topic topicName " + String usage = "java -cp taos-jdbcdriver-2.0.0_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName -topic topicName " +
"-tname tableName -h host"; "-tname tableName -h host";
if (args.length < 2) { if (args.length < 2) {
System.err.println(usage); System.err.println(usage);
......
...@@ -10,7 +10,7 @@ import java.util.Properties; ...@@ -10,7 +10,7 @@ import java.util.Properties;
public class TestTSDBSubscribe { public class TestTSDBSubscribe {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
String usage = "java -cp taos-jdbcdriver-1.0.3_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName " + String usage = "java -cp taos-jdbcdriver-2.0.0_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName " +
"-topic topicName -tname tableName -h host"; "-topic topicName -tname tableName -h host";
if (args.length < 2) { if (args.length < 2) {
System.err.println(usage); System.err.println(usage);
......
{ {
"name": "td-connector", "name": "td-connector",
"version": "1.6.1", "version": "2.0.0",
"description": "A Node.js connector for TDengine.", "description": "A Node.js connector for TDengine.",
"main": "tdengine.js", "main": "tdengine.js",
"scripts": { "scripts": {
......
...@@ -5,7 +5,7 @@ with open("README.md", "r") as fh: ...@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools.setup( setuptools.setup(
name="taos", name="taos",
version="1.4.15", version="2.0.0",
author="Taosdata Inc.", author="Taosdata Inc.",
author_email="support@taosdata.com", author_email="support@taosdata.com",
description="TDengine python client package", description="TDengine python client package",
......
Metadata-Version: 2.1 Metadata-Version: 2.1
Name: taos Name: taos
Version: 1.4.15 Version: 2.0.0
Summary: TDengine python client package Summary: TDengine python client package
Home-page: https://github.com/pypa/sampleproject Home-page: https://github.com/pypa/sampleproject
Author: Taosdata Inc. Author: Taosdata Inc.
......
...@@ -5,7 +5,7 @@ with open("README.md", "r") as fh: ...@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools.setup( setuptools.setup(
name="taos", name="taos",
version="1.4.15", version="2.0.0",
author="Taosdata Inc.", author="Taosdata Inc.",
author_email="support@taosdata.com", author_email="support@taosdata.com",
description="TDengine python client package", description="TDengine python client package",
......
Metadata-Version: 2.1 Metadata-Version: 2.1
Name: taos Name: taos
Version: 1.4.15 Version: 2.0.0
Summary: TDengine python client package Summary: TDengine python client package
Home-page: https://github.com/pypa/sampleproject Home-page: https://github.com/pypa/sampleproject
Author: Taosdata Inc. Author: Taosdata Inc.
......
...@@ -5,7 +5,7 @@ with open("README.md", "r") as fh: ...@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools.setup( setuptools.setup(
name="taos", name="taos",
version="1.4.15", version="2.0.0",
author="Taosdata Inc.", author="Taosdata Inc.",
author_email="support@taosdata.com", author_email="support@taosdata.com",
description="TDengine python client package", description="TDengine python client package",
......
Metadata-Version: 2.1 Metadata-Version: 2.1
Name: taos Name: taos
Version: 1.4.15 Version: 2.0.0
Summary: TDengine python client package Summary: TDengine python client package
Home-page: https://github.com/pypa/sampleproject Home-page: https://github.com/pypa/sampleproject
Author: Taosdata Inc. Author: Taosdata Inc.
......
...@@ -5,7 +5,7 @@ with open("README.md", "r") as fh: ...@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools.setup( setuptools.setup(
name="taos", name="taos",
version="1.4.15", version="2.0.0",
author="Taosdata Inc.", author="Taosdata Inc.",
author_email="support@taosdata.com", author_email="support@taosdata.com",
description="TDengine python client package", description="TDengine python client package",
......
Metadata-Version: 2.1 Metadata-Version: 2.1
Name: taos Name: taos
Version: 1.4.15 Version: 2.0.0
Summary: TDengine python client package Summary: TDengine python client package
Home-page: https://github.com/pypa/sampleproject Home-page: https://github.com/pypa/sampleproject
Author: Hongze Cheng Author: Hongze Cheng
......
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册