Merge remote-tracking branch 'ali/master'

hdfsreader/pom.xml

@@ -13,7 +13,7 @@
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
-        <hive.version>1.1.1</hive.version>
+        <hive.version>3.1.3</hive.version>
         <hadoop.version>2.7.1</hadoop.version>
     </properties>
     <dependencies>
@@ -130,7 +130,7 @@
         <dependency>
             <groupId>org.apache.parquet</groupId>
             <artifactId>parquet-format</artifactId>
-            <version>2.3.0</version>
+            <version>2.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.parquet</groupId>

hdfswriter/pom.xml

@@ -8,17 +8,22 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>hdfswriter</artifactId>
     <name>hdfswriter</name>
     <description>HdfsWriter提供了写入HDFS功能。</description>
     <packaging>jar</packaging>
     <properties>
-        <hive.version>1.1.1</hive.version>
+        <hive.version>3.1.3</hive.version>
         <hadoop.version>2.7.1</hadoop.version>
     </properties>
 
     <dependencies>
+        <!-- https://mvnrepository.com/artifact/com.twitter/parquet-hadoop-bundle -->
+        <dependency>
+            <groupId>com.twitter</groupId>
+            <artifactId>parquet-hadoop-bundle</artifactId>
+            <version>1.6.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>

sybasereader/pom.xml

@@ -62,7 +62,7 @@
             <artifactId>jconn4</artifactId>
             <version>16.0</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/libs/jconn4-16.0.jar</systemPath>
+            <systemPath>${basedir}/src/main/libs/jconn4-16.0.jar</systemPath>
         </dependency>
 
         <dependency>

sybasereader/src/main/assembly/package.xml

@@ -16,6 +16,13 @@
             </includes>
             <outputDirectory>plugin/reader/sybasereader</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>src/main/libs</directory>
+            <includes>
+                <include>*.*</include>
+            </includes>
+            <outputDirectory>plugin/reader/sybasereader/libs</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>target/</directory>
             <includes>

sybasewriter/pom.xml

@@ -60,7 +60,7 @@
             <artifactId>jconn4</artifactId>
             <version>16.0</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/libs/jconn4-16.0.jar</systemPath>
+            <systemPath>${basedir}/src/main/libs/jconn4-16.0.jar</systemPath>
         </dependency>
     </dependencies>
 

sybasewriter/src/main/assembly/package.xml

@@ -16,19 +16,26 @@
             </includes>
             <outputDirectory>plugin/reader/sybasewriter</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>src/main/libs</directory>
+            <includes>
+                <include>*.*</include>
+            </includes>
+            <outputDirectory>plugin/writer/sybasewriter/libs</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>target/</directory>
             <includes>
                 <include>sybasewriter-0.0.1-SNAPSHOT.jar</include>
             </includes>
-            <outputDirectory>plugin/reader/sybasewriter</outputDirectory>
+            <outputDirectory>plugin/writer/sybasewriter</outputDirectory>
         </fileSet>
     </fileSets>
 
     <dependencySets>
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>plugin/reader/sybasewriter/libs</outputDirectory>
+            <outputDirectory>plugin/writer/sybasewriter/libs</outputDirectory>
             <scope>runtime</scope>
         </dependencySet>
     </dependencySets>