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 02:20:11 UTC

[incubator-iotdb] branch for-releasing-0.10.1 updated (41edd24 -> ee4f0e2)

This is an automated email from the ASF dual-hosted git repository.

hxd pushed a change to branch for-releasing-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 41edd24  [maven-release-plugin] prepare for next development iteration
     new bb905cd  remove jol-core dependency which is introduced by hive-serde 2.8.4
     new ee4f0e2  add README_ZH.md into distribution files

The 2 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.


Summary of changes:
 RELEASE_NOTES.md                           |  2 ++
 distribution/src/assembly/distribution.xml |  3 +++
 hive-connector/pom.xml                     | 15 +++++++++++++++
 3 files changed, 20 insertions(+)


[incubator-iotdb] 02/02: add README_ZH.md into distribution files

Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hxd pushed a commit to branch for-releasing-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit ee4f0e2941e63f463120aa121e7ddf9fce8bd3a5
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Jul 28 10:19:54 2020 +0800

    add README_ZH.md into distribution files
---
 distribution/src/assembly/distribution.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/distribution/src/assembly/distribution.xml b/distribution/src/assembly/distribution.xml
index f829ae0..3128946 100644
--- a/distribution/src/assembly/distribution.xml
+++ b/distribution/src/assembly/distribution.xml
@@ -78,6 +78,9 @@
             <source>${maven.multiModuleProjectDirectory}/README.md</source>
         </file>
         <file>
+            <source>${maven.multiModuleProjectDirectory}/README_ZH.md</source>
+        </file>
+        <file>
             <source>${maven.multiModuleProjectDirectory}/LICENSE-binary</source>
             <destName>LICENSE</destName>
         </file>


[incubator-iotdb] 01/02: 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 for-releasing-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit bb905cd5be18cd0f73cef4d1b4c3833950604170
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 | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 47fc7db..0de92ad 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 2752758..401f60c 100644
--- a/hive-connector/pom.xml
+++ b/hive-connector/pom.xml
@@ -43,6 +43,21 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-serde</artifactId>
+            <exclusions>
+                <!-- 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>
+                    <artifactId>orc-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- force upgrade the dependency of hive-serde-->
+        <dependency>
+            <groupId>org.apache.orc</groupId>
+            <artifactId>orc-core</artifactId>
+            <version>1.6.0</version>
+        </dependency>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>