Skip to content

Commit 621c3d3

Browse files
authored
[GEODE-10610] gfsh - list members failure (#8036)
* GEODE-10610 gfsh - list member failure * :geode-assembly:integrationTest BundledJarsJUnitTest. verifyBundledJarsHaveNotChanged and GfshDependencyJarIntegrationTest. verifyManifestClassPath
1 parent b94d007 commit 621c3d3

7 files changed

Lines changed: 43 additions & 0 deletions

File tree

build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ class DependencyConstraints {
108108

109109
project.dependencies {
110110
constraints {
111+
api('org.jline:jline-terminal-jni:3.26.3')
112+
api('org.jline:jline-terminal-ffm:3.26.3')
111113
// informal, inter-group dependencySet
112114
api(group: 'antlr', name: 'antlr', version: get('antlr.version'))
113115
api(group: 'cglib', name: 'cglib', version: get('cglib.version'))

geode-assembly/src/integrationTest/resources/assembly_content.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,8 @@ lib/jline-native-3.26.3.jar
10081008
lib/jline-reader-3.26.3.jar
10091009
lib/jline-style-3.26.3.jar
10101010
lib/jline-terminal-3.26.3.jar
1011+
lib/jline-terminal-ffm-3.26.3.jar
1012+
lib/jline-terminal-jni-3.26.3.jar
10111013
lib/jna-5.11.0.jar
10121014
lib/jna-platform-5.11.0.jar
10131015
lib/joda-time-2.12.7.jar

geode-assembly/src/integrationTest/resources/expected_jars.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ jline-native
7272
jline-reader
7373
jline-style
7474
jline-terminal
75+
jline-terminal-ffm
76+
jline-terminal-jni
7577
jna
7678
jna-platform
7779
joda-time

geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ jline-builtins-3.26.3.jar
128128
jline-reader-3.26.3.jar
129129
jline-style-3.26.3.jar
130130
jline-terminal-3.26.3.jar
131+
jline-terminal-jni-3.26.3.jar
132+
jline-terminal-ffm-3.26.3.jar
131133
ST4-4.3.3.jar
132134
txw2-4.0.2.jar
133135
asm-commons-9.10.1.jar

geode-gfsh/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ dependencies {
4040
implementation('com.fasterxml.jackson.core:jackson-databind')
4141
implementation('io.swagger.core.v3:swagger-annotations')
4242

43+
runtimeOnly('org.jline:jline-terminal-jni')
44+
runtimeOnly('org.jline:jline-terminal-ffm')
45+
4346
// JAXB dependencies needed for Java 11+
4447
implementation('jakarta.xml.bind:jakarta.xml.bind-api')
4548
runtimeOnly('org.glassfish.jaxb:jaxb-runtime')

geode-gfsh/src/test/resources/expected-pom.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,36 @@
349349
</exclusion>
350350
</exclusions>
351351
</dependency>
352+
<dependency>
353+
<groupId>org.jline</groupId>
354+
<artifactId>jline-terminal-jni</artifactId>
355+
<scope>runtime</scope>
356+
<exclusions>
357+
<exclusion>
358+
<artifactId>log4j-to-slf4j</artifactId>
359+
<groupId>org.apache.logging.log4j</groupId>
360+
</exclusion>
361+
<exclusion>
362+
<artifactId>*</artifactId>
363+
<groupId>ch.qos.logback</groupId>
364+
</exclusion>
365+
</exclusions>
366+
</dependency>
367+
<dependency>
368+
<groupId>org.jline</groupId>
369+
<artifactId>jline-terminal-ffm</artifactId>
370+
<scope>runtime</scope>
371+
<exclusions>
372+
<exclusion>
373+
<artifactId>log4j-to-slf4j</artifactId>
374+
<groupId>org.apache.logging.log4j</groupId>
375+
</exclusion>
376+
<exclusion>
377+
<artifactId>*</artifactId>
378+
<groupId>ch.qos.logback</groupId>
379+
</exclusion>
380+
</exclusions>
381+
</dependency>
352382
<dependency>
353383
<groupId>org.glassfish.jaxb</groupId>
354384
<artifactId>jaxb-runtime</artifactId>

geode-server-all/src/integrationTest/resources/dependency_classpath.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ jline-builtins-3.26.3.jar
132132
jline-reader-3.26.3.jar
133133
jline-style-3.26.3.jar
134134
jline-terminal-3.26.3.jar
135+
jline-terminal-jni-3.26.3.jar
136+
jline-terminal-ffm-3.26.3.jar
135137
ST4-4.3.3.jar
136138
jakarta.enterprise.lang-model-4.0.1.jar
137139
reactive-streams-1.0.4.jar

0 commit comments

Comments
 (0)