This is an automated email from the ASF dual-hosted git repository.
abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 278105835a7 HIVE-29130: Remove jline 2.x (#6054)
278105835a7 is described below
commit 278105835a7931387a5d599d67e2f509c0d98630
Author: Raghav Aggarwal <[email protected]>
AuthorDate: Fri Sep 26 10:38:21 2025 +0530
HIVE-29130: Remove jline 2.x (#6054)
---
accumulo-handler/pom.xml | 4 ++
hcatalog/core/pom.xml | 4 ++
hcatalog/pom.xml | 4 ++
hcatalog/server-extensions/pom.xml | 4 ++
itests/hcatalog-unit/pom.xml | 4 ++
itests/qtest-accumulo/pom.xml | 4 ++
itests/util/pom.xml | 4 ++
packaging/pom.xml | 6 +++
packaging/src/main/assembly/beeline.xml | 3 +-
pom.xml | 16 ++++++++
standalone-metastore/metastore-common/pom.xml | 27 --------------
standalone-metastore/metastore-server/pom.xml | 27 --------------
standalone-metastore/pom.xml | 53 ++++++++++++++++++++++++---
storage-api/pom.xml | 1 -
14 files changed, 98 insertions(+), 63 deletions(-)
diff --git a/accumulo-handler/pom.xml b/accumulo-handler/pom.xml
index dbc98f1d995..7b5f27b6684 100644
--- a/accumulo-handler/pom.xml
+++ b/accumulo-handler/pom.xml
@@ -31,6 +31,10 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
<exclusions>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml
index e6ae718e78c..dc443e548cd 100644
--- a/hcatalog/core/pom.xml
+++ b/hcatalog/core/pom.xml
@@ -329,6 +329,10 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/hcatalog/pom.xml b/hcatalog/pom.xml
index 4c3968704f6..10f456ad552 100644
--- a/hcatalog/pom.xml
+++ b/hcatalog/pom.xml
@@ -113,6 +113,10 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/hcatalog/server-extensions/pom.xml
b/hcatalog/server-extensions/pom.xml
index 64c950a60b1..e966af44d56 100644
--- a/hcatalog/server-extensions/pom.xml
+++ b/hcatalog/server-extensions/pom.xml
@@ -135,6 +135,10 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml
index 854ba44e41c..797a780be12 100644
--- a/itests/hcatalog-unit/pom.xml
+++ b/itests/hcatalog-unit/pom.xml
@@ -318,6 +318,10 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml
index 40911d9b754..ac2db9974d6 100644
--- a/itests/qtest-accumulo/pom.xml
+++ b/itests/qtest-accumulo/pom.xml
@@ -436,6 +436,10 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- Override the thrift dependency pulled in for metaserver -->
diff --git a/itests/util/pom.xml b/itests/util/pom.xml
index 2322e5ea63c..6481ecbd8ea 100644
--- a/itests/util/pom.xml
+++ b/itests/util/pom.xml
@@ -43,6 +43,10 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index dcb578ef088..90ef5b4222c 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -416,6 +416,12 @@
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-pig-adapter</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
diff --git a/packaging/src/main/assembly/beeline.xml
b/packaging/src/main/assembly/beeline.xml
index c6c5e62a94e..00663762c1e 100644
--- a/packaging/src/main/assembly/beeline.xml
+++ b/packaging/src/main/assembly/beeline.xml
@@ -48,8 +48,7 @@
<include>org.apache.hive:hive-service-rpc:jar</include>
<include>commons-cli:commons-cli:jar</include>
<include>commons-io:commons-io:jar</include>
- <include>commons-logging:commons-logging:jar</include>
- <include>jline:jline:jar</include>
+ <include>org.jline:jline:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
<include>org.slf4j:slf4j-api:jar</include>
<include>net.sf.supercsv:super-csv:jar</include>
diff --git a/pom.xml b/pom.xml
index cd6dd7bf10e..0b6e318a1dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1732,6 +1732,22 @@
<searchTransitive>true</searchTransitive>
<message>Banned log4j:log4j dependency/transitive dependency
was found!</message>
</bannedDependencies>
+ <bannedDependencies>
+ <excludes>
+ <exclude>jline:jline</exclude>
+ </excludes>
+ <!--
+ Allowing jline 1.0 because pig 0.16.0 depends upon it.
Otherwise
+ causing UT failure in hcatalog/hcatalog-pig-adapter
module. The
+ below includes tag can be removed once pig moves to jline
3.x or
+ support for pig is dropped from hive.
+ -->
+ <includes>
+ <include>jline:jline:1.0</include>
+ </includes>
+ <searchTransitive>true</searchTransitive>
+ <message>A banned jline2.x dependency/transitive dependency
was found!</message>
+ </bannedDependencies>
</rules>
<fail>true</fail>
</configuration>
diff --git a/standalone-metastore/metastore-common/pom.xml
b/standalone-metastore/metastore-common/pom.xml
index 07cbd5a69dc..ae6531e67e0 100644
--- a/standalone-metastore/metastore-common/pom.xml
+++ b/standalone-metastore/metastore-common/pom.xml
@@ -252,10 +252,6 @@
<artifactId>jsonassert</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
@@ -564,29 +560,6 @@
</executions>
</plugin>
<!-- TODO MS-SPLIT javadoc plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-banned-dependencies</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <bannedDependencies>
- <excludes>
- <!--LGPL licenced library-->
- <exclude>com.google.code.findbugs:annotations</exclude>
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/standalone-metastore/metastore-server/pom.xml
b/standalone-metastore/metastore-server/pom.xml
index 08cff9453ab..9bf09167c2f 100644
--- a/standalone-metastore/metastore-server/pom.xml
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -306,10 +306,6 @@
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
<dependency>
<groupId>com.cronutils</groupId>
<artifactId>cron-utils</artifactId>
@@ -656,29 +652,6 @@
</executions>
</plugin>
<!-- TODO MS-SPLIT javadoc plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-banned-dependencies</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <bannedDependencies>
- <excludes>
- <!--LGPL licenced library-->
- <exclude>com.google.code.findbugs:annotations</exclude>
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index e23f779d0c1..6e99af30e02 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -66,7 +66,6 @@
<antlr.version>4.9.3</antlr.version>
<apache-directory-server.version>2.0.0-M24</apache-directory-server.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
- <commons-logging.version>1.1.3</commons-logging.version>
<commons-dbcp2.version>2.12.0</commons-dbcp2.version>
<datasketches.version>2.0.0</datasketches.version>
<datanucleus-api-jdo.version>6.0.3</datanucleus-api-jdo.version>
@@ -352,11 +351,6 @@
<artifactId>jline</artifactId>
<version>${jline.version}</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
<dependency>
<groupId>com.cronutils</groupId>
<artifactId>cron-utils</artifactId>
@@ -583,6 +577,53 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven.checkstyle.plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-banned-dependencies</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <!--LGPL licenced library-->
+ <exclude>com.google.code.findbugs:annotations</exclude>
+ </excludes>
+ <message>A banned license dependency was found!</message>
+ </bannedDependencies>
+ <bannedDependencies>
+ <excludes>
+ <!-- Move to SLF4J -->
+ <exclude>commons-logging:commons-logging</exclude>
+ <exclude>ch.qos.reload4j:reload4j</exclude>
+ </excludes>
+ <searchTransitive>false</searchTransitive>
+ <message>A banned logging dependency was found!</message>
+ </bannedDependencies>
+ <bannedDependencies>
+ <excludes>
+ <exclude>log4j:log4j</exclude>
+ </excludes>
+ <searchTransitive>true</searchTransitive>
+ <message>Banned log4j:log4j dependency/transitive
dependency was found!</message>
+ </bannedDependencies>
+ <bannedDependencies>
+ <excludes>
+ <exclude>jline:jline</exclude>
+ </excludes>
+ <searchTransitive>true</searchTransitive>
+ <message>A banned jline2.x dependency/transitive
dependency was found!</message>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
diff --git a/storage-api/pom.xml b/storage-api/pom.xml
index 4aaf65fa054..1868ea4006f 100644
--- a/storage-api/pom.xml
+++ b/storage-api/pom.xml
@@ -28,7 +28,6 @@
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
- <commons-logging.version>1.1.3</commons-logging.version>
<guava.version>22.0</guava.version>
<hadoop.version>3.4.1</hadoop.version>
<junit.version>4.13.2</junit.version>
