Replacing master with contents of rel/v2.0.1
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ff3ab1a..a214b69 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml
@@ -30,10 +30,10 @@ on: push: - branches: [ develop ] + branches: [ support/2.0 ] pull_request: # The branches below must be a subset of the branches above - branches: [ develop ] + branches: [ support/2.0 ] schedule: - cron: '22 22 * * 2'
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8d5a5e3..00e80b3 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml
@@ -19,9 +19,9 @@ on: push: - branches: [ "develop" ] + branches: [ "support/2.0" ] pull_request: - branches: [ "develop" ] + branches: [ "support/2.0" ] permissions: contents: read
diff --git a/NOTICE b/NOTICE index 2d5edd3..f67a356 100644 --- a/NOTICE +++ b/NOTICE
@@ -1,5 +1,5 @@ Apache Geode -Copyright 2016-2025 The Apache Software Foundation. +Copyright 2016-2026 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml index 3d59bbe..5604883 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -470,27 +470,27 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.17.0</version> + <version>2.18.6</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.17.0</version> + <version>2.18.6</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.17.0</version> + <version>2.18.6</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-joda</artifactId> - <version>2.17.0</version> + <version>2.18.6</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> - <version>2.17.0</version> + <version>2.18.6</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.17.2</version> + <version>2.25.3</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.17.2</version> + <version>2.25.3</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.17.2</version> + <version>2.25.3</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jul</artifactId> - <version>2.17.2</version> + <version>2.25.3</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <version>2.17.2</version> + <version>2.25.3</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> @@ -715,17 +715,27 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>2.6.7</version> + <version>3.3.13</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-jetty</artifactId> - <version>2.6.7</version> + <version>3.3.13</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-validation</artifactId> + <version>3.3.13</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>2.6.7</version> + <version>3.3.13</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-autoconfigure</artifactId> + <version>3.3.13</version> </dependency> <dependency> <groupId>org.jetbrains</groupId>
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 352fc1b..b72d06e 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,19 +46,19 @@ 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.17.2") + deps.put("log4j.version", "2.25.3") deps.put("log4j-slf4j2-impl.version", "2.23.1") deps.put("micrometer.version", "1.14.0") - deps.put("shiro.version", "1.13.0") + deps.put("shiro.version", "2.1.0") deps.put("slf4j-api.version", "2.0.17") deps.put("jakarta.transaction-api.version", "2.0.1") deps.put("jboss-modules.version", "1.11.0.Final") - deps.put("jackson.version", "2.17.0") - deps.put("jackson.databind.version", "2.17.0") + deps.put("jackson.version", "2.18.6") + deps.put("jackson.databind.version", "2.18.6") // Spring Framework 6.x Migration deps.put("springshell.version", "3.3.3") - deps.put("springframework.version", "6.1.14") - deps.put("springboot.version", "3.3.5") + deps.put("springframework.version", "6.1.21") + deps.put("springboot.version", "3.3.13") deps.put("springsecurity.version", "6.3.4") deps.put("springhateoas.version", "2.3.3") deps.put("springldap.version", "3.2.7") @@ -82,7 +82,7 @@ // 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.27") + deps.put("jetty.version", "12.0.33") // These versions are referenced in test.gradle, which is aggressively injected into all projects. deps.put("junit.version", "4.13.2") @@ -258,6 +258,7 @@ dependencySet(group: 'org.apache.logging.log4j', version: get('log4j.version')) { entry('log4j-api') entry('log4j-core') + entry('log4j-core-test') entry('log4j-jcl') entry('log4j-jul') entry('log4j-slf4j-impl')
diff --git a/build.gradle b/build.gradle index 59c2e0a..f18bc03 100755 --- a/build.gradle +++ b/build.gradle
@@ -80,8 +80,11 @@ // Exclude 'log4j-to-slf4j' globally. Geode's logging architecture requires Log4j Core to be the primary logging implementation, // with SLF4J calls being routed TO Log4j (via log4j-slf4j-impl), not the other way around. // + // Logback is unused (transitive from spring-boot-starter-logging). Geode uses Log4j 2 for all logging. + // configurations.all { exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j' + exclude group: 'ch.qos.logback' } buildRoot = buildRoot.trim()
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml index a5d455a..7979f1d 100644 --- a/ci/pipelines/shared/jinja.variables.yml +++ b/ci/pipelines/shared/jinja.variables.yml
@@ -17,7 +17,7 @@ benchmarks: baseline_branch_default: '' - baseline_version_default: '1.15.1' + baseline_version_default: '2.0.0' benchmark_branch: ((geode-build-branch)) flavors: - title: 'base'
diff --git a/docker/Dockerfile b/docker/Dockerfile index be0a201..e7147e4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile
@@ -16,23 +16,22 @@ FROM bellsoft/liberica-openjdk-alpine:17 -RUN echo "This is a TEMPLATE, DO NOT build from this Dockerfile. Instead checkout master or any released support/x.y branch." ; exit 1 # runtime dependencies RUN apk add --no-cache \ bash \ ncurses -ENV GEODE_GPG $$PLACEHOLDER$$ +ENV GEODE_GPG 5C3DA8FBB1052F4DF1DEB1EF62F7DA41B7D8F26C ENV GEODE_HOME /geode ENV PATH $PATH:$GEODE_HOME/bin # https://geode.apache.org/releases/ -ENV GEODE_VERSION $$PLACEHOLDER$$ +ENV GEODE_VERSION 2.0.0 # Binaries TGZ SHA-256 # https://dist.apache.org/repos/dist/release/geode/VERSION/apache-geode-VERSION.tgz.sha256 -ENV GEODE_SHA256 $$PLACEHOLDER$$ +ENV GEODE_SHA256 8e53f8d843a13db2294fa61ef12f7ad40f9c316eb88843b1336b1b7d06f39343 # http://apache.org/dyn/closer.cgi/geode/1.3.0/apache-geode-1.3.0.tgz @@ -47,7 +46,6 @@ ; do \ target="$(basename "$file")"; \ for url in \ - "https://www.apache.org/dyn/closer.lua/$file?action=download" \ "https://downloads.apache.org/$file" \ "https://archive.apache.org/dist/$file" \ ; do \
diff --git a/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml b/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml index 1b3957f..b1feb8c 100644 --- a/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml +++ b/extensions/geode-modules-tomcat10/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/extensions/geode-modules/src/test/resources/expected-pom.xml b/extensions/geode-modules/src/test/resources/expected-pom.xml index c97e587..8228c54 100644 --- a/extensions/geode-modules/src/test/resources/expected-pom.xml +++ b/extensions/geode-modules/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle b/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle index 10af76a..48626e2 100644 --- a/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle +++ b/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle
@@ -25,7 +25,7 @@ dependencies { implementation("${project.group}:geode-core:${project.version}") - runtimeOnly('org.apache.logging.log4j:log4j-slf4j-impl:2.17.2') + runtimeOnly('org.apache.logging.log4j:log4j-slf4j-impl:2.25.3') } application {
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java index 4e5e13f..b2fc46e 100644 --- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java +++ b/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.27"; + private static final String JETTY_VERSION = "12.0.33"; /** * Get the version number, download URL, and container name of a generic app server using
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index 921f5f8..6489852 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -920,10 +920,10 @@ lib/angus-activation-2.0.0.jar lib/antlr-2.7.7.jar lib/antlr-runtime-3.5.2.jar -lib/asm-9.8.jar -lib/asm-commons-9.8.jar -lib/asm-tree-9.8.jar -lib/byte-buddy-1.14.9.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.82.jar lib/classgraph-4.8.147.jar lib/classmate-1.5.1.jar lib/commons-beanutils-1.11.0.jar @@ -959,17 +959,17 @@ lib/geode-unsafe-0.0.0.jar lib/geode-wan-0.0.0.jar lib/gfsh-dependencies.jar -lib/hibernate-validator-8.0.1.Final.jar +lib/hibernate-validator-8.0.2.Final.jar lib/httpclient5-5.4.4.jar lib/httpcore5-5.3.4.jar lib/httpcore5-h2-5.3.4.jar lib/istack-commons-runtime-4.1.1.jar -lib/jackson-annotations-2.17.0.jar -lib/jackson-core-2.17.0.jar -lib/jackson-databind-2.17.0.jar -lib/jackson-dataformat-yaml-2.17.0.jar -lib/jackson-datatype-joda-2.17.0.jar -lib/jackson-datatype-jsr310-2.17.0.jar +lib/jackson-annotations-2.18.6.jar +lib/jackson-core-2.18.6.jar +lib/jackson-databind-2.18.6.jar +lib/jackson-dataformat-yaml-2.18.6.jar +lib/jackson-datatype-joda-2.18.6.jar +lib/jackson-datatype-jsr310-2.18.6.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,20 +986,20 @@ 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.27.jar -lib/jetty-ee10-annotations-12.0.27.jar -lib/jetty-ee10-plus-12.0.27.jar -lib/jetty-ee10-servlet-12.0.27.jar -lib/jetty-ee10-webapp-12.0.27.jar -lib/jetty-http-12.0.27.jar -lib/jetty-io-12.0.27.jar -lib/jetty-jndi-12.0.27.jar -lib/jetty-plus-12.0.27.jar -lib/jetty-security-12.0.27.jar -lib/jetty-server-12.0.27.jar -lib/jetty-session-12.0.27.jar -lib/jetty-util-12.0.27.jar -lib/jetty-xml-12.0.27.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/jgroups-3.6.20.Final.jar lib/jline-builtins-3.26.3.jar lib/jline-console-3.26.3.jar @@ -1011,14 +1011,12 @@ 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.16.jar -lib/log4j-api-2.17.2.jar -lib/log4j-core-2.17.2.jar -lib/log4j-jcl-2.17.2.jar -lib/log4j-jul-2.17.2.jar -lib/log4j-slf4j-impl-2.17.2.jar -lib/logback-classic-1.5.11.jar -lib/logback-core-1.5.11.jar +lib/jul-to-slf4j-2.0.17.jar +lib/log4j-api-2.25.3.jar +lib/log4j-core-2.25.3.jar +lib/log4j-jcl-2.25.3.jar +lib/log4j-jul-2.25.3.jar +lib/log4j-slf4j-impl-2.25.3.jar lib/lucene-analysis-common-9.12.3.jar lib/lucene-analysis-phonetic-9.12.3.jar lib/lucene-core-9.12.3.jar @@ -1034,39 +1032,41 @@ lib/reactive-streams-1.0.4.jar lib/reactor-core-3.6.10.jar lib/rmiio-2.1.2.jar -lib/shiro-cache-1.13.0.jar -lib/shiro-config-core-1.13.0.jar -lib/shiro-config-ogdl-1.13.0.jar -lib/shiro-core-1.13.0.jar -lib/shiro-crypto-cipher-1.13.0.jar -lib/shiro-crypto-core-1.13.0.jar -lib/shiro-crypto-hash-1.13.0.jar -lib/shiro-event-1.13.0.jar -lib/shiro-lang-1.13.0.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/snakeyaml-2.2.jar +lib/snakeyaml-2.3.jar lib/snappy-0.5.jar -lib/spring-aop-6.1.14.jar -lib/spring-beans-6.1.14.jar -lib/spring-boot-3.3.5.jar -lib/spring-boot-autoconfigure-3.3.5.jar -lib/spring-boot-starter-3.3.5.jar -lib/spring-boot-starter-logging-3.3.5.jar -lib/spring-boot-starter-validation-3.3.5.jar -lib/spring-context-6.1.14.jar -lib/spring-core-6.1.14.jar -lib/spring-expression-6.1.14.jar -lib/spring-jcl-6.1.14.jar -lib/spring-messaging-6.1.14.jar +lib/spring-aop-6.1.21.jar +lib/spring-beans-6.1.21.jar +lib/spring-boot-3.3.13.jar +lib/spring-boot-autoconfigure-3.3.13.jar +lib/spring-boot-starter-3.3.13.jar +lib/spring-boot-starter-logging-3.3.13.jar +lib/spring-boot-starter-validation-3.3.13.jar +lib/spring-context-6.1.21.jar +lib/spring-core-6.1.21.jar +lib/spring-expression-6.1.21.jar +lib/spring-jcl-6.1.21.jar +lib/spring-messaging-6.1.21.jar lib/spring-shell-autoconfigure-3.3.3.jar lib/spring-shell-core-3.3.3.jar lib/spring-shell-standard-3.3.3.jar lib/spring-shell-standard-commands-3.3.3.jar lib/spring-shell-starter-3.3.3.jar lib/spring-shell-table-3.3.3.jar -lib/spring-web-6.1.14.jar +lib/spring-web-6.1.21.jar lib/swagger-annotations-2.2.22.jar -lib/tomcat-embed-el-10.1.31.jar +lib/tomcat-embed-el-10.1.42.jar lib/txw2-4.0.2.jar tools/Extensions/geode-web-0.0.0.war tools/Extensions/geode-web-api-0.0.0.war
diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt b/geode-assembly/src/integrationTest/resources/expected_jars.txt index f202316..7d0c0f2 100644 --- a/geode-assembly/src/integrationTest/resources/expected_jars.txt +++ b/geode-assembly/src/integrationTest/resources/expected_jars.txt
@@ -9,7 +9,7 @@ asm asm-commons asm-tree -byte-buddy +bcprov-jdk18on classgraph classmate commons-beanutils @@ -84,8 +84,6 @@ log4j-jcl log4j-jul log4j-slf4j-impl -logback-classic -logback-core lucene-analysis-common lucene-analysis-phonetic lucene-core @@ -111,6 +109,8 @@ shiro-crypto-core shiro-crypto-hash shiro-event +shiro-hashes-argon +shiro-hashes-bcrypt shiro-lang slf4j-api snakeyaml
diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt index e2dd99e..98275ee 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
@@ -18,40 +18,40 @@ geode-unsafe-0.0.0.jar geode-deployment-legacy-0.0.0.jar spring-shell-starter-3.3.3.jar -spring-web-6.1.14.jar +spring-web-6.1.21.jar commons-lang3-3.18.0.jar rmiio-2.1.2.jar -jackson-datatype-joda-2.17.0.jar -jackson-annotations-2.17.0.jar -jackson-dataformat-yaml-2.17.0.jar -jackson-core-2.17.0.jar -jackson-datatype-jsr310-2.17.0.jar -jackson-databind-2.17.0.jar +jackson-datatype-joda-2.18.6.jar +jackson-annotations-2.18.6.jar +jackson-dataformat-yaml-2.18.6.jar +jackson-core-2.18.6.jar +jackson-datatype-jsr310-2.18.6.jar +jackson-databind-2.18.6.jar swagger-annotations-2.2.22.jar jaxb-runtime-4.0.2.jar jaxb-core-4.0.2.jar jakarta.xml.bind-api-4.0.2.jar jopt-simple-5.0.4.jar -log4j-slf4j-impl-2.17.2.jar -log4j-core-2.17.2.jar -log4j-jcl-2.17.2.jar -log4j-jul-2.17.2.jar -log4j-api-2.17.2.jar -spring-aop-6.1.14.jar +log4j-slf4j-impl-2.25.3.jar +log4j-core-2.25.3.jar +log4j-jcl-2.25.3.jar +log4j-jul-2.25.3.jar +log4j-api-2.25.3.jar +spring-aop-6.1.21.jar spring-shell-autoconfigure-3.3.3.jar spring-shell-standard-commands-3.3.3.jar spring-shell-standard-3.3.3.jar spring-shell-core-3.3.3.jar spring-shell-table-3.3.3.jar -spring-boot-starter-validation-3.3.5.jar -spring-boot-starter-3.3.5.jar -spring-messaging-6.1.14.jar -spring-boot-autoconfigure-3.3.5.jar -spring-boot-3.3.5.jar -spring-context-6.1.14.jar -spring-beans-6.1.14.jar -spring-expression-6.1.14.jar -spring-core-6.1.14.jar +spring-boot-starter-validation-3.3.13.jar +spring-boot-starter-3.3.13.jar +spring-messaging-6.1.21.jar +spring-boot-autoconfigure-3.3.13.jar +spring-boot-3.3.13.jar +spring-context-6.1.21.jar +spring-beans-6.1.21.jar +spring-expression-6.1.21.jar +spring-core-6.1.21.jar angus-activation-2.0.0.jar jakarta.activation-api-2.1.3.jar lucene-analysis-phonetic-9.12.3.jar @@ -66,8 +66,8 @@ antlr-2.7.7.jar istack-commons-runtime-4.1.1.jar commons-validator-1.7.jar -shiro-core-1.13.0.jar -shiro-config-ogdl-1.13.0.jar +shiro-core-2.1.0.jar +shiro-config-ogdl-2.1.0.jar commons-beanutils-1.11.0.jar commons-codec-1.15.jar commons-collections-3.2.2.jar @@ -76,48 +76,48 @@ commons-logging-1.3.5.jar classgraph-4.8.147.jar micrometer-core-1.14.0.jar +HdrHistogram-2.2.2.jar fastutil-8.5.8.jar jakarta.resource-api-2.1.0.jar -jetty-ee10-annotations-12.0.27.jar -jetty-ee10-plus-12.0.27.jar +jetty-ee10-annotations-12.0.33.jar +jetty-ee10-plus-12.0.33.jar jakarta.enterprise.cdi-api-4.0.1.jar jakarta.interceptor-api-2.1.0.jar jakarta.annotation-api-2.1.1.jar -jetty-ee10-webapp-12.0.27.jar -jetty-ee10-servlet-12.0.27.jar +jetty-ee10-webapp-12.0.33.jar +jetty-ee10-servlet-12.0.33.jar jakarta.servlet-api-6.0.0.jar jakarta.transaction-api-2.0.1.jar joda-time-2.12.7.jar jna-platform-5.11.0.jar jna-5.11.0.jar -jetty-ee-12.0.27.jar -jetty-session-12.0.27.jar -jetty-plus-12.0.27.jar -jetty-security-12.0.27.jar -jetty-server-12.0.27.jar +jetty-ee-12.0.33.jar +jetty-session-12.0.33.jar +jetty-plus-12.0.33.jar +jetty-security-12.0.33.jar +jetty-server-12.0.33.jar snappy-0.5.jar jgroups-3.6.20.Final.jar -shiro-cache-1.13.0.jar -shiro-crypto-hash-1.13.0.jar -shiro-crypto-cipher-1.13.0.jar -shiro-config-core-1.13.0.jar -shiro-event-1.13.0.jar -shiro-crypto-core-1.13.0.jar -shiro-lang-1.13.0.jar -jetty-xml-12.0.27.jar -jetty-http-12.0.27.jar -jetty-io-12.0.27.jar -spring-boot-starter-logging-3.3.5.jar -logback-classic-1.5.11.jar -jul-to-slf4j-2.0.16.jar -jetty-jndi-12.0.27.jar -jetty-util-12.0.27.jar +shiro-cache-2.1.0.jar +shiro-crypto-hash-2.1.0.jar +shiro-crypto-cipher-2.1.0.jar +shiro-config-core-2.1.0.jar +shiro-event-2.1.0.jar +shiro-crypto-core-2.1.0.jar +shiro-lang-2.1.0.jar +shiro-hashes-argon2-2.1.0.jar +shiro-hashes-bcrypt-2.1.0.jar +jetty-xml-12.0.33.jar +jetty-http-12.0.33.jar +jetty-io-12.0.33.jar +spring-boot-starter-logging-3.3.13.jar +jul-to-slf4j-2.0.17.jar +jetty-jndi-12.0.33.jar +jetty-util-12.0.33.jar slf4j-api-2.0.17.jar -byte-buddy-1.14.9.jar micrometer-observation-1.14.0.jar -spring-jcl-6.1.14.jar +spring-jcl-6.1.21.jar micrometer-commons-1.14.0.jar -HdrHistogram-2.2.2.jar LatencyUtils-2.0.3.jar reactor-core-3.6.10.jar jline-console-3.26.3.jar @@ -127,19 +127,19 @@ jline-terminal-3.26.3.jar ST4-4.3.3.jar txw2-4.0.2.jar -snakeyaml-2.2.jar -asm-commons-9.8.jar -asm-tree-9.8.jar -asm-9.8.jar +snakeyaml-2.3.jar +asm-commons-9.9.1.jar +asm-tree-9.9.1.jar +asm-9.9.1.jar reactive-streams-1.0.4.jar jline-native-3.26.3.jar antlr-runtime-3.5.2.jar -tomcat-embed-el-10.1.31.jar -hibernate-validator-8.0.1.Final.jar +tomcat-embed-el-10.1.42.jar +hibernate-validator-8.0.2.Final.jar jakarta.enterprise.lang-model-4.0.1.jar jakarta.validation-api-3.0.2.jar jboss-logging-3.4.3.Final.jar classmate-1.5.1.jar -logback-core-1.5.11.jar jakarta.el-api-5.0.0.jar jakarta.inject-api-2.0.1.jar +bcprov-jdk18on-1.82.jar
diff --git a/geode-assembly/src/main/dist/NOTICE b/geode-assembly/src/main/dist/NOTICE index 669158e..273cf8f 100644 --- a/geode-assembly/src/main/dist/NOTICE +++ b/geode-assembly/src/main/dist/NOTICE
@@ -1,5 +1,5 @@ Apache Geode -Copyright 2016-2025 The Apache Software Foundation. +Copyright 2016-2026 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
diff --git a/geode-common/src/test/resources/expected-pom.xml b/geode-common/src/test/resources/expected-pom.xml index 374eda1..17d47fe 100644 --- a/geode-common/src/test/resources/expected-pom.xml +++ b/geode-common/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-concurrency-test/src/test/resources/expected-pom.xml b/geode-concurrency-test/src/test/resources/expected-pom.xml index 2940e8b..ea8edc9 100644 --- a/geode-concurrency-test/src/test/resources/expected-pom.xml +++ b/geode-concurrency-test/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-connectors/src/test/resources/expected-pom.xml b/geode-connectors/src/test/resources/expected-pom.xml index 6a30589..e45d029 100644 --- a/geode-connectors/src/test/resources/expected-pom.xml +++ b/geode-connectors/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -132,6 +160,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -143,6 +175,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -154,6 +190,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -165,6 +205,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -178,6 +222,10 @@ <groupId>org.apache.logging.log4j</groupId> </exclusion> <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>cglib</artifactId> <groupId>*</groupId> </exclusion> @@ -212,6 +260,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java index 98fae4a..d2e204e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java +++ b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
@@ -28,8 +28,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.Logger; import org.apache.shiro.SecurityUtils; -import org.apache.shiro.ShiroException; import org.apache.shiro.UnavailableSecurityManagerException; +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.authz.AuthorizationException; +import org.apache.shiro.config.ConfigurationException; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.support.SubjectThreadState; @@ -173,7 +175,7 @@ currentUser.login(token); } catch (UnavailableSecurityManagerException e) { throw new CacheClosedException("Cache is closed."); - } catch (ShiroException e) { + } catch (AuthenticationException | ConfigurationException e) { logger.info("error logging in: " + token.getPrincipal()); Throwable cause = e.getCause(); if (cause == null) { @@ -199,7 +201,7 @@ try { logger.debug("Logging out " + currentUser.getPrincipal()); currentUser.logout(); - } catch (ShiroException e) { + } catch (AuthenticationException e) { logger.info("error logging out: " + currentUser.getPrincipal()); throw new GemFireSecurityException(e.getMessage(), e); } @@ -286,7 +288,7 @@ try { currentUser.checkPermission(context); - } catch (ShiroException e) { + } catch (AuthorizationException e) { String message = currentUser.getPrincipal() + " not authorized for " + context; logger.info("NotAuthorizedException: {}", message); throw new NotAuthorizedException(message, e);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java index 346955b..7fbaa93 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
@@ -18,6 +18,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTHENTICATOR; import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT; +import java.lang.reflect.Method; import java.util.Properties; import org.apache.commons.lang3.StringUtils; @@ -88,9 +89,20 @@ private static boolean isShiroInUse() { // Don't import Shiro otherwise clients must include on classpath + // Use reflective lookup without initializing the class and be defensive about + // ClassNotFound/NoClassDef/Linkage errors which can occur when the webapp + // classloader does not provide Shiro runtime. If any such error occurs, + // treat Shiro as not in use to avoid hard failures during webapp startup. try { - return null != Class.forName("org.apache.shiro.SecurityUtils").getMethod("getSecurityManager") - .invoke(null); + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + Class<?> securityUtils = Class.forName("org.apache.shiro.SecurityUtils", false, cl); + Method getSecurityManager = securityUtils.getMethod("getSecurityManager"); + Object sm = getSecurityManager.invoke(null); + return sm != null; + } catch (ClassNotFoundException e) { + return false; + } catch (LinkageError e) { + return false; } catch (Exception e) { return false; }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/shiro/SecurityManagerProvider.java b/geode-core/src/main/java/org/apache/geode/internal/security/shiro/SecurityManagerProvider.java index 5d28643..447ba6b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/security/shiro/SecurityManagerProvider.java +++ b/geode-core/src/main/java/org/apache/geode/internal/security/shiro/SecurityManagerProvider.java
@@ -19,9 +19,9 @@ import org.apache.logging.log4j.Logger; import org.apache.shiro.SecurityUtils; import org.apache.shiro.config.Ini; -import org.apache.shiro.config.IniSecurityManagerFactory; import org.apache.shiro.mgt.DefaultSecurityManager; import org.apache.shiro.realm.Realm; +import org.apache.shiro.realm.text.IniRealm; import org.apache.shiro.session.mgt.DefaultSessionManager; import org.apache.shiro.session.mgt.SessionManager; @@ -41,14 +41,43 @@ public SecurityManagerProvider(String shiroConfig) { securityManager = null; - IniSecurityManagerFactory factory = new IniSecurityManagerFactory("classpath:" + shiroConfig); - // we will need to make sure that shiro uses a case sensitive permission resolver - Ini.Section main = factory.getIni().addSection("main"); + // Shiro 2.1.0: IniSecurityManagerFactory is removed. Use Ini and DefaultSecurityManager + // directly. Create an IniRealm from the Ini so realms are properly configured. + Ini ini = new Ini(); + ini.loadFromPath("classpath:" + shiroConfig); + Ini.Section main = ini.getSection("main"); + if (main == null) { + main = ini.addSection("main"); + } main.put("geodePermissionResolver", GeodePermissionResolver.class.getName()); if (!main.containsKey("iniRealm.permissionResolver")) { main.put("iniRealm.permissionResolver", "$geodePermissionResolver"); } - shiroManager = factory.getInstance(); + + // Build an IniRealm from the loaded Ini and set GeodePermissionResolver explicitly. + // Create the realm first, set the GeodePermissionResolver, then attach the Ini + // so the realm parses roles/permissions using our resolver. + IniRealm iniRealm = new IniRealm(); + iniRealm.setPermissionResolver(new GeodePermissionResolver()); + iniRealm.setIni(ini); + // If the realm exposes an init method, ensure it is initialized (defensive). + try { + java.lang.reflect.Method init = iniRealm.getClass().getMethod("init"); + if (init != null) { + init.invoke(iniRealm); + } + } catch (Throwable t) { + // Not critical if method is absent or invocation fails, but log for diagnostics. + logger.debug("IniRealm init invocation failed; continuing without init", t); + } + + // Create a DefaultSecurityManager backed by the IniRealm so realms exist. + shiroManager = new DefaultSecurityManager((Realm) iniRealm); + + // try to increase global session timeout similar to other provider constructors + if (shiroManager instanceof DefaultSecurityManager) { + increaseShiroGlobalSessionTimeout((DefaultSecurityManager) shiroManager); + } }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerShiroAcceptListTest.java b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerShiroAcceptListTest.java index 64f3415..eb255c6 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerShiroAcceptListTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerShiroAcceptListTest.java
@@ -25,15 +25,16 @@ import java.io.IOException; import java.util.Properties; -import org.apache.shiro.ShiroException; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authz.AuthorizationException; -import org.apache.shiro.codec.CodecException; import org.apache.shiro.config.ConfigurationException; import org.apache.shiro.crypto.UnknownAlgorithmException; import org.apache.shiro.dao.InvalidResourceUsageException; import org.apache.shiro.env.RequiredTypeException; -import org.apache.shiro.io.SerializationException; +import org.apache.shiro.lang.ShiroException; +import org.apache.shiro.lang.codec.CodecException; +import org.apache.shiro.lang.io.SerializationException; +import org.apache.shiro.lang.util.InstantiationException; import org.apache.shiro.ldap.UnsupportedAuthenticationMechanismException; import org.apache.shiro.session.SessionException; import org.apache.shiro.session.StoppedSessionException; @@ -91,7 +92,7 @@ @Test public void acceptsInstantiationException() throws IOException, ClassNotFoundException { - trySerializingObject(new org.apache.shiro.util.InstantiationException("testing"), + trySerializingObject(new InstantiationException("testing"), propertiesWithoutFilter()); }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java index fbe90a4..3588e3f 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
@@ -24,8 +24,8 @@ import java.util.Properties; -import org.apache.shiro.ShiroException; import org.apache.shiro.UnavailableSecurityManagerException; +import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.SubjectContext; @@ -53,7 +53,7 @@ private org.apache.shiro.mgt.SecurityManager shiroManager; private IntegratedSecurityService securityService; - private ShiroException shiroException; + private AuthenticationException shiroException; private Properties properties; @Before @@ -68,7 +68,7 @@ when(mockSubject.getPrincipal()).thenReturn("principal"); when(mockSubject.getSession()).thenReturn(mock(Session.class)); - shiroException = mock(ShiroException.class); + shiroException = mock(AuthenticationException.class); properties = new Properties(); securityService = new IntegratedSecurityService(provider, null); @@ -189,7 +189,7 @@ doThrow(shiroException).when(mockSubject).login(any(GeodeAuthenticationToken.class)); assertThatThrownBy(() -> securityService.login(properties)) .isInstanceOf(AuthenticationFailedException.class) - .hasCauseInstanceOf(ShiroException.class) + .hasCauseInstanceOf(AuthenticationException.class) .hasMessageContaining("Authentication error. Please check your credentials"); }
diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml index dac4131..f8a4cf1 100644 --- a/geode-core/src/test/resources/expected-pom.xml +++ b/geode-core/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -132,6 +160,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -143,6 +175,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -154,6 +190,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -165,6 +205,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -176,6 +220,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -187,6 +235,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -198,6 +250,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -209,6 +265,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -220,6 +280,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -231,6 +295,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -242,6 +310,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -253,6 +325,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -264,6 +340,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -275,6 +355,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -286,6 +370,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -298,6 +386,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -310,6 +402,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -321,6 +417,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -332,6 +432,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -343,6 +447,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -354,6 +462,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -365,6 +477,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -376,6 +492,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -387,6 +507,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -398,6 +522,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -409,6 +537,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -422,6 +554,10 @@ </exclusion> <exclusion> <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> + <artifactId>*</artifactId> <groupId>*</groupId> </exclusion> </exclusions> @@ -435,6 +571,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -446,6 +586,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -458,6 +602,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-cq/src/test/resources/expected-pom.xml b/geode-cq/src/test/resources/expected-pom.xml index 3238e6c..8c9fa27 100644 --- a/geode-cq/src/test/resources/expected-pom.xml +++ b/geode-cq/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml b/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml index 70dd4cd..19f3cb4 100644 --- a/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml +++ b/geode-deployment/geode-deployment-legacy/src/test/resources/expected-pom.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with
diff --git a/geode-docs/managing/logging/configuring_log4j2.html.md.erb b/geode-docs/managing/logging/configuring_log4j2.html.md.erb index 460af79..46f88f4 100644 --- a/geode-docs/managing/logging/configuring_log4j2.html.md.erb +++ b/geode-docs/managing/logging/configuring_log4j2.html.md.erb
@@ -36,16 +36,16 @@ For example, if you are using: -- **Commons Logging**, download "Commons Logging Bridge" (`log4j-jcl-2.17.2.jar`) -- **SLF4J**, download "SLFJ4 Binding" (`log4j-slf4j-impl-2.17.2.jar`) -- **java.util.logging**, download the "JUL adapter" (`log4j-jul-2.17.2.jar`) +- **Commons Logging**, download "Commons Logging Bridge" (`log4j-jcl-2.25.3.jar`) +- **SLF4J**, download "SLFJ4 Binding" (`log4j-slf4j-impl-2.25.3.jar`) +- **java.util.logging**, download the "JUL adapter" (`log4j-jul-2.25.3.jar`) See [http://logging.apache.org/log4j/2.x/faq.html](http://logging.apache.org/log4j/2.x/faq.html) for more examples. -All three of the above JAR files are in the full distribution of Log4J 2.17.2 which can be downloaded at [http://logging.apache.org/log4j/2.x/download.html](http://logging.apache.org/log4j/2.x/download.html). Download the appropriate bridge, adapter, or binding JARs to ensure that <%=vars.product_name%> logging is integrated with every logging API used in various third-party libraries or in your own applications. +All three of the above JAR files are in the full distribution of Log4J 2.25.3 which can be downloaded at [http://logging.apache.org/log4j/2.x/download.html](http://logging.apache.org/log4j/2.x/download.html). Download the appropriate bridge, adapter, or binding JARs to ensure that <%=vars.product_name%> logging is integrated with every logging API used in various third-party libraries or in your own applications. **Note:** -<%=vars.product_name_long%> has been tested with Log4j 2.17.2. As newer versions of Log4j 2 come out, you can find 2.17.2 under Previous Releases on that page. +<%=vars.product_name_long%> has been tested with Log4j 2.25.3. As newer versions of Log4j 2 come out, you can find 2.25.3 under Previous Releases on that page. ## Customizing Your Own log4j2.xml File
diff --git a/geode-docs/managing/logging/how_logging_works.html.md.erb b/geode-docs/managing/logging/how_logging_works.html.md.erb index ea150a8..4103bce 100644 --- a/geode-docs/managing/logging/how_logging_works.html.md.erb +++ b/geode-docs/managing/logging/how_logging_works.html.md.erb
@@ -21,9 +21,9 @@ <%=vars.product_name%> uses [Apache Log4j 2](http://logging.apache.org/log4j/2.x/) API and Core libraries as the basis for its logging system. Log4j 2 API is a popular and powerful front-end logging API used by all the <%=vars.product_name%> classes to generate log statements. Log4j 2 Core is a backend implementation for logging; you can route any of the front-end logging API libraries to log to this backend. <%=vars.product_name%> uses the Core backend to run three custom Log4j 2 Appenders: **GeodeConsole**, **GeodeLogWriter**, and **GeodeAlert**. -<%=vars.product_name%> has been tested with Log4j 2.17.2. +<%=vars.product_name%> has been tested with Log4j 2.25.3. <%=vars.product_name%> requires the -`log4j-api-2.17.2.jar` and `log4j-core-2.17.2.jar` +`log4j-api-2.25.3.jar` and `log4j-core-2.25.3.jar` JAR files to be in the classpath. Both of these JARs are distributed in the `<path-to-product>/lib` directory and included in the appropriate `*-dependencies.jar` convenience libraries.
diff --git a/geode-docs/tools_modules/http_session_mgmt/weblogic_setting_up_the_module.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/weblogic_setting_up_the_module.html.md.erb index 237ce15..26bfb69 100644 --- a/geode-docs/tools_modules/http_session_mgmt/weblogic_setting_up_the_module.html.md.erb +++ b/geode-docs/tools_modules/http_session_mgmt/weblogic_setting_up_the_module.html.md.erb
@@ -108,9 +108,9 @@ lib/geode-serialization-2.0.0.jar lib/jakarta.transaction-api-2.0.1.jar lib/jgroups-3.6.20.Final.jar - lib/log4j-api-2.17.2.jar - lib/log4j-core-2.17.2.jar - lib/log4j-jul-2.17.2.jar + lib/log4j-api-2.25.3.jar + lib/log4j-core-2.25.3.jar + lib/log4j-jul-2.25.3.jar ``` ## <a id="weblogic_setting_up_the_module__section_20294A39368D4402AEFB3D074E8D5887" class="no-quick-link"></a>Peer-to-Peer Setup
diff --git a/geode-dunit/src/test/resources/expected-pom.xml b/geode-dunit/src/test/resources/expected-pom.xml index d33bf89..e79012b 100644 --- a/geode-dunit/src/test/resources/expected-pom.xml +++ b/geode-dunit/src/test/resources/expected-pom.xml
@@ -56,6 +56,10 @@ <groupId>org.apache.logging.log4j</groupId> </exclusion> <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>geode-core</artifactId> <groupId>*</groupId> </exclusion> @@ -70,6 +74,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -81,6 +89,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -92,6 +104,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -103,6 +119,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -114,6 +134,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -125,6 +149,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -136,6 +164,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -148,6 +180,10 @@ <groupId>org.apache.logging.log4j</groupId> </exclusion> <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>geode-core</artifactId> <groupId>*</groupId> </exclusion> @@ -162,6 +198,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -173,6 +213,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -184,6 +228,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -195,6 +243,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -206,6 +258,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -218,6 +274,10 @@ <groupId>org.apache.logging.log4j</groupId> </exclusion> <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>cglib</artifactId> <groupId>*</groupId> </exclusion> @@ -257,6 +317,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -269,6 +333,10 @@ <groupId>org.apache.logging.log4j</groupId> </exclusion> <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>junit-dep</artifactId> <groupId>*</groupId> </exclusion> @@ -283,6 +351,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -294,6 +366,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -305,6 +381,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -316,6 +396,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -328,6 +412,10 @@ <groupId>org.apache.logging.log4j</groupId> </exclusion> <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>hamcrest</artifactId> <groupId>*</groupId> </exclusion>
diff --git a/geode-gfsh/src/test/resources/expected-pom.xml b/geode-gfsh/src/test/resources/expected-pom.xml index c0a34b4..45903f4 100644 --- a/geode-gfsh/src/test/resources/expected-pom.xml +++ b/geode-gfsh/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,595 +16,383 @@ See the License for the specific language governing permissions and limitations under the License. --> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.geode</groupId> - <artifactId>geode-gfsh</artifactId> - <version>${version}</version> - <name>Apache Geode</name> - <description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description> - <url>http://geode.apache.org</url> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> - <scm> - <connection>scm:git:https://github.com:apache/geode.git</connection> - <developerConnection>scm:git:https://github.com:apache/geode.git</developerConnection> - <url>https://github.com/apache/geode</url> - </scm> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.geode</groupId> - <artifactId>geode-all-bom</artifactId> - <version>${version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.geode</groupId> - <artifactId>geode-core</artifactId> - <scope>compile</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.apache.geode</groupId> - <artifactId>geode-common</artifactId> - <scope>compile</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.springframework.shell</groupId> - <artifactId>spring-shell-starter</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>log4j-to-slf4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>cglib</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>asm</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>spring-aop</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>guava</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>aopalliance</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>spring-context-support</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.geode</groupId> - <artifactId>geode-logging</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.apache.geode</groupId> - <artifactId>geode-membership</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.apache.geode</groupId> - <artifactId>geode-serialization</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.apache.geode</groupId> - <artifactId>geode-unsafe</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.springframework</groupId> - <artifactId>spring-web</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> + <exclusion> <artifactId>spring-core</artifactId> - <groupId>*</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>*</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</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>com.healthmarketscience.rmiio</groupId> - <artifactId>rmiio</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>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</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>io.swagger.core.v3</groupId> - <artifactId>swagger-annotations</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>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</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>net.sf.jopt-simple</groupId> - <artifactId>jopt-simple</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.apache.logging.log4j</groupId> - <artifactId>log4j-api</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.apache.geode</groupId> - <artifactId>geode-log4j</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.springframework</groupId> - <artifactId>spring-core</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> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</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> - <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>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</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.apache.logging.log4j</groupId> - <artifactId>log4j-jul</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> - </dependencies> - </project>
diff --git a/geode-http-service/src/test/resources/expected-pom.xml b/geode-http-service/src/test/resources/expected-pom.xml index b768efe..56b53d0 100644 --- a/geode-http-service/src/test/resources/expected-pom.xml +++ b/geode-http-service/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-jmh/src/test/resources/expected-pom.xml b/geode-jmh/src/test/resources/expected-pom.xml index be1bcec..b75ba94 100644 --- a/geode-jmh/src/test/resources/expected-pom.xml +++ b/geode-jmh/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-junit/src/test/resources/expected-pom.xml b/geode-junit/src/test/resources/expected-pom.xml index 2c6a647..87dbcf8 100644 --- a/geode-junit/src/test/resources/expected-pom.xml +++ b/geode-junit/src/test/resources/expected-pom.xml
@@ -56,6 +56,10 @@ <groupId>org.apache.logging.log4j</groupId> </exclusion> <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>hamcrest</artifactId> <groupId>*</groupId> </exclusion> @@ -70,6 +74,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -81,6 +89,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -92,6 +104,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -103,6 +119,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -114,6 +134,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -125,6 +149,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -136,6 +164,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -147,6 +179,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -159,6 +195,10 @@ <groupId>org.apache.logging.log4j</groupId> </exclusion> <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>junit-dep</artifactId> <groupId>*</groupId> </exclusion> @@ -173,6 +213,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -184,6 +228,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -195,6 +243,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -206,6 +258,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -217,6 +273,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -228,6 +288,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -239,6 +303,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -250,6 +318,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -261,6 +333,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -272,6 +348,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -283,6 +363,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -294,6 +378,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-log4j/build.gradle b/geode-log4j/build.gradle index d2501c2..9d0cd64 100644 --- a/geode-log4j/build.gradle +++ b/geode-log4j/build.gradle
@@ -21,6 +21,24 @@ id 'jmh' } +// GEODE-10543: Configure GraalVM annotation processor options for Log4j 2.25.3 +// Log4j 2.25.3 includes a GraalVM Reachability Metadata annotation processor that generates +// plugin descriptors for native image compilation. Without these options, the processor emits +// warnings about missing Maven coordinates, which are treated as compilation errors by Gradle. +// +// These options specify the Maven coordinates (groupId:artifactId) for the generated plugin +// descriptors, suppressing the warnings and allowing compilation to succeed. +// +// Apply only to main source compilation, as integration tests don't trigger the annotation processor. +// +// Reference: https://issues.apache.org/jira/browse/LOG4J2-3642 +tasks.named('compileJava').configure { + options.compilerArgs += [ + '-Alog4j.graalvm.groupId=org.apache.geode', + '-Alog4j.graalvm.artifactId=geode-log4j' + ] +} + dependencies { api(platform(project(':boms:geode-all-bom'))) @@ -63,8 +81,15 @@ exclude module: 'geode-core' } integrationTestImplementation('junit:junit') - integrationTestImplementation('org.apache.logging.log4j:log4j-core::tests') - integrationTestImplementation('org.apache.logging.log4j:log4j-core::test-sources') + // Log4j 2.20.0+ moved test utilities to log4j-core-test with new package names: + // org.apache.logging.log4j.junit → org.apache.logging.log4j.core.test.junit + // org.apache.logging.log4j.test → org.apache.logging.log4j.core.test + // log4j-core-test 2.25.3 transitively depends on assertj-core 3.27.3, but Geode's + // custom AssertJ assertions were built against 3.22.0. Force 3.22.0 to avoid + // NoSuchMethodError: CommonValidations.failIfEmptySinceActualIsNotEmpty + integrationTestImplementation('org.apache.logging.log4j:log4j-core-test') { + exclude group: 'org.assertj', module: 'assertj-core' + } integrationTestImplementation('org.assertj:assertj-core') distributedTestImplementation(project(':geode-junit')) {
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/alerting/log4j/internal/impl/AlertAppenderIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/alerting/log4j/internal/impl/AlertAppenderIntegrationTest.java index 1a43d58..0bd54f4 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/alerting/log4j/internal/impl/AlertAppenderIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/alerting/log4j/internal/impl/AlertAppenderIntegrationTest.java
@@ -36,7 +36,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/BothLogWriterAppendersIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/BothLogWriterAppendersIntegrationTest.java index 2f34714..b93a506 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/BothLogWriterAppendersIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/BothLogWriterAppendersIntegrationTest.java
@@ -26,7 +26,7 @@ import java.net.URL; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/CacheWithCustomLogConfigIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/CacheWithCustomLogConfigIntegrationTest.java index 4e4098a..1766378 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/CacheWithCustomLogConfigIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/CacheWithCustomLogConfigIntegrationTest.java
@@ -30,8 +30,8 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; -import org.apache.logging.log4j.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/ConfigurationWithLogLevelChangesIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/ConfigurationWithLogLevelChangesIntegrationTest.java index 1d47731..ea1bd4d 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/ConfigurationWithLogLevelChangesIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/ConfigurationWithLogLevelChangesIntegrationTest.java
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/ConsoleAppenderWithLoggerContextRuleIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/ConsoleAppenderWithLoggerContextRuleIntegrationTest.java index 9b73b57..41dfb70 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/ConsoleAppenderWithLoggerContextRuleIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/ConsoleAppenderWithLoggerContextRuleIntegrationTest.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.appender.DefaultErrorHandler; import org.apache.logging.log4j.core.appender.OutputStreamManager; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/DistributedSystemWithBothLogWriterAppendersIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/DistributedSystemWithBothLogWriterAppendersIntegrationTest.java index 5834692..ab57b6a 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/DistributedSystemWithBothLogWriterAppendersIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/DistributedSystemWithBothLogWriterAppendersIntegrationTest.java
@@ -27,7 +27,7 @@ import java.util.Properties; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/DistributedSystemWithLogLevelChangesIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/DistributedSystemWithLogLevelChangesIntegrationTest.java index b404b5d..62ef3ca 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/DistributedSystemWithLogLevelChangesIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/DistributedSystemWithLogLevelChangesIntegrationTest.java
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/FastLoggerIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/FastLoggerIntegrationTest.java index e624d4d..391fcfa 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/FastLoggerIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/FastLoggerIntegrationTest.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GemfireVerboseMarkerFilterAcceptIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GemfireVerboseMarkerFilterAcceptIntegrationTest.java index e25ebfe..19f759b 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GemfireVerboseMarkerFilterAcceptIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GemfireVerboseMarkerFilterAcceptIntegrationTest.java
@@ -24,8 +24,8 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; -import org.apache.logging.log4j.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GemfireVerboseMarkerFilterDenyIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GemfireVerboseMarkerFilterDenyIntegrationTest.java index 1d02f5e..c7cbc9b 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GemfireVerboseMarkerFilterDenyIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GemfireVerboseMarkerFilterDenyIntegrationTest.java
@@ -23,8 +23,8 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; -import org.apache.logging.log4j.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderIntegrationTest.java index 9ea97fa..3177f9a 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderIntegrationTest.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.appender.DefaultErrorHandler; import org.apache.logging.log4j.core.appender.OutputStreamManager; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderWithCacheIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderWithCacheIntegrationTest.java index c26056d..1c1a46e 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderWithCacheIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderWithCacheIntegrationTest.java
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderWithSystemOutRuleIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderWithSystemOutRuleIntegrationTest.java index d4aff79..0a5a80e 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderWithSystemOutRuleIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeConsoleAppenderWithSystemOutRuleIntegrationTest.java
@@ -21,7 +21,7 @@ import java.net.URL; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeVerboseMarkerFilterAcceptIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeVerboseMarkerFilterAcceptIntegrationTest.java index 0a69499..02adc62 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeVerboseMarkerFilterAcceptIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeVerboseMarkerFilterAcceptIntegrationTest.java
@@ -24,8 +24,8 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; -import org.apache.logging.log4j.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeVerboseMarkerFilterDenyIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeVerboseMarkerFilterDenyIntegrationTest.java index f369f0a..007017d 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeVerboseMarkerFilterDenyIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/GeodeVerboseMarkerFilterDenyIntegrationTest.java
@@ -24,8 +24,8 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; -import org.apache.logging.log4j.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogServiceWithCustomLogConfigIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogServiceWithCustomLogConfigIntegrationTest.java index c4084d8..d01ad2b 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogServiceWithCustomLogConfigIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogServiceWithCustomLogConfigIntegrationTest.java
@@ -25,8 +25,8 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; -import org.apache.logging.log4j.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderIntegrationTest.java index 8926636..5a24646 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderIntegrationTest.java
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderShutdownIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderShutdownIntegrationTest.java index 8453713..9719bff 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderShutdownIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderShutdownIntegrationTest.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderWithLimitsIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderWithLimitsIntegrationTest.java index 71f90b4..1afc589 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderWithLimitsIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderWithLimitsIntegrationTest.java
@@ -24,7 +24,7 @@ import java.io.File; import java.net.URL; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderWithMemberNameInXmlIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderWithMemberNameInXmlIntegrationTest.java index afc1977..5f64d1f 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderWithMemberNameInXmlIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/LogWriterAppenderWithMemberNameInXmlIntegrationTest.java
@@ -34,7 +34,7 @@ import java.util.regex.Pattern; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;
diff --git a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/SecurityLogWriterAppenderIntegrationTest.java b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/SecurityLogWriterAppenderIntegrationTest.java index 00ae368..0d6b0c6 100644 --- a/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/SecurityLogWriterAppenderIntegrationTest.java +++ b/geode-log4j/src/integrationTest/java/org/apache/geode/logging/log4j/internal/impl/SecurityLogWriterAppenderIntegrationTest.java
@@ -25,7 +25,7 @@ import java.net.URL; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.junit.LoggerContextRule; +import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule;
diff --git a/geode-log4j/src/test/resources/expected-pom.xml b/geode-log4j/src/test/resources/expected-pom.xml index 1dd3035..5400ae3 100644 --- a/geode-log4j/src/test/resources/expected-pom.xml +++ b/geode-log4j/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -111,6 +131,10 @@ <groupId>org.apache.logging.log4j</groupId> </exclusion> <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>slf4j-api</artifactId> <groupId>*</groupId> </exclusion> @@ -126,6 +150,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency> @@ -138,6 +166,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> <optional>true</optional> </dependency>
diff --git a/geode-logging/src/test/resources/expected-pom.xml b/geode-logging/src/test/resources/expected-pom.xml index b2528f6..baaff2b 100644 --- a/geode-logging/src/test/resources/expected-pom.xml +++ b/geode-logging/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-lucene/src/test/resources/expected-pom.xml b/geode-lucene/src/test/resources/expected-pom.xml index 4899bb2..9f12b2a 100644 --- a/geode-lucene/src/test/resources/expected-pom.xml +++ b/geode-lucene/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -133,6 +161,10 @@ <groupId>org.apache.logging.log4j</groupId> </exclusion> <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>lucene-sandbox</artifactId> <groupId>*</groupId> </exclusion> @@ -147,6 +179,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -158,6 +194,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -169,6 +209,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -180,6 +224,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -191,6 +239,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-management/src/test/resources/expected-pom.xml b/geode-management/src/test/resources/expected-pom.xml index 738c525..9ed3245 100644 --- a/geode-management/src/test/resources/expected-pom.xml +++ b/geode-management/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -132,6 +160,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -143,6 +175,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-membership/src/test/resources/expected-pom.xml b/geode-membership/src/test/resources/expected-pom.xml index 3fd2e3c..95a47c5 100644 --- a/geode-membership/src/test/resources/expected-pom.xml +++ b/geode-membership/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -132,6 +160,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -143,6 +175,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-memcached/src/test/resources/expected-pom.xml b/geode-memcached/src/test/resources/expected-pom.xml index b9ea313..99b7c52 100644 --- a/geode-memcached/src/test/resources/expected-pom.xml +++ b/geode-memcached/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-old-client-support/src/test/resources/expected-pom.xml b/geode-old-client-support/src/test/resources/expected-pom.xml index 4b50e96..8746c90 100644 --- a/geode-old-client-support/src/test/resources/expected-pom.xml +++ b/geode-old-client-support/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-pulse/src/main/webapp/META-INF/NOTICE b/geode-pulse/src/main/webapp/META-INF/NOTICE index ef6b223..21d6571 100644 --- a/geode-pulse/src/main/webapp/META-INF/NOTICE +++ b/geode-pulse/src/main/webapp/META-INF/NOTICE
@@ -1,5 +1,5 @@ Apache Geode -Copyright 2016-2025 The Apache Software Foundation. +Copyright 2016-2026 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
diff --git a/geode-rebalancer/src/test/resources/expected-pom.xml b/geode-rebalancer/src/test/resources/expected-pom.xml index 2d94a93..97e1bbe 100644 --- a/geode-rebalancer/src/test/resources/expected-pom.xml +++ b/geode-rebalancer/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -100,6 +116,10 @@ <groupId>org.apache.logging.log4j</groupId> </exclusion> <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> + <exclusion> <artifactId>spring-beans</artifactId> <groupId>*</groupId> </exclusion>
diff --git a/geode-serialization/src/test/resources/expected-pom.xml b/geode-serialization/src/test/resources/expected-pom.xml index 719336e..5e7e272 100644 --- a/geode-serialization/src/test/resources/expected-pom.xml +++ b/geode-serialization/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index 2e0a90e..6f428eb 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
@@ -19,12 +19,12 @@ geode-deployment-legacy-0.0.0.jar snappy-0.5.jar swagger-annotations-2.2.22.jar -jackson-datatype-jsr310-2.17.0.jar -jackson-annotations-2.17.0.jar -jackson-dataformat-yaml-2.17.0.jar -jackson-core-2.17.0.jar -jackson-datatype-joda-2.17.0.jar -jackson-databind-2.17.0.jar +jackson-datatype-jsr310-2.18.6.jar +jackson-annotations-2.18.6.jar +jackson-dataformat-yaml-2.18.6.jar +jackson-core-2.18.6.jar +jackson-datatype-joda-2.18.6.jar +jackson-databind-2.18.6.jar httpclient5-5.4.4.jar httpcore5-h2-5.3.4.jar httpcore5-5.3.4.jar @@ -33,11 +33,11 @@ jaxb-runtime-4.0.2.jar jaxb-core-4.0.2.jar jakarta.xml.bind-api-4.0.2.jar -log4j-slf4j-impl-2.17.2.jar -log4j-core-2.17.2.jar -log4j-jcl-2.17.2.jar -log4j-jul-2.17.2.jar -log4j-api-2.17.2.jar +log4j-slf4j-impl-2.25.3.jar +log4j-core-2.25.3.jar +log4j-jcl-2.25.3.jar +log4j-jul-2.25.3.jar +log4j-api-2.25.3.jar spring-shell-starter-3.3.3.jar rmiio-2.1.2.jar antlr-2.7.7.jar @@ -48,10 +48,15 @@ commons-io-2.19.0.jar micrometer-core-1.14.0.jar jakarta.resource-api-2.1.0.jar -jetty-ee10-annotations-12.0.27.jar -jetty-ee10-plus-12.0.27.jar +jetty-ee10-annotations-12.0.33.jar +spring-boot-starter-validation-3.3.13.jar +spring-boot-starter-3.3.13.jar +jetty-ee10-plus-12.0.33.jar +jakarta.enterprise.cdi-api-4.0.1.jar +jakarta.interceptor-api-2.1.0.jar +jakarta.annotation-api-2.1.1.jar jakarta.transaction-api-2.0.1.jar -shiro-core-1.13.0.jar +shiro-core-2.1.0.jar jgroups-3.6.20.Final.jar commons-validator-1.7.jar fastutil-8.5.8.jar @@ -59,70 +64,67 @@ jna-5.11.0.jar jopt-simple-5.0.4.jar classgraph-4.8.147.jar -spring-aop-6.1.14.jar +spring-aop-6.1.21.jar angus-activation-2.0.0.jar jakarta.activation-api-2.1.3.jar istack-commons-runtime-4.1.1.jar -spring-web-6.1.14.jar +spring-web-6.1.21.jar spring-shell-table-3.3.3.jar -spring-boot-starter-validation-3.3.5.jar -spring-boot-starter-3.3.5.jar -spring-messaging-6.1.14.jar -spring-boot-autoconfigure-3.3.5.jar -spring-boot-3.3.5.jar -spring-context-6.1.14.jar -spring-beans-6.1.14.jar -spring-expression-6.1.14.jar -spring-core-6.1.14.jar +spring-messaging-6.1.21.jar +spring-boot-autoconfigure-3.3.13.jar +spring-boot-3.3.13.jar +spring-context-6.1.21.jar +spring-beans-6.1.21.jar +spring-expression-6.1.21.jar +spring-core-6.1.21.jar lucene-analysis-phonetic-9.12.3.jar lucene-analysis-common-9.12.3.jar lucene-queryparser-9.12.3.jar lucene-queries-9.12.3.jar lucene-core-9.12.3.jar -shiro-config-ogdl-1.13.0.jar +shiro-config-ogdl-2.1.0.jar commons-beanutils-1.11.0.jar commons-codec-1.15.jar commons-collections-3.2.2.jar commons-digester-2.1.jar commons-logging-1.3.5.jar HdrHistogram-2.2.2.jar -jakarta.enterprise.cdi-api-4.0.1.jar -jakarta.interceptor-api-2.1.0.jar -jakarta.annotation-api-2.1.1.jar -jetty-ee10-webapp-12.0.27.jar -jetty-ee10-servlet-12.0.27.jar +jetty-ee10-webapp-12.0.33.jar +jetty-ee10-servlet-12.0.33.jar jakarta.servlet-api-6.0.0.jar joda-time-2.12.7.jar -jetty-ee-12.0.27.jar -jetty-session-12.0.27.jar -jetty-plus-12.0.27.jar -jetty-security-12.0.27.jar -jetty-server-12.0.27.jar -shiro-cache-1.13.0.jar -shiro-crypto-hash-1.13.0.jar -shiro-crypto-cipher-1.13.0.jar -shiro-config-core-1.13.0.jar -shiro-event-1.13.0.jar -shiro-crypto-core-1.13.0.jar -shiro-lang-1.13.0.jar -jetty-xml-12.0.27.jar -jetty-http-12.0.27.jar -jetty-io-12.0.27.jar -jetty-jndi-12.0.27.jar -jetty-util-12.0.27.jar -spring-boot-starter-logging-3.3.5.jar -logback-classic-1.5.11.jar -jul-to-slf4j-2.0.16.jar +jetty-ee-12.0.33.jar +jetty-session-12.0.33.jar +jetty-plus-12.0.33.jar +jetty-security-12.0.33.jar +jetty-server-12.0.33.jar +shiro-cache-2.1.0.jar +shiro-hashes-argon2-2.1.0.jar +shiro-hashes-bcrypt-2.1.0.jar +shiro-crypto-hash-2.1.0.jar +shiro-crypto-cipher-2.1.0.jar +shiro-config-core-2.1.0.jar +shiro-event-2.1.0.jar +shiro-crypto-core-2.1.0.jar +shiro-lang-2.1.0.jar +jetty-xml-12.0.33.jar +jetty-http-12.0.33.jar +jetty-io-12.0.33.jar +jetty-jndi-12.0.33.jar +jetty-util-12.0.33.jar +spring-boot-starter-logging-3.3.13.jar +jul-to-slf4j-2.0.17.jar slf4j-api-2.0.17.jar micrometer-observation-1.14.0.jar micrometer-commons-1.14.0.jar LatencyUtils-2.0.3.jar -byte-buddy-1.14.9.jar -spring-jcl-6.1.14.jar -asm-commons-9.8.jar -asm-tree-9.8.jar -asm-9.8.jar +snakeyaml-2.3.jar +spring-jcl-6.1.21.jar +asm-commons-9.9.1.jar +asm-tree-9.9.1.jar +asm-9.9.1.jar txw2-4.0.2.jar +bcprov-jdk18on-1.82.jar reactor-core-3.6.10.jar jline-console-3.26.3.jar jline-builtins-3.26.3.jar @@ -130,16 +132,14 @@ jline-style-3.26.3.jar jline-terminal-3.26.3.jar ST4-4.3.3.jar -snakeyaml-2.2.jar jakarta.enterprise.lang-model-4.0.1.jar reactive-streams-1.0.4.jar jline-native-3.26.3.jar antlr-runtime-3.5.2.jar -tomcat-embed-el-10.1.31.jar -hibernate-validator-8.0.1.Final.jar +tomcat-embed-el-10.1.42.jar +hibernate-validator-8.0.2.Final.jar jakarta.el-api-5.0.0.jar jakarta.inject-api-2.0.1.jar jakarta.validation-api-3.0.2.jar jboss-logging-3.4.3.Final.jar classmate-1.5.1.jar -logback-core-1.5.11.jar
diff --git a/geode-server-all/src/test/resources/expected-pom.xml b/geode-server-all/src/test/resources/expected-pom.xml index 7c57293..433544b 100644 --- a/geode-server-all/src/test/resources/expected-pom.xml +++ b/geode-server-all/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -132,6 +160,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -143,6 +175,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -154,6 +190,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -165,6 +205,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -176,6 +220,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -187,6 +235,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -198,6 +250,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -209,6 +265,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -220,6 +280,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -231,6 +295,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -242,6 +310,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -253,6 +325,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-tcp-server/src/test/resources/expected-pom.xml b/geode-tcp-server/src/test/resources/expected-pom.xml index e8b3e58..988bd23 100644 --- a/geode-tcp-server/src/test/resources/expected-pom.xml +++ b/geode-tcp-server/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-unsafe/src/test/resources/expected-pom.xml b/geode-unsafe/src/test/resources/expected-pom.xml index a5533e9..ef0bed7 100644 --- a/geode-unsafe/src/test/resources/expected-pom.xml +++ b/geode-unsafe/src/test/resources/expected-pom.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with
diff --git a/geode-wan/src/test/resources/expected-pom.xml b/geode-wan/src/test/resources/expected-pom.xml index cfc6b77..ee3b978 100644 --- a/geode-wan/src/test/resources/expected-pom.xml +++ b/geode-wan/src/test/resources/expected-pom.xml
@@ -55,6 +55,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -66,6 +70,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -77,6 +85,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -88,6 +100,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -99,6 +115,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -110,6 +130,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -121,6 +145,10 @@ <artifactId>log4j-to-slf4j</artifactId> <groupId>org.apache.logging.log4j</groupId> </exclusion> + <exclusion> + <artifactId>*</artifactId> + <groupId>ch.qos.logback</groupId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/geode-web-api/src/main/webapp/META-INF/NOTICE b/geode-web-api/src/main/webapp/META-INF/NOTICE index b8ba992..74de518 100644 --- a/geode-web-api/src/main/webapp/META-INF/NOTICE +++ b/geode-web-api/src/main/webapp/META-INF/NOTICE
@@ -1,5 +1,5 @@ Apache Geode -Copyright 2016-2025 The Apache Software Foundation. +Copyright 2016-2026 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
diff --git a/geode-web-management/src/main/webapp/META-INF/NOTICE b/geode-web-management/src/main/webapp/META-INF/NOTICE index b8ba992..74de518 100644 --- a/geode-web-management/src/main/webapp/META-INF/NOTICE +++ b/geode-web-management/src/main/webapp/META-INF/NOTICE
@@ -1,5 +1,5 @@ Apache Geode -Copyright 2016-2025 The Apache Software Foundation. +Copyright 2016-2026 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
diff --git a/geode-web/src/main/webapp/META-INF/NOTICE b/geode-web/src/main/webapp/META-INF/NOTICE index 415fc1c..1bc0241 100644 --- a/geode-web/src/main/webapp/META-INF/NOTICE +++ b/geode-web/src/main/webapp/META-INF/NOTICE
@@ -1,5 +1,5 @@ Apache Geode -Copyright 2016-2025 The Apache Software Foundation. +Copyright 2016-2026 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
diff --git a/gradle.properties b/gradle.properties index 6bfc6b1..a7e5650 100755 --- a/gradle.properties +++ b/gradle.properties
@@ -26,7 +26,7 @@ # <blank> - release # # The full version string consists of 'versionNumber + releaseQualifier + releaseType' -version = 2.0.0-build.0 +version = 2.0.1-build.0 # Default Maven targets mavenSnapshotUrl = gcs://maven.apachegeode-ci.info/snapshots
diff --git a/settings.gradle b/settings.gradle index 3989c64..9859123 100644 --- a/settings.gradle +++ b/settings.gradle
@@ -131,7 +131,10 @@ '1.13.1', '1.13.8', '1.14.0', // Include for SSL protocol configuration changes in 1.14.0 - '1.14.4'].each { + '1.14.4', + '2.0.0', + '2.0.0', + '2.0.0'].each { include 'geode-old-versions:'.concat(it) }