diff --git a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy index 1a6e6f032e6..33aca3f2509 100644 --- a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy +++ b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy @@ -46,6 +46,7 @@ class DependencyConstraints { deps.put("jakarta.annotation.version", "2.1.1") deps.put("jakarta.ejb.version", "4.0.1") deps.put("jgroups.version", "3.6.20.Final") + deps.put("jline.version", "3.30.17") deps.put("log4j.version", "2.25.5") deps.put("log4j-slf4j2-impl.version", "2.23.1") deps.put("micrometer.version", "1.16.7") @@ -111,8 +112,14 @@ class DependencyConstraints { project.dependencies { constraints { - api('org.jline:jline-terminal-jni:3.26.3') - api('org.jline:jline-terminal-ffm:3.26.3') + api(group: 'org.jline', name: 'jline-builtins', version: get('jline.version')) + api(group: 'org.jline', name: 'jline-console', version: get('jline.version')) + api(group: 'org.jline', name: 'jline-native', version: get('jline.version')) + api(group: 'org.jline', name: 'jline-reader', version: get('jline.version')) + api(group: 'org.jline', name: 'jline-style', version: get('jline.version')) + api(group: 'org.jline', name: 'jline-terminal', version: get('jline.version')) + api(group: 'org.jline', name: 'jline-terminal-ffm', version: get('jline.version')) + api(group: 'org.jline', name: 'jline-terminal-jni', version: get('jline.version')) // informal, inter-group dependencySet api(group: 'antlr', name: 'antlr', version: get('antlr.version')) api(group: 'cglib', name: 'cglib', version: get('cglib.version')) diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index bb903288049..6f43a5a0455 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -1002,14 +1002,14 @@ lib/jetty-session-12.0.37.jar lib/jetty-util-12.0.37.jar lib/jetty-xml-12.0.37.jar lib/jgroups-3.6.20.Final.jar -lib/jline-builtins-3.26.3.jar -lib/jline-console-3.26.3.jar -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/jline-builtins-3.30.17.jar +lib/jline-console-3.30.17.jar +lib/jline-native-3.30.17.jar +lib/jline-reader-3.30.17.jar +lib/jline-style-3.30.17.jar +lib/jline-terminal-3.30.17.jar +lib/jline-terminal-ffm-3.30.17.jar +lib/jline-terminal-jni-3.30.17.jar lib/jna-5.11.0.jar lib/jna-platform-5.11.0.jar lib/joda-time-2.12.7.jar diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt index 489b45aba27..0ff5e965893 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -124,20 +124,20 @@ jspecify-1.0.1.jar LatencyUtils-2.0.3.jar snakeyaml-2.5.jar reactor-core-3.8.7.jar -jline-console-3.26.3.jar -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 +jline-console-3.30.17.jar +jline-builtins-3.30.17.jar +jline-reader-3.30.17.jar +jline-style-3.30.17.jar +jline-terminal-3.30.17.jar +jline-terminal-jni-3.30.17.jar +jline-terminal-ffm-3.30.17.jar ST4-4.3.3.jar txw2-4.0.2.jar asm-commons-9.10.1.jar asm-tree-9.10.1.jar asm-9.10.1.jar reactive-streams-1.0.4.jar -jline-native-3.26.3.jar +jline-native-3.30.17.jar antlr-runtime-3.5.2.jar tomcat-embed-el-10.1.42.jar hibernate-validator-8.0.2.Final.jar diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index 7300c0dd491..06027ff5fd9 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -128,17 +128,17 @@ asm-tree-9.10.1.jar asm-9.10.1.jar txw2-4.0.2.jar reactor-core-3.8.7.jar -jline-console-3.26.3.jar -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 +jline-console-3.30.17.jar +jline-builtins-3.30.17.jar +jline-reader-3.30.17.jar +jline-style-3.30.17.jar +jline-terminal-3.30.17.jar +jline-terminal-jni-3.30.17.jar +jline-terminal-ffm-3.30.17.jar ST4-4.3.3.jar jakarta.enterprise.lang-model-4.0.1.jar reactive-streams-1.0.4.jar -jline-native-3.26.3.jar +jline-native-3.30.17.jar antlr-runtime-3.5.2.jar tomcat-embed-el-10.1.42.jar hibernate-validator-8.0.2.Final.jar