This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 43c7cf21b71dc0c9f19284c3acc00aeb39be8c80 Author: Volkan Yazıcı <[email protected]> AuthorDate: Fri Dec 1 12:15:36 2023 +0100 Revert "Upgrade `org.mockito:*`" This reverts commit 7569495fc3a8e05a3a7da8fc5e2bdace9a65e03d. --- .github/dependabot.yaml | 3 +++ log4j-api-test/pom.xml | 5 +++++ log4j-parent/pom.xml | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index ab7f8819b6..e97f41eace 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -43,6 +43,9 @@ updates: # Keep Logback version 1.2.x - dependency-name: "ch.qos.logback:*" update-types: ["version-update:semver-major", "version-update:semver-minor"] + # Mockito 5.x requires Java 11 + - dependency-name: "org.mockito:*" + update-types: ["version-update:semver-major"] # Apache Cassandra: keep version 3.x - dependency-name: "org.apache.cassandra:*" versions: ["[4.0.0,)"] diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml index 172f79777e..c243fad232 100644 --- a/log4j-api-test/pom.xml +++ b/log4j-api-test/pom.xml @@ -140,6 +140,11 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-inline</artifactId> + <scope>test</scope> + </dependency> <!-- Used by ServiceLoaderUtilTest --> <dependency> <groupId>org.osgi</groupId> diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index e190ae5e2d..bcf7849076 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -128,7 +128,7 @@ <log4j2-ecs-layout.version>1.5.0</log4j2-ecs-layout.version> <logback.version>1.3.13</logback.version> <maven.version>3.9.0</maven.version> - <mockito.version>5.7.0</mockito.version> + <mockito.version>4.11.0</mockito.version> <mongodb.version>4.11.1</mongodb.version> <nashorn.version>15.4</nashorn.version> <netty.version>4.1.101.Final</netty.version>
