This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new dfb76af Change maven to 3.1
new a9e0166 Merge pull request #364 from Genius-pig/master
dfb76af is described below
commit dfb76af10fe7f22bbb6c538551c7b6bddc947f85
Author: zhutianci <[email protected]>
AuthorDate: Fri Aug 30 12:31:36 2019 +0800
Change maven to 3.1
Change maven to 3.1
---
docs/Documentation-CHN/UserGuide/7-Session API/1-Session API.md | 2 +-
.../Documentation/UserGuide/4-Deployment and Management/1-Deployment.md | 2 +-
docs/Documentation/UserGuide/6-JDBC API/1-JDBC API.md | 2 +-
docs/Documentation/UserGuide/7-Session API/1-Session API.md | 2 +-
jdbc/README.md | 2 +-
.../org/apache/iotdb/tsfile/encoding/encoder/RegularDataEncoder.java | 1 -
6 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/docs/Documentation-CHN/UserGuide/7-Session API/1-Session API.md
b/docs/Documentation-CHN/UserGuide/7-Session API/1-Session API.md
index 9b21474..6e73335 100644
--- a/docs/Documentation-CHN/UserGuide/7-Session API/1-Session API.md
+++ b/docs/Documentation-CHN/UserGuide/7-Session API/1-Session API.md
@@ -26,7 +26,7 @@
## 依赖
* JDK >= 1.8
-* Maven >= 3.0
+* Maven >= 3.1
## 安装到本地 maven 库
diff --git a/docs/Documentation/UserGuide/4-Deployment and
Management/1-Deployment.md b/docs/Documentation/UserGuide/4-Deployment and
Management/1-Deployment.md
index 5d6ebf7..a9c3b8e 100644
--- a/docs/Documentation/UserGuide/4-Deployment and Management/1-Deployment.md
+++ b/docs/Documentation/UserGuide/4-Deployment and Management/1-Deployment.md
@@ -33,7 +33,7 @@ IoTDB provides you two installation methods, you can refer to
the following sugg
To install and use IoTDB, you need to have:
1. Java >= 1.8 (Please make sure the environment path has been set)
-2. Maven >= 3.0 (If you want to compile and install IoTDB from source code)
+2. Maven >= 3.1 (If you want to compile and install IoTDB from source code)
3. TsFile >= 0.7.0 (TsFile Github page:
[https://github.com/thulab/tsfile](https://github.com/thulab/tsfile))
4. IoTDB-JDBC >= 0.7.0 (IoTDB-JDBC Github page:
[https://github.com/thulab/iotdb-jdbc](https://github.com/thulab/iotdb-jdbc))
diff --git a/docs/Documentation/UserGuide/6-JDBC API/1-JDBC API.md
b/docs/Documentation/UserGuide/6-JDBC API/1-JDBC API.md
index d1c865f..193c55c 100644
--- a/docs/Documentation/UserGuide/6-JDBC API/1-JDBC API.md
+++ b/docs/Documentation/UserGuide/6-JDBC API/1-JDBC API.md
@@ -26,7 +26,7 @@
## Dependencies
* JDK >= 1.8
-* Maven >= 3.0
+* Maven >= 3.1
## How to package only jdbc project
diff --git a/docs/Documentation/UserGuide/7-Session API/1-Session API.md
b/docs/Documentation/UserGuide/7-Session API/1-Session API.md
index b2cd10c..04e35d0 100644
--- a/docs/Documentation/UserGuide/7-Session API/1-Session API.md
+++ b/docs/Documentation/UserGuide/7-Session API/1-Session API.md
@@ -26,7 +26,7 @@
## Dependencies
* JDK >= 1.8
-* Maven >= 3.0
+* Maven >= 3.1
## How to package only client module
diff --git a/jdbc/README.md b/jdbc/README.md
index 3e77c38..73ddc58 100644
--- a/jdbc/README.md
+++ b/jdbc/README.md
@@ -24,7 +24,7 @@
## Dependencies
* JDK >= 1.8
-* Maven >= 3.0
+* Maven >= 3.1
## How to package only jdbc project
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RegularDataEncoder.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RegularDataEncoder.java
index 8fa49aa..ce4d498 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RegularDataEncoder.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RegularDataEncoder.java
@@ -118,7 +118,6 @@ public abstract class RegularDataEncoder extends Encoder {
/**
* constructor of IntRegularEncoder which is a sub-class of
RegularDataEncoder.
*
- * @param size - the number how many numbers to be packed into a block.
*/
public IntRegularEncoder() {
this(BLOCK_DEFAULT_SIZE);
