Skip to content

HIVE-29130: Remove jline 2.x #6054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+98 −63
Open

HIVE-29130: Remove jline 2.x #6054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5572806
HIVE-29130: Remove jline 2.x
Aggarwal-Raghav Sep 2, 2025
f5c4755
Fix UT failures in hcatalog/pig-adapter module
Aggarwal-Raghav Sep 3, 2025
8a61065
Address review comments
Aggarwal-Raghav Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions accumulo-handler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions hcatalog/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,10 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
Expand Down
4 changes: 4 additions & 0 deletions hcatalog/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
4 changes: 4 additions & 0 deletions hcatalog/server-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
Expand Down
4 changes: 4 additions & 0 deletions itests/hcatalog-unit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,10 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
4 changes: 4 additions & 0 deletions itests/qtest-accumulo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
4 changes: 4 additions & 0 deletions itests/util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions packaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions packaging/src/main/assembly/beeline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removing commons-logging as it was getting packaged in beeline tarball. Check HIVE-24691 and HIVE-20019

<include>jline:jline:jar</include>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved it to jline3.x groupId

<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>
Expand Down
16 changes: 16 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: please explain here with a brief comment why we still allow 1.0 to make it clear for the future if we can remove

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

</includes>
<searchTransitive>true</searchTransitive>
<message>A banned jline2.x dependency/transitive dependency was found!</message>
</bannedDependencies>
</rules>
<fail>true</fail>
</configuration>
Expand Down
27 changes: 0 additions & 27 deletions standalone-metastore/metastore-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed the enforcer pluging from standalone-metastore/metastore-common/pom.xml and standalone-metastore/metastore-server/pom.xml and moved to standalone-metastore/pom.xml i.e. a common place and updated it with the same list of banned dependency as in parent pom.xml

<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>
Expand Down
27 changes: 0 additions & 27 deletions standalone-metastore/metastore-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
53 changes: 47 additions & 6 deletions standalone-metastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion storage-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down