Backport develop commits to support/2.0 for the 2.0.3 release

README.md

@@ -3,7 +3,6 @@
 [![Apache Geode logo](https://geode.apache.org/img/Apache_Geode_logo.png)](http://geode.apache.org)
 
 [![Build Status](https://concourse.apachegeode-ci.info/api/v1/teams/main/pipelines/apache-develop-main/badge)](https://concourse.apachegeode-ci.info/teams/main/pipelines/apache-develop-main) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.geode/geode-core/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.geode%22) [![homebrew](https://img.shields.io/homebrew/v/apache-geode.svg)](https://formulae.brew.sh/formula/apache-geode) [![Docker Pulls](https://img.shields.io/docker/pulls/apachegeode/geode.svg)](https://hub.docker.com/r/apachegeode/geode/) [![Total alerts](https://img.shields.io/lgtm/alerts/g/apache/geode.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/geode/alerts/) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/apache/geode.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/geode/context:java) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/apache/geode.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/geode/context:javascript) [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/apache/geode.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/geode/context:python)
-
 </div>
 
 ## Contents

boms/geode-all-bom/src/test/resources/expected-pom.xml

@@ -195,7 +195,7 @@
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-core</artifactId>
-        <version>1.14.0</version>
+        <version>1.15.12</version>
       </dependency>
       <dependency>
         <groupId>io.swagger.core.v3</groupId>
@@ -415,7 +415,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>2.0.17</version>
+        <version>2.0.18</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.hateoas</groupId>
@@ -475,22 +475,22 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.21.2</version>
+        <version>2.21.5</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.21.2</version>
+        <version>2.21.5</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <artifactId>jackson-datatype-joda</artifactId>
-        <version>2.21.2</version>
+        <version>2.21.5</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <artifactId>jackson-datatype-jsr310</artifactId>
-        <version>2.21.2</version>
+        <version>2.21.5</version>
       </dependency>
       <dependency>
         <groupId>com.jayway.jsonpath</groupId>
@@ -530,27 +530,27 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-api</artifactId>
-        <version>2.25.4</version>
+        <version>2.25.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core</artifactId>
-        <version>2.25.4</version>
+        <version>2.25.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-jcl</artifactId>
-        <version>2.25.4</version>
+        <version>2.25.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-jul</artifactId>
-        <version>2.25.4</version>
+        <version>2.25.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-slf4j-impl</artifactId>
-        <version>2.25.4</version>
+        <version>2.25.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.lucene</groupId>

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

@@ -46,18 +46,18 @@ 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("log4j.version", "2.25.4")
+    deps.put("log4j.version", "2.25.5")
     deps.put("log4j-slf4j2-impl.version", "2.23.1")
-    deps.put("micrometer.version", "1.14.0")
-    deps.put("shiro.version", "2.1.0")
+    deps.put("micrometer.version", "1.15.12")
+    deps.put("shiro.version", "3.0.0")
     // GEODE-10583: Pin Bouncy Castle (transitive via shiro-crypto-hash) to a fixed version
-    deps.put("bouncycastle.version", "1.84")
-    deps.put("slf4j-api.version", "2.0.17")
+    deps.put("bouncycastle.version", "1.85")
+    deps.put("slf4j-api.version", "2.0.18")
     deps.put("jakarta.transaction-api.version", "2.0.1")
     deps.put("jboss-modules.version", "1.11.0.Final")
-    deps.put("jackson.version", "2.21.2")
+    deps.put("jackson.version", "2.21.5")
     deps.put("jackson.annotations.version", "2.21")
-    deps.put("jackson.databind.version", "2.21.2")
+    deps.put("jackson.databind.version", "2.21.5")
     // Spring Framework 6.x Migration
     deps.put("springshell.version", "3.3.3")
     deps.put("springframework.version", "6.1.21")
@@ -85,7 +85,7 @@ class DependencyConstraints {
     // at o.a.g.sessions.tests.GenericAppServerInstall.java
     // Jetty 12.0.x for Jakarta EE 10 (Servlet 6.0) compatibility
     // Jetty 12 reorganized modules under ee10, ee9, ee8 packages
-    deps.put("jetty.version", "12.0.33")
+    deps.put("jetty.version", "12.0.37")
 
     // These versions are referenced in test.gradle, which is aggressively injected into all projects.
     deps.put("junit.version", "4.13.2")
@@ -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'))
@@ -175,8 +177,8 @@ class DependencyConstraints {
         api(group: 'org.apache.derby', name: 'derby', version: '10.14.2.0')
         // Apache HttpComponents 5.x - Modern HTTP client with HTTP/2 support
         api(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.4.4')
-        api(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.3.6')
-        api(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '5.3.6')
+        api(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.4.3')
+        api(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '5.4.3')
         // Legacy HttpComponents 4.x (keep temporarily during migration, remove after complete)
         api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13')
         api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.15')

geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle

@@ -25,7 +25,7 @@ repositories {
 
 dependencies {
   implementation("${project.group}:geode-core:${project.version}")
-  runtimeOnly('org.apache.logging.log4j:log4j-slf4j-impl:2.25.4')
+  runtimeOnly('org.apache.logging.log4j:log4j-slf4j-impl:2.25.5')
 }
 
 application {

geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java

@@ -34,7 +34,7 @@
  * specific code outside of the {@link GenericAppServerVersion}.
  */
 public class GenericAppServerInstall extends ContainerInstall {
-  private static final String JETTY_VERSION = "12.0.33";
+  private static final String JETTY_VERSION = "12.0.37";
 
   /**
    * Get the version number, download URL, and container name of a generic app server using

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

@@ -920,10 +920,10 @@ lib/ST4-4.3.3.jar
 lib/angus-activation-2.0.0.jar
 lib/antlr-2.7.7.jar
 lib/antlr-runtime-3.5.2.jar
-lib/asm-9.9.1.jar
-lib/asm-commons-9.9.1.jar
-lib/asm-tree-9.9.1.jar
-lib/bcprov-jdk18on-1.84.jar
+lib/asm-9.10.1.jar
+lib/asm-commons-9.10.1.jar
+lib/asm-tree-9.10.1.jar
+lib/bcprov-jdk18on-1.85.jar
 lib/classgraph-4.8.147.jar
 lib/classmate-1.5.1.jar
 lib/commons-beanutils-1.11.0.jar
@@ -961,15 +961,15 @@ lib/geode-wan-0.0.0.jar
 lib/gfsh-dependencies.jar
 lib/hibernate-validator-8.0.2.Final.jar
 lib/httpclient5-5.4.4.jar
-lib/httpcore5-5.3.6.jar
-lib/httpcore5-h2-5.3.6.jar
+lib/httpcore5-5.4.3.jar
+lib/httpcore5-h2-5.4.3.jar
 lib/istack-commons-runtime-4.1.1.jar
 lib/jackson-annotations-2.21.jar
-lib/jackson-core-2.21.2.jar
-lib/jackson-databind-2.21.2.jar
-lib/jackson-dataformat-yaml-2.21.2.jar
-lib/jackson-datatype-joda-2.21.2.jar
-lib/jackson-datatype-jsr310-2.21.2.jar
+lib/jackson-core-2.21.5.jar
+lib/jackson-databind-2.21.5.jar
+lib/jackson-dataformat-yaml-2.21.5.jar
+lib/jackson-datatype-joda-2.21.5.jar
+lib/jackson-datatype-jsr310-2.21.5.jar
 lib/jakarta.activation-api-2.1.3.jar
 lib/jakarta.annotation-api-2.1.1.jar
 lib/jakarta.el-api-5.0.0.jar
@@ -986,64 +986,66 @@ lib/jakarta.xml.bind-api-4.0.2.jar
 lib/jaxb-core-4.0.2.jar
 lib/jaxb-runtime-4.0.2.jar
 lib/jboss-logging-3.4.3.Final.jar
-lib/jetty-ee-12.0.33.jar
-lib/jetty-ee10-annotations-12.0.33.jar
-lib/jetty-ee10-plus-12.0.33.jar
-lib/jetty-ee10-servlet-12.0.33.jar
-lib/jetty-ee10-webapp-12.0.33.jar
-lib/jetty-http-12.0.33.jar
-lib/jetty-io-12.0.33.jar
-lib/jetty-jndi-12.0.33.jar
-lib/jetty-plus-12.0.33.jar
-lib/jetty-security-12.0.33.jar
-lib/jetty-server-12.0.33.jar
-lib/jetty-session-12.0.33.jar
-lib/jetty-util-12.0.33.jar
-lib/jetty-xml-12.0.33.jar
+lib/jetty-ee-12.0.37.jar
+lib/jetty-ee10-annotations-12.0.37.jar
+lib/jetty-ee10-plus-12.0.37.jar
+lib/jetty-ee10-servlet-12.0.37.jar
+lib/jetty-ee10-webapp-12.0.37.jar
+lib/jetty-http-12.0.37.jar
+lib/jetty-io-12.0.37.jar
+lib/jetty-jndi-12.0.37.jar
+lib/jetty-plus-12.0.37.jar
+lib/jetty-security-12.0.37.jar
+lib/jetty-server-12.0.37.jar
+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/jna-5.11.0.jar
 lib/jna-platform-5.11.0.jar
 lib/joda-time-2.12.7.jar
 lib/jopt-simple-5.0.4.jar
 lib/jul-to-slf4j-2.0.17.jar
-lib/log4j-api-2.25.4.jar
-lib/log4j-core-2.25.4.jar
-lib/log4j-jcl-2.25.4.jar
-lib/log4j-jul-2.25.4.jar
-lib/log4j-slf4j-impl-2.25.4.jar
+lib/log4j-api-2.25.5.jar
+lib/log4j-core-2.25.5.jar
+lib/log4j-jcl-2.25.5.jar
+lib/log4j-jul-2.25.5.jar
+lib/log4j-slf4j-impl-2.25.5.jar
 lib/lucene-analysis-common-9.12.3.jar
 lib/lucene-analysis-phonetic-9.12.3.jar
 lib/lucene-core-9.12.3.jar
 lib/lucene-queries-9.12.3.jar
 lib/lucene-queryparser-9.12.3.jar
-lib/micrometer-commons-1.14.0.jar
-lib/micrometer-core-1.14.0.jar
-lib/micrometer-observation-1.14.0.jar
+lib/micrometer-commons-1.15.12.jar
+lib/micrometer-core-1.15.12.jar
+lib/micrometer-observation-1.15.12.jar
 lib/mx4j-3.0.2.jar
 lib/mx4j-remote-3.0.2.jar
 lib/mx4j-tools-3.0.1.jar
 lib/ra.jar
 lib/reactive-streams-1.0.4.jar
 lib/reactor-core-3.6.10.jar
 lib/rmiio-2.1.2.jar
-lib/shiro-cache-2.1.0.jar
-lib/shiro-config-core-2.1.0.jar
-lib/shiro-config-ogdl-2.1.0.jar
-lib/shiro-core-2.1.0.jar
-lib/shiro-crypto-cipher-2.1.0.jar
-lib/shiro-crypto-core-2.1.0.jar
-lib/shiro-crypto-hash-2.1.0.jar
-lib/shiro-event-2.1.0.jar
-lib/shiro-hashes-argon2-2.1.0.jar
-lib/shiro-hashes-bcrypt-2.1.0.jar
-lib/shiro-lang-2.1.0.jar
-lib/slf4j-api-2.0.17.jar
+lib/shiro-cache-3.0.0.jar
+lib/shiro-config-core-3.0.0.jar
+lib/shiro-config-ogdl-3.0.0.jar
+lib/shiro-core-3.0.0.jar
+lib/shiro-crypto-cipher-3.0.0.jar
+lib/shiro-crypto-core-3.0.0.jar
+lib/shiro-crypto-hash-3.0.0.jar
+lib/shiro-event-3.0.0.jar
+lib/shiro-hashes-argon2-3.0.0.jar
+lib/shiro-hashes-bcrypt-3.0.0.jar
+lib/shiro-lang-3.0.0.jar
+lib/slf4j-api-2.0.18.jar
 lib/snakeyaml-2.3.jar
 lib/snappy-0.5.jar
 lib/spring-aop-6.1.21.jar

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

@@ -71,6 +71,8 @@ jline-native
 jline-reader
 jline-style
 jline-terminal
+jline-terminal-ffm
+jline-terminal-jni
 jna
 jna-platform
 joda-time