You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2023/01/26 19:05:08 UTC
[hop] branch master updated: fix regression issue due to #2143
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 19b5c8566c fix regression issue due to #2143
new 516604a5c0 Merge pull request #2200 from hansva/master
19b5c8566c is described below
commit 19b5c8566cb86e61ca3f9ec0284c044f6ee1c0b7
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Thu Jan 26 16:30:39 2023 +0100
fix regression issue due to #2143
---
.../plugins/databases/hive-assemblies/pom.xml | 43 +++++++++++++++++++---
.../hive-assemblies/src/assembly/assembly.xml | 6 +++
plugins/databases/hive/pom.xml | 7 +++-
3 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/assemblies/plugins/databases/hive-assemblies/pom.xml b/assemblies/plugins/databases/hive-assemblies/pom.xml
index a4de757339..febccb0258 100644
--- a/assemblies/plugins/databases/hive-assemblies/pom.xml
+++ b/assemblies/plugins/databases/hive-assemblies/pom.xml
@@ -17,7 +17,8 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -32,10 +33,12 @@
<packaging>pom</packaging>
<name>Hop Assemblies Plugins Databases Apache Hive</name>
- <description />
+ <description/>
<properties>
- <hive-jdbc.version>3.1.3</hive-jdbc.version>
+ <!-- Version information : https://github.com/apache/hive/blob/master/pom.xml-->
+ <hive.version>3.1.3</hive.version>
+ <libthrift.version>0.16.0</libthrift.version>
</properties>
<dependencies>
@@ -44,17 +47,45 @@
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
- <version>${hive-jdbc.version}</version>
- <classifier>standalone</classifier>
+ <version>${hive.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-databases-hive</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-service</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-service-rpc</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>${libthrift.version}</version>
+ </dependency>
</dependencies>
-
</project>
\ No newline at end of file
diff --git a/assemblies/plugins/databases/hive-assemblies/src/assembly/assembly.xml b/assemblies/plugins/databases/hive-assemblies/src/assembly/assembly.xml
index 8325356bef..5ae1903c53 100644
--- a/assemblies/plugins/databases/hive-assemblies/src/assembly/assembly.xml
+++ b/assemblies/plugins/databases/hive-assemblies/src/assembly/assembly.xml
@@ -42,8 +42,14 @@
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
+ <include>org.apache.hive:hive-common:jar</include>
<include>org.apache.hive:hive-jdbc:jar</include>
+ <include>org.apache.hive:hive-metastore:jar</include>
+ <include>org.apache.hive:hive-serde:jar</include>
+ <include>org.apache.hive:hive-service:jar</include>
+ <include>org.apache.hive:hive-service-rpc:jar</include>
<include>org.apache.hadoop:hadoop-client:jar</include>
+ <include>org.apache.thrift:libthrift:jar</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/plugins/databases/hive/pom.xml b/plugins/databases/hive/pom.xml
index b39ebca650..262cada029 100644
--- a/plugins/databases/hive/pom.xml
+++ b/plugins/databases/hive/pom.xml
@@ -30,6 +30,10 @@
<name>Hop Plugins Databases Apache Hive</name>
+ <properties>
+ <hive.version>3.1.3</hive.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -44,8 +48,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
- <version>3.1.3</version>
- <classifier>standalone</classifier>
+ <version>${hive.version}</version>
</dependency>
</dependencies>