Update dependencies. (#129)

build.gradle

@@ -2,12 +2,12 @@
 
 plugins {
   id 'java-library'
-  id 'com.diffplug.gradle.spotless' version '3.26.0'
-  id 'com.github.ben-manes.versions' version '0.27.0'
-  id 'com.github.hierynomus.license' version '0.15.0'
-  id 'io.spring.dependency-management' version '1.0.8.RELEASE'
-  id 'net.ltgt.errorprone' version '1.1.1'
-  id 'org.ajoberstar.grgit' version '4.0.2'
+  id 'com.diffplug.spotless' version '6.0.4'
+  id 'com.github.ben-manes.versions' version '0.39.0'
+  id 'com.github.hierynomus.license' version '0.16.1'
+  id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+  id 'net.ltgt.errorprone' version '2.0.2'
+  id 'org.ajoberstar.grgit' version '4.1.1'
 }
 
 rootProject.version = calculatePublishVersion()
@@ -56,12 +56,15 @@ spotless {
     target fileTree('.') {
       include '**/*.java'
       exclude '**.gradle/**'
+      exclude '**/src/*/generated'
+      exclude '**/src/*/generated_tests'
+      exclude '**/build/**'
     }
 
     importOrder 'tech.pegasys', 'net.consensys', 'java', ''
     trimTrailingWhitespace()
     endWithNewline()
-    googleJavaFormat('1.7')
+    googleJavaFormat('1.13.0')
   }
 }
 

gradle.properties

@@ -0,0 +1,12 @@
+# Set exports/opens flags required by Google Java Format and ErrorProne plugins. (JEP-396)
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 \
+  --add-exports jdk.compiler/com.sun.tools.javac.api=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.model=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+  --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+  --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

gradle/versions.gradle

@@ -1,39 +1,38 @@
 dependencyManagement {
   dependencies {
-    dependency 'com.google.errorprone:javac:9+181-r4173-1'
-    dependency 'com.google.errorprone:error_prone_check_api:2.4.0'
-    dependency 'com.google.errorprone:error_prone_core:2.4.0'
-    dependency 'com.google.errorprone:error_prone_annotation:2.4.0'
-    dependency 'com.google.errorprone:error_prone_test_helpers:2.4.0'
+    dependencySet(group: 'com.google.errorprone', version: '2.10.0') {
+      entry 'error_prone_annotation'
+      entry 'error_prone_check_api'
+      entry 'error_prone_core'
+      entry 'error_prone_test_helpers'
+    }
 
-    dependency 'com.google.guava:guava:27.0.1-jre'
+    dependency 'com.google.guava:guava:31.0.1-jre'
 
     dependency "io.netty:netty-all:4.1.36.Final"
-    dependency 'io.projectreactor:reactor-core:3.2.5.RELEASE'
-    dependency 'io.vertx:vertx-core:3.8.0'
+    dependency 'io.projectreactor:reactor-core:3.4.12'
+    dependency 'io.vertx:vertx-core:3.9.9'
 
     dependency 'org.apache.logging.log4j:log4j-api:2.15.0'
     dependency 'org.apache.logging.log4j:log4j-core:2.15.0'
-    dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1'
+    dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.15.0'
 
-    dependency 'org.bouncycastle:bcprov-jdk15on:1.60'
+    dependency 'org.bouncycastle:bcprov-jdk15on:1.70'
 
-    dependency 'org.assertj:assertj-core:3.14.0'
-    dependency 'org.web3j:core:4.2.0'
-    dependency 'org.mockito:mockito-core:3.1.0'
+    dependency 'org.assertj:assertj-core:3.21.0'
+    dependency 'org.web3j:core:5.0.0'
+    dependency 'org.mockito:mockito-core:4.1.0'
 
     dependencySet(group: 'org.apache.tuweni', version: '1.3.0') {
       entry 'bytes'
       entry 'crypto'
       entry 'units'
     }
 
-    dependencySet(group: 'org.junit.jupiter', version: '5.5.2') {
+    dependencySet(group: 'org.junit.jupiter', version: '5.8.2') {
       entry 'junit-jupiter-api'
       entry 'junit-jupiter-engine'
       entry 'junit-jupiter-params'
     }
-
-    dependency 'org.mockito:mockito-core:3.1.0'
   }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/java/org/ethereum/beacon/discovery/message/PongMessage.java

@@ -87,7 +87,7 @@ public boolean equals(Object o) {
     return Objects.equal(requestId, that.requestId)
         && Objects.equal(enrSeq, that.enrSeq)
         && Objects.equal(recipientIp, that.recipientIp)
-        && Objects.equal(recipientPort, that.recipientPort);
+        && recipientPort == that.recipientPort;
   }
 
   @Override

src/test/java/org/ethereum/beacon/discovery/message/handler/EnrUpdateTrackerTest.java

@@ -63,7 +63,7 @@ void shouldNotRequestPeersEnrWhenPongSequenceNumberIsLower() {
     final NodeRecord currentNodeRecord =
         TestUtil.generateNode(8000)
             .getNodeRecord()
-            .withUpdatedCustomField("test", Bytes.EMPTY, Bytes.EMPTY);
+            .withUpdatedCustomField("test", Bytes.EMPTY, Bytes.of(1));
     when(session.getNodeRecord()).thenReturn(Optional.of(currentNodeRecord));
     tracker.updateIfRequired(session, currentNodeRecord.getSeq().subtract(1));