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 2020/07/28 13:05:24 UTC
[incubator-iotdb] branch cherry-from-0.10.1 created (now a6fb88c)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch cherry-from-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at a6fb88c merge with 0.10.1 for hive-connector/pom.xml
This branch includes the following new commits:
new f0a9f11 remove jol-core dependency which is introduced by hive-serde 2.8.4
new 9da9217 remove jol-core dependency which is introduced by hive-serde 2.8.4
new 4832ad2 add release note for issue #1551
new 2689bc1 remove jol-core dependency which is introduced by hive-serde 2.8.4
new 059c9f3 remove org.json dependency because of license compatibility
new a6fb88c merge with 0.10.1 for hive-connector/pom.xml
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 04/06: remove jol-core dependency which is
introduced by hive-serde 2.8.4
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cherry-from-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 2689bc142cd8acdf324fc02cbf4eb27e8d32bbca
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Jul 28 11:06:16 2020 +0800
remove jol-core dependency which is introduced by hive-serde 2.8.4
remove jol-core dependency which is introduced by hive-serde 2.8.4
---
hive-connector/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml
index 0e136b9..e071007 100644
--- a/hive-connector/pom.xml
+++ b/hive-connector/pom.xml
@@ -50,6 +50,10 @@
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-storage-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- force upgrade the dependency of hive-serde-->
@@ -58,6 +62,13 @@
<artifactId>orc-core</artifactId>
<version>1.6.0</version>
</dependency>
+ <!-- orc-core 1.6 uses hive-storage-api 2.6.0, while hive-serde 2.8.4 uses 2.4.0, so we
+ explicitly claim it.-->
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-storage-api</artifactId>
+ <version>2.6.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
[incubator-iotdb] 01/06: remove jol-core dependency which is
introduced by hive-serde 2.8.4
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cherry-from-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit f0a9f11bd07b8697af2a37e426d405090e50056e
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Jul 28 10:18:57 2020 +0800
remove jol-core dependency which is introduced by hive-serde 2.8.4
---
RELEASE_NOTES.md | 2 ++
hive-connector/pom.xml | 11 ++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 6c10818..be4684d 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -40,6 +40,8 @@
* fix doc of MeasurementSchema in Tablet
* [IOTDB-811] fix upgrading mlog many times when upgrading system.properties crashed
* Improve IoTDB restart process
+* remove jol-core dependency which is introduced by hive-serde 2.8.4
+
# Apache IoTDB (incubating) 0.10.0
diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml
index a1023b1..401f60c 100644
--- a/hive-connector/pom.xml
+++ b/hive-connector/pom.xml
@@ -24,11 +24,11 @@
<parent>
<artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-connector</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,13 +38,13 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.10.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-serde</artifactId>
<exclusions>
- <!-- hive-serde 2.8.4 uses orc-core 1.3.2,
+ <!-- hive-serde 2.8.4 uses orc-core 1.3.2,
which is under incompatible license. So, exclude it.-->
<exclusion>
<groupId>org.apache.orc</groupId>
@@ -58,6 +58,7 @@
<artifactId>orc-core</artifactId>
<version>1.6.0</version>
</dependency>
+ </dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
@@ -142,7 +143,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.version}</version>
+ <version>3.1.0</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
[incubator-iotdb] 06/06: merge with 0.10.1 for
hive-connector/pom.xml
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cherry-from-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit a6fb88cc6fd67abf50041f21a6f1ba208fbba8ba
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Jul 28 21:04:33 2020 +0800
merge with 0.10.1 for hive-connector/pom.xml
---
hive-connector/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml
index e071007..77f3124 100644
--- a/hive-connector/pom.xml
+++ b/hive-connector/pom.xml
@@ -24,11 +24,11 @@
<parent>
<artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.10.2-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-connector</artifactId>
- <version>0.10.2-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.10.2-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
@@ -153,7 +153,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.0</version>
+ <version>${maven.assembly.version}</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
[incubator-iotdb] 03/06: add release note for issue #1551
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cherry-from-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 4832ad252f4ad08728ba9e67381ae949429f1d8e
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Jul 28 10:29:45 2020 +0800
add release note for issue #1551
---
RELEASE_NOTES.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index be4684d..90b0a5c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -41,6 +41,7 @@
* [IOTDB-811] fix upgrading mlog many times when upgrading system.properties crashed
* Improve IoTDB restart process
* remove jol-core dependency which is introduced by hive-serde 2.8.4
+* [ISSUE-1551] fix set historical version when loading additional tsfile
# Apache IoTDB (incubating) 0.10.0
[incubator-iotdb] 02/06: remove jol-core dependency which is
introduced by hive-serde 2.8.4
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cherry-from-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 9da9217e4e3f7eb87cb2a2794fa69be9487aa84b
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Jul 28 10:23:38 2020 +0800
remove jol-core dependency which is introduced by hive-serde 2.8.4
---
hive-connector/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml
index 401f60c..0e136b9 100644
--- a/hive-connector/pom.xml
+++ b/hive-connector/pom.xml
@@ -58,7 +58,6 @@
<artifactId>orc-core</artifactId>
<version>1.6.0</version>
</dependency>
- </dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
[incubator-iotdb] 05/06: remove org.json dependency because of
license compatibility
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cherry-from-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 059c9f3fcad84d41a6d4dfa3fc4b98dfbfff4a1e
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Jul 28 17:09:18 2020 +0800
remove org.json dependency because of license compatibility
---
RELEASE_NOTES.md | 1 +
spark-iotdb-connector/pom.xml | 5 -----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 90b0a5c..f89a05b 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -41,6 +41,7 @@
* [IOTDB-811] fix upgrading mlog many times when upgrading system.properties crashed
* Improve IoTDB restart process
* remove jol-core dependency which is introduced by hive-serde 2.8.4
+* remove org.json dependency because of license compatibility
* [ISSUE-1551] fix set historical version when loading additional tsfile
diff --git a/spark-iotdb-connector/pom.xml b/spark-iotdb-connector/pom.xml
index da2ea17..b0700d5 100644
--- a/spark-iotdb-connector/pom.xml
+++ b/spark-iotdb-connector/pom.xml
@@ -35,11 +35,6 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20170516</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>