Skip to content

ZOOKEEPER-5039: Raise to min JDK 17, also build, test with JDK25#2376

Open
PDavid wants to merge 10 commits intoapache:masterfrom
PDavid:ZOOKEEPER-5039-mockito-upgrade
Open

ZOOKEEPER-5039: Raise to min JDK 17, also build, test with JDK25#2376
PDavid wants to merge 10 commits intoapache:masterfrom
PDavid:ZOOKEEPER-5039-mockito-upgrade

Conversation

@PDavid
Copy link
Copy Markdown
Contributor

@PDavid PDavid commented Apr 23, 2026 •
edited
Loading

  • Upgrade Mockito to 5.23.0 for JDK25: As of Mockito 5.x, the mockito-inline mock-maker became the default, so mockito-inline as a separate artifact is no longer needed.
  • Switch GH: Action workflows and Jenkins builds to JDK 17 and 25
  • Upgrade spotbugs to support Java 25
    • Upgraded spotbugs-maven-plugin to 4.9.3.0 and annotations to 4.9.3.
    • Overrode ASM to 9.9.1 in the plugin dependencies to support JDK 25 (class file version 69).
    • Added newly found bug patterns to excludeFindBugsFilter.xml - these are all pre-existing issues in the codebase that the newer SpotBugs detects but the old version couldn't.
  • Upgrade burningwave mockdns to 0.27.2 to support JDK25
  • Fix PrometheusMetricsProviderConfigTest: Exception message differs now a bit.
  • Upgrade JDK version in dev Dockerfile

@PDavid
Copy link
Copy Markdown
Contributor Author

PDavid commented Apr 23, 2026

OK, Mockito 5 requires Java 11 or higher. It will not work with Java 8.
Mockito 4 supported Java 8 but that does not support Java 25.

Do we have to support Java 8 on ZooKeeper master branch?

kgeisz
kgeisz approved these changes Apr 24, 2026
View reviewed changes
Copy link
Copy Markdown

@kgeisz kgeisz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@anmolnar
Copy link
Copy Markdown
Contributor

anmolnar commented Apr 29, 2026

I think we can drop Java 8 support on the master branch. Please follow the discussion on the dev@ list.

PDavid added 6 commits May 7, 2026 11:16
@PDavid
ZOOKEEPER-5039: Upgrade Mockito to 5.23.0 for JDK25
7d81b85 
As of Mockito 5.x, the mockito-inline mock-maker became the default, so mockito-inline as a separate artifact is no longer needed.
@PDavid
ZOOKEEPER-5039: Switch GH: Action workflows to JDK 17 and 25
608e958
@PDavid
ZOOKEEPER-5039: Switch Jenkins workflows to JDK 17 and 25
c2aad78
@PDavid
ZOOKEEPER-5039: Upgrade spotbugs to support JDK 17
682e3bf
@PDavid
ZOOKEEPER-5039: Upgrade spotbugs to support Java 25
92097c5 
- Upgraded spotbugs-maven-plugin to 4.9.3.0 and annotations to 4.9.3.
- Overrode ASM to 9.9.1 in the plugin dependencies to support JDK 25 (class file version 69).
- Added newly found bug patterns to excludeFindBugsFilter.xml - these are all pre-existing issues in the codebase that the newer SpotBugs detects but the old version couldn't.
@PDavid
ZOOKEEPER-5039: Upgrade burningwave mockdns to 0.27.2 for JDK25
e413971 
to fix test issue:

Caused by: io.github.toolfactory.jvm.util.ObjectProvider$BuildingException: Exception occurred while retrieving the implementation of class io.github.toolfactory.jvm.function.catalog.ConstructorInvokeFunction (jvm architecture: x64, jvm version: 25, jvm vendor: Eclipse Adoptium)
@PDavid PDavid force-pushed the ZOOKEEPER-5039-mockito-upgrade branch from a72fee0 to e413971 Compare May 7, 2026 09:17
@PDavid PDavid changed the title ZOOKEEPER-5039: Upgrade Mockito to 5.23.0 for JDK25 ZOOKEEPER-5039: Raise to min JDK 17, also build, test with JDK25 May 7, 2026
@PDavid
ZOOKEEPER-5039: Fix PrometheusMetricsProviderConfigTest
cdf29c9 
Exception message differs now a bit.
@PDavid
Copy link
Copy Markdown
Contributor Author

PDavid commented May 7, 2026

It seems only changing the Jenkins file did not worked out:

org.codehaus.groovy.control.MultipleCompilationErrorsException: startup failed:
WorkflowScript: 33: Tool type "jdk" does not have an install of "jdk_1.17_latest" configured - did you mean "jdk_1.8_latest"? @ line 33, column 13.
           jdk "jdk_1.17_latest"
               ^

https://ci-hadoop.apache.org/job/zookeeper-precommit-github-pr/job/PR-2376/5/console

Wrote to ASF Slack builds channel if thy can install / configure JDK 17 / JDK 25 for us.

@anmolnar
Copy link
Copy Markdown
Contributor

anmolnar commented May 7, 2026

It seems only changing the Jenkins file did not worked out:

org.codehaus.groovy.control.MultipleCompilationErrorsException: startup failed:
WorkflowScript: 33: Tool type "jdk" does not have an install of "jdk_1.17_latest" configured - did you mean "jdk_1.8_latest"? @ line 33, column 13.
           jdk "jdk_1.17_latest"
               ^

https://ci-hadoop.apache.org/job/zookeeper-precommit-github-pr/job/PR-2376/5/console

Wrote to ASF Slack builds channel if thy can install / configure JDK 17 / JDK 25 for us.

Might be (just guessing) jdk_17_latest and jdk_25_latest.

@PDavid
Copy link
Copy Markdown
Contributor Author

PDavid commented May 8, 2026

SnapshotAndRestoreCommandTest.testSnapshotAndRestoreCommand_streaming failed in the GH: Action build. It succeeds for me locally so I guess it is just a flake here.

anmolnar
anmolnar requested changes May 8, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@anmolnar anmolnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm. Please update and test Java version in dev/docker/Dockerfile as well.
Thanks!

@PDavid
ZOOKEEPER-5039: Upgrade zookeeper/dev Docker image to JDK 17
7671da3 
Also update Maven to 3.9.6 - it includes several improvements.

Since the old `jdk` and `openjdk` tags are deprecated, we should use the newer vendor-specific tags. Use Eclipse Temurin since we already use it in our GH: Actions workflows.
PDavid
PDavid commented May 8, 2026
View reviewed changes
Comment thread dev/docker/Dockerfile
#

FROM maven:3.8.4-jdk-11
FROM maven:3.9.6-eclipse-temurin-17
Copy link
Copy Markdown
Contributor Author

@PDavid PDavid May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the old jdk and openjdk tags are deprecated, we should use the newer vendor-specific tags. Use Eclipse Temurin since we already use it in our GH: Actions workflows.

Also update Maven to 3.9.6 - it includes several improvements.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@anmolnar anmolnar anmolnar requested changes

+1 more reviewer

@kgeisz kgeisz kgeisz approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@PDavid @anmolnar @kgeisz