Java17

.circleci/config.yml

@@ -1,20 +1,20 @@
 ---
 version: 2.1
 orbs:
-  win: circleci/windows@2.2.0
+  win: circleci/windows@5.0.0
 
 executors:
   besu_executor_small:
     docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:17.0
     resource_class: small
     working_directory: ~/project
     environment:
       GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2
 
   besu_executor_med: # 2cpu, 4G ram
     docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:17.0
     resource_class: medium
     working_directory: ~/project
     environment:
@@ -32,7 +32,7 @@ executors:
 
   besu_executor_xl: # 8cpu, 16G ram
     docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:17.0
     resource_class: xlarge
     working_directory: ~/project
     environment:
@@ -193,6 +193,11 @@ jobs:
       - prepare
       - attach_workspace:
           at: ~/project
+      - run:
+          name: Java_17
+          command: |
+            sudo apt install openjdk-17-jre-headless openjdk-17-jdk-headless
+            sudo update-java-alternatives -a
       - run:
           name: IntegrationTests
           command: |
@@ -228,6 +233,11 @@ jobs:
       - prepare
       - attach_workspace:
           at: ~/project
+      - run:
+          name: Java_17
+          command: |
+            sudo apt install openjdk-17-jre-headless openjdk-17-jdk-headless
+            sudo update-java-alternatives -a
       - run:
           name: AcceptanceTests
           no_output_timeout: 30m
@@ -251,17 +261,13 @@ jobs:
           at: ~/project
       - setup_remote_docker
       - run:
-          name: hadoLint_openjdk_11
-          command: |
-            docker run --rm -i hadolint/hadolint < docker/openjdk-11/Dockerfile
-      - run:
-          name: hadoLint_openjdk_11_debug
+          name: hadoLint_openjdk_17
           command: |
-            docker run --rm -i hadolint/hadolint < docker/openjdk-11-debug/Dockerfile
+            docker run --rm -i hadolint/hadolint < docker/openjdk-17/Dockerfile
       - run:
-          name: hadoLint_openjdk_latest
+          name: hadoLint_openjdk_17_debug
           command: |
-            docker run --rm -i hadolint/hadolint < docker/openjdk-latest/Dockerfile
+            docker run --rm -i hadolint/hadolint < docker/openjdk-17-debug/Dockerfile
       - run:
           name: hadoLint_graalvm
           command: |
@@ -284,17 +290,18 @@ jobs:
       - attach_workspace:
           at: ~/project
       - run:
-          name: hadoLint_openjdk_11
-          command: |
-            docker run --rm -i hadolint/hadolint < docker/openjdk-11/Dockerfile
-      - run:
-          name: hadoLint_openjdk_latest
+          name: hadoLint_openjdk_17
           command: |
-            docker run --rm -i hadolint/hadolint < docker/openjdk-latest/Dockerfile
+            docker run --rm -i hadolint/hadolint < docker/openjdk-17/Dockerfile
       - run:
           name: hadoLint_graalvm
           command: |
             docker run --rm -i hadolint/hadolint < docker/graalvm/Dockerfile
+      - run:
+          name: Java_17
+          command: |
+            sudo apt install openjdk-17-jre-headless openjdk-17-jdk-headless
+            sudo update-java-alternatives -a
       - run:
           name: build image
           command: |

.github/workflows/checks.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: adopt
-          java-version: 11
+          java-version: 17
           cache: gradle
       - name: spotless
         run: ./gradlew --no-daemon --parallel clean spotlessCheck

.github/workflows/codeql.yml

@@ -41,6 +41,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Use Java 17
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
@@ -54,7 +60,7 @@ jobs:
     # Autobuild failed (OOM)
     # Hence, supply memory args for gradle build
     - run: |
-        JAVA_OPTS="-Xmx1000M" ./gradlew --no-scan compileJava
+        JAVA_OPTS="-Xmx1000M --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" ./gradlew --no-scan compileJava
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.lgtm.yml

@@ -2,4 +2,4 @@ extraction:
   java:
     index:
       java_version: "17"
-      build_command: JAVA_OPTS="-Xmx1000M" ./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64 --no-scan compileJava
+      build_command: JAVA_OPTS="-Xmx1000M" ./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-18-openjdk-amd64 --no-scan compileJava

acceptance-tests/tests/build.gradle

