This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch fix_common_issue_0.11 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 66c81d1310b84028045530d0582d8b67b3c8c735 Author: xiangdong huang <[email protected]> AuthorDate: Sun Jan 10 23:59:54 2021 +0800 1. change copyright declaim from 2020 to 2021; 2. upgrade version in cpp module pom; 3. remove 'incubat' keyword out of README_ZH.md --- NOTICE | 2 +- NOTICE-binary | 2 +- README_ZH.md | 4 ++-- client-cpp/client-cpp-example/pom.xml | 4 ++-- client-cpp/pom.xml | 4 ++-- compile-tools/boost/pom.xml | 2 +- compile-tools/pom.xml | 4 +--- compile-tools/thrift/pom.xml | 2 +- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/NOTICE b/NOTICE index 6dca58b..e983e45 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache IoTDB -Copyright 2018-2020 The Apache Software Foundation. +Copyright 2018-2021 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/NOTICE-binary b/NOTICE-binary index 6dca58b..e983e45 100644 --- a/NOTICE-binary +++ b/NOTICE-binary @@ -1,5 +1,5 @@ Apache IoTDB -Copyright 2018-2020 The Apache Software Foundation. +Copyright 2018-2021 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/README_ZH.md b/README_ZH.md index 87d58be..7a57164 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -100,7 +100,7 @@ IoTDB提供了三种安装方法，您可以参考以下建议，选择最适合 * 从二进制文件安装。推荐的方法是从官方网站下载二进制文件，您将获得一个开箱即用的二进制发布包。 -* 使用Docker: dockerfile的路径是https://github.com/apache/incubat-iotdb/tree/master/docker/src/main +* 使用Docker: dockerfile的路径是https://github.com/apache/iotdb/tree/master/docker/src/main 在这篇《快速入门》中，我们简要介绍如何使用源代码安装IoTDB。如需进一步资料，请参阅《用户指南》第3章。 @@ -124,7 +124,7 @@ git checkout release/x.x.x > mvn clean package -DskipTests ``` -执行完成之后，可以在**distribution/target/apache-iotdb-{project.version}-incubating-bin.zip**找到编译完成的二进制版本(包括服务器和客户端) +执行完成之后，可以在**distribution/target/apache-iotdb-{project.version}-bin.zip**找到编译完成的二进制版本(包括服务器和客户端) > 注意:"thrift/target/generated-sources/thrift" 和 > "antlr/target/generated-sources/antlr4" 目录需要添加到源代码根中，以免在 IDE 中产生编译错误。 diff --git a/client-cpp/client-cpp-example/pom.xml b/client-cpp/client-cpp-example/pom.xml index 7a31c89..e179211 100644 --- a/client-cpp/client-cpp-example/pom.xml +++ b/client-cpp/client-cpp-example/pom.xml @@ -24,12 +24,12 @@ <parent> <artifactId>client-cpp</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.11.1-SNAPSHOT</version> + <version>0.11.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.iotdb</groupId> <artifactId>client-cpp-example</artifactId> - <version>0.11.1-SNAPSHOT</version> + <version>0.11.3-SNAPSHOT</version> <profiles> <profile> <id>os-unix</id> diff --git a/client-cpp/pom.xml b/client-cpp/pom.xml index e61f52d..35e25bc 100644 --- a/client-cpp/pom.xml +++ b/client-cpp/pom.xml @@ -24,12 +24,12 @@ <parent> <artifactId>iotdb-parent</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.11.1-SNAPSHOT</version> + <version>0.11.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.iotdb</groupId> <artifactId>client-cpp</artifactId> - <version>0.11.1-SNAPSHOT</version> + <version>0.11.3-SNAPSHOT</version> <name>Client for cpp</name> <description>C++ client</description> <packaging>pom</packaging> diff --git a/compile-tools/boost/pom.xml b/compile-tools/boost/pom.xml index 44aa288..3d2e432 100644 --- a/compile-tools/boost/pom.xml +++ b/compile-tools/boost/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>client-cpp-tools</artifactId> - <version>0.11.1-SNAPSHOT</version> + <version>0.11.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>client-cpp-tools-boost</artifactId> diff --git a/compile-tools/pom.xml b/compile-tools/pom.xml index 39a8ce3..c623975 100644 --- a/compile-tools/pom.xml +++ b/compile-tools/pom.xml @@ -22,12 +22,10 @@ <parent> <artifactId>iotdb-parent</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.11.1-SNAPSHOT</version> + <version>0.11.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>client-cpp-tools</artifactId> - <groupId>org.apache.iotdb</groupId> - <version>0.11.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Compile Tools</name> <properties> diff --git a/compile-tools/thrift/pom.xml b/compile-tools/thrift/pom.xml index 11ae4b5..c4629df 100644 --- a/compile-tools/thrift/pom.xml +++ b/compile-tools/thrift/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>client-cpp-tools</artifactId> - <version>0.11.1-SNAPSHOT</version> + <version>0.11.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>client-cpp-tools-thrift</artifactId>
