Skip to content
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

Jump to bottom

[fix][sql] Fix jline version to 3.21.0 #18207

Merged
merged 2 commits into from
Oct 27, 2022
Merged

[fix][sql] Fix jline version to 3.21.0 #18207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a38d0f5
upragede dependencies
tisonkun Oct 26, 2022
1ad6953
fix license header
tisonkun Oct 26, 2022
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
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ private void startBookieWithMetadataStore() throws Exception {
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();
Expand Down
1 change: 0 additions & 1 deletion pulsar-client-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
<version>${jline3.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
Expand Down
17 changes: 17 additions & 0 deletions pulsar-sql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions pulsar-sql/presto-distribution/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/src/test/java/org/apache/pulsar/tests/integration/tls/ClientTlsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
Expand Down