feat!: Java 21 for build and runtime #7177

usmansaleem · 2024-06-05T00:15:37Z

PR description

Enforce Java 21 for Besu build and CI. The docker image was already on Java 21. Also fixed javadoc lint related warnings.

Fixed Issue(s)

See #6722

Thanks for sending a pull request! Have you done the following?

Checked out our contribution guidelines?
Considered documentation and added the doc-change-required label to this PR if updates are required.
Considered the changelog and included an update if required.
For database changes (e.g. KeyValueSegmentIdentifier) considered compatibility and performed forwards and backwards compatibility tests

Locally, you can run these tests to catch failures early:

unit tests: ./gradlew build
acceptance tests: ./gradlew acceptanceTest
integration tests: ./gradlew integrationTest
reference tests: ./gradlew ethereum:referenceTests:referenceTests

Signed-off-by: Usman Saleem <usman@usmans.info>

macfarla

needs a changelog entry

macfarla · 2024-06-05T03:41:51Z

needs a changelog entry

nvm it's already there!

ahamlat · 2024-06-05T06:57:08Z

services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueue.java

@@ -32,6 +32,9 @@ public class InMemoryTaskQueue<T> implements TaskCollection<T> {
  private final Set<InMemoryTask<T>> unfinishedOutstandingTasks = new HashSet<>();
  private final AtomicBoolean closed = new AtomicBoolean(false);

+  /** Default constructor. */
+  public InMemoryTaskQueue() {}


Why is there a need for a default constructor here ? it should be implicit or there're changes related to generics in Java 21 that makes them mandatory ?

@ahamlat Hi Ameziane, We have javadoc lint enabled in our gradle build and fail our build on lint warnings. One of the "lint" warning that has been enabled since Java 19 is to provide javadoc on default constructors.

https://bugs.openjdk.org/browse/JDK-8249634

To avoid adding such empty constructors, we have to disable gradle build failure on javadoc lint warnings.

My opinion would to disable gradle build failure on javadoc lint warnings, and not add "dead code", but this is not blocking.

I had a look, looks like we have -Werror in java compile task, this seems to apply to javadoc task as well.

ahamlat

few comments but nothing really important

ahamlat · 2024-06-05T15:55:51Z

services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueue.java

@@ -32,6 +32,9 @@ public class InMemoryTaskQueue<T> implements TaskCollection<T> {
  private final Set<InMemoryTask<T>> unfinishedOutstandingTasks = new HashSet<>();
  private final AtomicBoolean closed = new AtomicBoolean(false);

+  /** Default constructor. */
+  public InMemoryTaskQueue() {}


My opinion would to disable gradle build failure on javadoc lint warnings, and not add "dead code", but this is not blocking.

ahamlat · 2024-06-05T15:58:22Z

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Next Release

 ### Breaking Changes
+- Java 21 is required to build and run Besu.


I would say : Java 21 is required to build Besu, and at least Java 21 to run it.

Signed-off-by: Usman Saleem <usman@usmans.info>

jframe · 2024-06-06T00:36:08Z

gradle/verification-metadata.xml

+         <artifact name="org.jacoco.agent-0.8.11.pom">
+            <sha256 value="16e05e9f49621b87c53e69350140f3c46d42d966c67a933bdf4b063a2b1c8fc5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
      <component group="org.jacoco" name="org.jacoco.agent" version="0.8.8">


Can the old jacoco entry be removed?

jframe · 2024-06-06T00:36:43Z

gradle/verification-metadata.xml

+         <artifact name="asm-commons-9.6.pom">
+            <sha256 value="a98ae4895334baf8ff86bd66516210dbd9a03f1a6e15e47dda82afcf6b53d77c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
      <component group="org.ow2.asm" name="asm-tree" version="9.2">
         <artifact name="asm-tree-9.2.jar">


Can the old asm-tree entry be removed?

apparently they are still referenced ....

so both versions are being used?

looks like it, I removed it and gradle started complaining about missing metadata.

Remove 0.8.8 entries Signed-off-by: Usman Saleem <usman@usmans.info>

Signed-off-by: Usman Saleem <usman@usmans.info>

…asm entries" This reverts commit 1505585. Signed-off-by: Usman Saleem <usman@usmans.info>

…n CI Signed-off-by: Usman Saleem <usman@usmans.info>

* build: Update jacoco version to 0.8.11 * build: Enforce Java 21 and above check for build * CI: Use Java 21 in Github CI workflows * CI: Use Java 21 in circleci workflows * build: Update gradle verification metadata for jacoco 0.8.11 * refactor: Fix javadoc related warnings which are applicable to Java 21 * fix(test): BackwardSyncAlgSpec slightly increase timeout to pass it in CI --------- Signed-off-by: Usman Saleem <usman@usmans.info> Signed-off-by: George Tebrean <george@web3labs.com>

* build: Update jacoco version to 0.8.11 * build: Enforce Java 21 and above check for build * CI: Use Java 21 in Github CI workflows * CI: Use Java 21 in circleci workflows * build: Update gradle verification metadata for jacoco 0.8.11 * refactor: Fix javadoc related warnings which are applicable to Java 21 * fix(test): BackwardSyncAlgSpec slightly increase timeout to pass it in CI --------- Signed-off-by: Usman Saleem <usman@usmans.info>

usmansaleem added 4 commits June 5, 2024 09:36

build: Update jacoco version to 0.8.11

7dc3695

Signed-off-by: Usman Saleem <usman@usmans.info>

build: Enforce Java 21 and above check for build

baec0a8

Signed-off-by: Usman Saleem <usman@usmans.info>

CI: Use Java 21 in Github CI workflows

263f8b3

Signed-off-by: Usman Saleem <usman@usmans.info>

CI: Use Java 21 in circleci workflows

82829b3

Signed-off-by: Usman Saleem <usman@usmans.info>

usmansaleem added the doc-change-required Indicates an issue or PR that requires doc to be updated label Jun 5, 2024

usmansaleem added 5 commits June 5, 2024 10:26

Merge remote-tracking branch 'upstream/main' into java_21_upgrade

44f9b9a

Signed-off-by: Usman Saleem <usman@usmans.info>

build: Update gradle verification metadata for jacoco 0.8.11

f35eb45

Signed-off-by: Usman Saleem <usman@usmans.info>

refactor: Fix javadoc related warnings which are applicable to Java 21

5eef735

Signed-off-by: Usman Saleem <usman@usmans.info>

chore: minor comment typo

a2f2cb2

Signed-off-by: Usman Saleem <usman@usmans.info>

changelog: Update changelog

9279067

Signed-off-by: Usman Saleem <usman@usmans.info>

usmansaleem changed the title ~~Java 21 upgrade~~ feat!: Java 21 for build and runtime Jun 5, 2024

macfarla reviewed Jun 5, 2024

View reviewed changes

macfarla mentioned this pull request Jun 5, 2024

java 21 hyperledger/homebrew-besu#123

Merged

ahamlat reviewed Jun 5, 2024

View reviewed changes

ahamlat approved these changes Jun 5, 2024

View reviewed changes

usmansaleem added 2 commits June 6, 2024 09:09

changelog: Update changelog

194f161

Signed-off-by: Usman Saleem <usman@usmans.info>

Merge remote-tracking branch 'upstream/main' into java_21_upgrade

bc3d551

Signed-off-by: Usman Saleem <usman@usmans.info>

jframe approved these changes Jun 6, 2024

View reviewed changes

usmansaleem added 4 commits June 6, 2024 12:54

build: Update gradle verification metadata for jacoco 0.8.11

22c62bc

Remove 0.8.8 entries Signed-off-by: Usman Saleem <usman@usmans.info>

build: Update gradle verification metadata - remove obselete asm entries

1505585

Signed-off-by: Usman Saleem <usman@usmans.info>

Revert "build: Update gradle verification metadata - remove obselete …

c355ba4

…asm entries" This reverts commit 1505585. Signed-off-by: Usman Saleem <usman@usmans.info>

fix(test): BackwardSyncAlgSpec slightly increase timeout to pass it i…

0a949ac

…n CI Signed-off-by: Usman Saleem <usman@usmans.info>

usmansaleem merged commit 2d59f4d into hyperledger:main Jun 6, 2024
40 checks passed

ahamlat mentioned this pull request Jun 7, 2024

Enable JFR continuous profiling with default setting #7006

Merged

8 tasks

joaniefromtheblock mentioned this pull request Jun 19, 2024

Update for Java 21 for build and runtime hyperledger/besu-docs#1622

Closed

joaniefromtheblock removed the doc-change-required Indicates an issue or PR that requires doc to be updated label Jun 19, 2024

usmansaleem deleted the java_21_upgrade branch June 28, 2024 00:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat!: Java 21 for build and runtime #7177

feat!: Java 21 for build and runtime #7177

usmansaleem commented Jun 5, 2024 •

edited

Loading

macfarla left a comment

macfarla commented Jun 5, 2024

ahamlat Jun 5, 2024

usmansaleem Jun 5, 2024

ahamlat Jun 5, 2024

usmansaleem Jun 5, 2024

ahamlat left a comment

ahamlat Jun 5, 2024

ahamlat Jun 5, 2024

usmansaleem Jun 5, 2024

jframe Jun 6, 2024

usmansaleem Jun 6, 2024

jframe Jun 6, 2024

usmansaleem Jun 6, 2024

jframe Jun 6, 2024

usmansaleem Jun 6, 2024

feat!: Java 21 for build and runtime #7177

feat!: Java 21 for build and runtime #7177

Conversation

usmansaleem commented Jun 5, 2024 • edited Loading

PR description

Fixed Issue(s)

Thanks for sending a pull request! Have you done the following?

Locally, you can run these tests to catch failures early:

macfarla left a comment

Choose a reason for hiding this comment

macfarla commented Jun 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ahamlat left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

usmansaleem commented Jun 5, 2024 •

edited

Loading