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/07/31 10:50:42 UTC
[incubator-iotdb] branch master updated: fix copyright about the
year, remove code declaration about hive and mavenWrapper
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
The following commit(s) were added to refs/heads/master by this push:
new 4ecb6c7 fix copyright about the year, remove code declaration about hive and mavenWrapper
4ecb6c7 is described below
commit 4ecb6c7747d18bdd4c48c3196d2572bd4d611cab
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Jul 31 14:20:14 2019 +0800
fix copyright about the year, remove code declaration about hive and mavenWrapper
---
LICENSE-binary | 19 -------------------
NOTICE-binary | 2 +-
README.md | 3 ++-
3 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index b0bf564..b347a87 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -210,25 +210,6 @@ conditions of the following licenses.
================================================================
-The following classes are modified from Apache Hive, which is under Apache License 2.0:
-
-./server/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java
-./server/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java
-./server/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java
-./server/src/main/java/org/apache/iotdb/db/sql/parse/Node.java
-./server/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java
-./server/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java
-./server/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java
-./server/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java
-
-------------
-
-The following class is modified from Maven Wrapper:
-
-./.mvn/wrapper/MavenWrapperDownloader.java
-
-================================================================
-
The binary distribution of this product bundles these dependencies under the
following license. See licenses/ for text of these licenses.
diff --git a/NOTICE-binary b/NOTICE-binary
index f13f1b8..154d3c7 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -1,5 +1,5 @@
Apache IoTDB
-Copyright 2018 and onwards The Apache Software Foundation.
+Copyright 2019 and onwards The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.md b/README.md
index 6298f79..b572deb 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,8 @@ For the latest information about IoTDB, please visit our [IoTDB official website
# Prerequisites
-IoTDB requires Java (>= 1.8), To use IoTDB, JRE should be installed.
+IoTDB requires Java (>= 1.8).
+To use IoTDB, JRE should be installed. To compile IoTDB, JDK should be installed.
If you want to compile and install IoTDB from source code, JDK and Maven (>= 3.1) are required.
While Maven is not mandatory to be installed standalone, you can use the provided Maven wrapper, `./mvnw.sh` on Linux/OS X or `.\mvnw.cmd` on Windows, to facilitate development.