@@ -82,6 +82,9 @@ dependencies {
   testImplementation 'org.web3j:abi'
   testImplementation 'org.web3j:besu'
   testImplementation 'org.web3j:core'
+  constraints {
+    implementation('jnr-posix:3.1.15') { because '3.0.47 from web3j has issues' }
+  }
 
   testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }

besu/build.gradle

@@ -100,6 +100,12 @@ dependencies {
   testImplementation 'org.mockito:mockito-core'
   testImplementation 'org.testcontainers:testcontainers'
   testImplementation 'tech.pegasys.discovery:discovery'
+  constraints {
+    implementation('com.github.jnr:jnr-posix') {
+      version { require '3.1.15' }
+      because '3.0.47 from web3j has issues'
+    }
+  }
 
   testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }

build.gradle

@@ -30,8 +30,8 @@ plugins {
   id 'maven-publish'
 }
 
-if (!JavaVersion.current().java11Compatible) {
-  throw new GradleException("Java 11 or later is required to build Besu.\n" +
+if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+  throw new GradleException("Java 17 or later is required to build Besu.\n" +
   "  Detected version ${JavaVersion.current()}")
 }
 
@@ -99,8 +99,8 @@ allprojects {
     from javadoc.outputDirectory
   }
 
-  sourceCompatibility = 11
-  targetCompatibility = 11
+  sourceCompatibility = 17
+  targetCompatibility = 17
 
   repositories {
     maven {
@@ -261,8 +261,10 @@ allprojects {
   }
 
   javadoc {
-    options.addStringOption('Xdoclint:all', '-quiet')
-    options.addStringOption('Xwerror', '-html5')
+    options.addStringOption('Xdoclint:all,-missing')
+    options.addStringOption('quiet')
+    options.addStringOption('Xwerror')
+    options.addStringOption('html5')
     options.encoding = 'UTF-8'
   }
 
@@ -610,10 +612,9 @@ def dockerOrgName = project.hasProperty('dockerOrgName') ? project.getProperty("
 def dockerArtifactName = project.hasProperty("dockerArtifactName") ? project.getProperty("dockerArtifactName") : "besu"
 def dockerImageName = "${dockerOrgName}/${dockerArtifactName}"
 def dockerVariants = project.hasProperty("dockerVariants") ? project.getProperty("dockerVariants").split(",") : [
-  "openjdk-11",
-  "openjdk-11-debug",
+  "openjdk-17",
+  "openjdk-17-debug",
   "graalvm",
-  "openjdk-latest"
 ]
 
 // rename the top level dir from besu-<version> to besu and this makes it really

docker/openjdk-11-debug/Dockerfile → docker/openjdk-17-debug/Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:20.04
 
 ARG VERSION="dev"
 RUN apt-get update  && \
- apt-get install --no-install-recommends -q --assume-yes curl=7* wget=1.20* jq=1.6* net-tools=1.60* openjdk-11-jdk-headless=11* libjemalloc-dev=5.* && \
+ apt-get install --no-install-recommends -q --assume-yes curl=7* wget=1.20* jq=1.6* net-tools=1.60* openjdk-17-jdk-headless=17* libjemalloc-dev=5.* && \
  apt-get clean  && \
  rm -rf /var/lib/apt/lists/*  && \
  adduser --disabled-password --gecos "" --home /opt/besu besu && \

docker/openjdk-11/Dockerfile → docker/openjdk-17/Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:20.04
 ARG VERSION="dev"
 
 RUN apt-get update && \
- apt-get install --no-install-recommends -q --assume-yes openjdk-11-jre-headless=11* libjemalloc-dev=5.* && \
+ apt-get install --no-install-recommends -q --assume-yes openjdk-17-jre-headless=17* libjemalloc-dev=5.* && \
  apt-get clean  && \
  rm -rf /var/lib/apt/lists/*  && \
  adduser --disabled-password --gecos "" --home /opt/besu besu && \

docker/openjdk-latest/Dockerfile

@@ -1,9 +1,9 @@
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 ARG VERSION="dev"
 
 RUN apt-get update && \
- apt-get install --no-install-recommends -q --assume-yes openjdk-17-jre-headless=17* libjemalloc-dev=5.* && \
+ apt-get install --no-install-recommends -q --assume-yes openjdk-18-jre-headless=18* libjemalloc-dev=5.* && \
  apt-get clean  && \
  rm -rf /var/lib/apt/lists/*  && \
  adduser --disabled-password --gecos "" --home /opt/besu besu && \

errorprone-checks/build.gradle

@@ -21,8 +21,8 @@ configurations.maybeCreate("epJavac")
 apply plugin: 'java'
 apply plugin: 'net.ltgt.errorprone'
 
-sourceCompatibility = 11
-targetCompatibility = 11
+sourceCompatibility = 17
+targetCompatibility = 17
 
 dependencies {
   api 'org.slf4j:slf4j-api'

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java

@@ -193,7 +193,7 @@ void exceptionRaisedWhenInvalidKeystoreFileIsSpecified() throws IOException {
               Assertions.fail("service.start should have failed");
             })
         .withCauseInstanceOf(JsonRpcServiceException.class)
-        .withMessageContaining("Short read of DER length");
+        .withMessageContaining("Tag number over 30 is not supported");
   }
 
   @Test

ethereum/p2p/build.gradle

@@ -62,6 +62,12 @@ dependencies {
   annotationProcessor "org.immutables:value"
   implementation "org.immutables:value-annotations"
   implementation 'tech.pegasys.discovery:discovery'
+  constraints {
+    implementation('com.github.jnr:jnr-posix') {
+      version { require '3.1.15' }
+      because '3.0.47 from web3j has issues'
+    }
+  }
 
   // test dependencies.
   testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')

ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryController.java

@@ -70,7 +70,7 @@
  * <p>When necessary, it updates the underlying {@link PeerTable}, particularly with additions which
  * may succeed or not depending on the contents of the target bucket for the peer.
  *
- * <h3>Peer state machine</h3>
+ * <h2>Peer state machine</h2>
  *
  * <pre>{@code
  *                                                                +--------------------+

ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTable.java

@@ -94,7 +94,7 @@ public Optional<DiscoveryPeer> get(final PeerId peer) {
    * Attempts to add the provided peer to the peer table, and returns an {@link AddResult}
    * signalling one of three outcomes.
    *
-   * <h3>Possible outcomes:</h3>
+   * <h4>Possible outcomes:</h4>
    *
    * <ul>
    *   <li>the operation succeeded and the peer was added to the corresponding k-bucket.

ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java

@@ -36,7 +36,7 @@
  * <p>This message must be sent by the party that initiates the RLPX connection, as the first
  * message in the handshake protocol.
  *
- * <h3>Message structure</h3>
+ * <h2>Message structure</h2>
  *
  * The following describes the message structure:
  *

ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java

@@ -29,7 +29,7 @@
  * <p>This message must be sent by the party who responded to the RLPX connection, in response to
  * the initiator message.
  *
- * <h3>Message structure</h3>
+ * <h2>Message structure</h2>
  *
  * The following describes the message structure:
  *

ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSContextFactoryTest.java

@@ -273,14 +273,17 @@ private void testConnection(
       client.getChannelFuture().channel().writeAndFlush(Unpooled.copyInt(0));
       final boolean allMessagesServerExchanged = serverLatch.await(10, TimeUnit.SECONDS);
       final boolean allMessagesClientExchanged = clientLatch.await(10, TimeUnit.SECONDS);
-      assertThat(allMessagesClientExchanged && allMessagesServerExchanged).isTrue();
+      LOG.info(serverLatch.toString());
+      LOG.info(client.toString());
+      assertThat(allMessagesClientExchanged).isTrue();
+      assertThat(allMessagesServerExchanged).isTrue();
     } else {
       try {
         client.getChannelFuture().channel().writeAndFlush(Unpooled.copyInt(0)).sync();
         serverLatch.await(2, TimeUnit.SECONDS);
         assertThat(client.getChannelFuture().channel().isActive()).isFalse();
       } catch (final Exception e) {
-        // NOOP
+        LOG.error("unexpected exception", e);
       }
     }
   }

gradle.properties

@@ -1,4 +1,13 @@
 version=23.1.0-RC1-SNAPSHOT
 
+# Workaround for Java 16 and spotless bug 834 https://github.com/diffplug/spotless/issues/834
+org.gradle.jvmargs=--add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+-Xmx1g
 org.gradle.welcome=never
-org.gradle.jvmargs=-Xmx1g