This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 6657fe42149 [fix][sql] Fix jline version to 3.21.0 (#18207)
6657fe42149 is described below
commit 6657fe42149be30365db3e99abc877a22173b52c
Author: tison <[email protected]>
AuthorDate: Thu Oct 27 09:00:55 2022 +0800
[fix][sql] Fix jline version to 3.21.0 (#18207)
---
pom.xml | 6 ++++++
.../main/java/org/apache/pulsar/PulsarStandalone.java | 2 +-
pulsar-client-tools/pom.xml | 1 -
pulsar-sql/pom.xml | 17 +++++++++++++++++
pulsar-sql/presto-distribution/LICENSE | 6 +++---
5 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 23092d983b6..1121742ae31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,6 +290,12 @@ flexible messaging model and an intuitive client
API.</description>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>${jline3.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.asynchttpclient</groupId>
<artifactId>async-http-client</artifactId>
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
index 70110766e4e..d58cdc502a3 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
@@ -439,7 +439,7 @@ public class PulsarStandalone implements AutoCloseable {
log.info("Starting BK with RocksDb metadata store");
metadataStoreUrl = "rocksdb://" +
Paths.get(metadataDir).toAbsolutePath();
} else {
- log.info("Starting BK with metadata store:", metadataStoreUrl);
+ log.info("Starting BK with metadata store: {}", metadataStoreUrl);
}
ServerConfiguration bkServerConf = new ServerConfiguration();
diff --git a/pulsar-client-tools/pom.xml b/pulsar-client-tools/pom.xml
index 2553f1c2488..c81c0da4c0b 100644
--- a/pulsar-client-tools/pom.xml
+++ b/pulsar-client-tools/pom.xml
@@ -126,7 +126,6 @@
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
- <version>${jline3.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
diff --git a/pulsar-sql/pom.xml b/pulsar-sql/pom.xml
index b546b7c6b53..3f8f3b5e044 100644
--- a/pulsar-sql/pom.xml
+++ b/pulsar-sql/pom.xml
@@ -63,6 +63,23 @@
<version>${okio.version}</version>
</dependency>
+ <!-- force specific version of jline, see
https://github.com/scala/scala/pull/9807 -->
+ <dependency>
+ <groupId>org.jline</groupId>
+ <artifactId>jline-reader</artifactId>
+ <version>${jline3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jline</groupId>
+ <artifactId>jline-terminal</artifactId>
+ <version>${jline3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jline</groupId>
+ <artifactId>jline-terminal-jna</artifactId>
+ <version>${jline3.version}</version>
+ </dependency>
+
<!-- force specific version of slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index 18c6420f0c0..ea7a1c02dee 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -492,9 +492,9 @@ BSD License
- asm-tree-6.2.1.jar
- asm-util-6.2.1.jar
* JLine
- - jline-reader-3.17.1.jar
- - jline-terminal-3.17.1.jar
- - jline-terminal-jna-3.17.1.jar
+ - jline-reader-3.21.0.jar
+ - jline-terminal-3.21.0.jar
+ - jline-terminal-jna-3.21.0.jar
MIT License
* PCollections
