You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/11/23 06:19:58 UTC
[incubator-iotdb] branch 0.8.2 updated: fix mavenWrapper license;
apache commons collections declarison in NOTICE/NOTICE-binary;
iotdb copyright declarison
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch 0.8.2
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/0.8.2 by this push:
new 18d45c0 fix mavenWrapper license; apache commons collections declarison in NOTICE/NOTICE-binary; iotdb copyright declarison
18d45c0 is described below
commit 18d45c09a580f155b07322c6f1e3a3f2b7122863
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sat Nov 23 14:19:38 2019 +0800
fix mavenWrapper license; apache commons collections declarison in NOTICE/NOTICE-binary; iotdb copyright declarison
---
LICENSE | 2 +-
NOTICE | 10 +++++++++-
NOTICE-binary | 10 +++++++++-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/LICENSE b/LICENSE
index 3f10e53..f5e4656 100644
--- a/LICENSE
+++ b/LICENSE
@@ -222,6 +222,6 @@ The following class is modified from Maven Wrapper, which is under Apache Licens
------------
-The following class is modified from Maven Wrapper
+The following class is modified from Maven Wrapper, which is under Apache License 2.0:
./.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/NOTICE b/NOTICE
index 154d3c7..a228ae4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache IoTDB
-Copyright 2019 and onwards The Apache Software Foundation.
+Copyright 2018-2019 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -24,3 +24,11 @@ Copyright 2008-2018 The Apache Software Foundation
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
+
+============================================================================
+
+Apache Commons Collections
+Copyright 2001-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/NOTICE-binary b/NOTICE-binary
index 154d3c7..cf3b5f5 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -1,5 +1,5 @@
Apache IoTDB
-Copyright 2019 and onwards The Apache Software Foundation.
+Copyright 2018-2019 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -24,3 +24,11 @@ Copyright 2008-2018 The Apache Software Foundation
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
+
+============================================================================
+
+Apache Commons Collections
+Copyright 2001-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).