Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ class DependencyConstraints {

project.dependencies {
constraints {
api('org.jline:jline-terminal-jni:3.26.3')
api('org.jline:jline-terminal-ffm:3.26.3')
// informal, inter-group dependencySet
api(group: 'antlr', name: 'antlr', version: get('antlr.version'))
api(group: 'cglib', name: 'cglib', version: get('cglib.version'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,8 @@ lib/jline-native-3.26.3.jar
lib/jline-reader-3.26.3.jar
lib/jline-style-3.26.3.jar
lib/jline-terminal-3.26.3.jar
lib/jline-terminal-ffm-3.26.3.jar
lib/jline-terminal-jni-3.26.3.jar
lib/jna-5.11.0.jar
lib/jna-platform-5.11.0.jar
lib/joda-time-2.12.7.jar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ jline-native
jline-reader
jline-style
jline-terminal
jline-terminal-ffm
jline-terminal-jni
jna
jna-platform
joda-time
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ jline-builtins-3.26.3.jar
jline-reader-3.26.3.jar
jline-style-3.26.3.jar
jline-terminal-3.26.3.jar
jline-terminal-jni-3.26.3.jar
jline-terminal-ffm-3.26.3.jar
ST4-4.3.3.jar
txw2-4.0.2.jar
asm-commons-9.10.1.jar
Expand Down
3 changes: 3 additions & 0 deletions geode-gfsh/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ dependencies {
implementation('com.fasterxml.jackson.core:jackson-databind')
implementation('io.swagger.core.v3:swagger-annotations')

runtimeOnly('org.jline:jline-terminal-jni')
runtimeOnly('org.jline:jline-terminal-ffm')

// JAXB dependencies needed for Java 11+
implementation('jakarta.xml.bind:jakarta.xml.bind-api')
runtimeOnly('org.glassfish.jaxb:jaxb-runtime')
Expand Down
30 changes: 30 additions & 0 deletions geode-gfsh/src/test/resources/expected-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,36 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline-terminal-jni</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>log4j-to-slf4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>*</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline-terminal-ffm</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>log4j-to-slf4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>*</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ jline-builtins-3.26.3.jar
jline-reader-3.26.3.jar
jline-style-3.26.3.jar
jline-terminal-3.26.3.jar
jline-terminal-jni-3.26.3.jar
jline-terminal-ffm-3.26.3.jar
ST4-4.3.3.jar
jakarta.enterprise.lang-model-4.0.1.jar
reactive-streams-1.0.4.jar
Expand Down
Loading