[deps](FE)Upgrade the velocity version that hive-exec depends on to 2…

….3 (apache#15067)
JackDrogon · Dec 19, 2022 · e8bac70 · e8bac70
1 parent b62a94a
commit e8bac70
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>