This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new e8bac706d3 [deps](FE)Upgrade the velocity version that hive-exec
depends on to 2.3 (#15067)
e8bac706d3 is described below
commit e8bac706d3bbaeeff3d6a06000fe7faf797a3fbb
Author: jiafeng.zhang <zhang...@gmail.com>
AuthorDate: Mon Dec 19 14:20:11 2022 +0800
[deps](FE)Upgrade the velocity version that hive-exec depends on to 2.3
(#15067)
---
dist/LICENSE-dist.txt | 2 ++
fe/fe-core/pom.xml | 13 ++++++++++++-
fe/hive-udf/pom.xml | 11 ++++++++++-
fe/java-udf/pom.xml | 9 +++++++++
4 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/dist/LICENSE-dist.txt b/dist/LICENSE-dist.txt
index 98b11f2166..8ea8259d6f 100644
--- a/dist/LICENSE-dist.txt
+++ b/dist/LICENSE-dist.txt
@@ -883,6 +883,8 @@ The Apache Software License, Version 2.0
- org.hibernate:hibernate-validator:5.1.0.Final
(http://validator.hibernate.org/hibernate-validator)
* HikariCP:
- com.zaxxer:HikariCP:3.4.5
(https://github.com/brettwooldridge/HikariCP)
+ * velocity:
+ - org.apache.velocity:velocity-engine-core:2.3
(https://velocity.apache.org/engine/2.3/)
* Hive Common:
- org.apache.hive:hive-common:2.3.7
(https://hive.apache.org/hive-common)
* Hive Llap Client:
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 0eb6dea500..e6b2280656 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -613,7 +613,18 @@ under the License.
<artifactId>hive-exec</artifactId>
<classifier>core</classifier>
<scope>provided</scope>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
+ </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-hdfs
-->
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/fe/hive-udf/pom.xml b/fe/hive-udf/pom.xml
index 9bf08cad8e..564b399062 100644
--- a/fe/hive-udf/pom.xml
+++ b/fe/hive-udf/pom.xml
@@ -43,9 +43,18 @@ under the License.
<exclusion>
<groupId>org.pentaho</groupId>
<artifactId>*</artifactId>
- </exclusion>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>fe-common</artifactId>
diff --git a/fe/java-udf/pom.xml b/fe/java-udf/pom.xml
index 272bd2f5ac..d8fc0da715 100644
--- a/fe/java-udf/pom.xml
+++ b/fe/java-udf/pom.xml
@@ -54,8 +54,17 @@ under the License.
<groupId>org.pentaho</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
+ </dependency>
<!--
https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
<dependency>
<groupId>org.junit.jupiter</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
