Merge pull request #1330 from ConsenSys/javax_to_jakarta

Javax to jakarta
Consensys · Sep 14, 2021 · b10eca7 · b10eca7
2 parents 2f7f393 + 300e0dd
commit b10eca7
Show file tree

Hide file tree

Showing 426 changed files with 1,505 additions and 1,341 deletions.
diff --git a/argon2/src/main/java/module-info.java b/argon2/src/main/java/module-info.java
@@ -1,7 +1,7 @@
 module tessera.argontwo {
   requires de.mkammerer.argon2;
-  requires org.slf4j;
   requires tessera.shared;
+  requires org.slf4j;
 
   exports com.quorum.tessera.argon2;
 

diff --git a/build.gradle b/build.gradle
@@ -1,23 +1,25 @@
 import java.time.Duration
 
 plugins {
-  id "org.owasp.dependencycheck" version "6.2.2"
+  id "org.owasp.dependencycheck" version "6.3.1"
   id 'jacoco'
   id 'com.diffplug.gradle.spotless' version '3.25.0'
   id 'com.github.ben-manes.versions' version '0.8'
   id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
-  id "org.javamodularity.moduleplugin" version "1.8.3"
+  id "org.javamodularity.moduleplugin" version "1.8.8"
   id "org.kordamp.gradle.jdeps" version "0.14.0"
   id 'org.ec4j.editorconfig' version '0.0.3'
+  id "io.swagger.core.v3.swagger-gradle-plugin" version "2.1.9" apply false
 }
 
 ext {
-  jettyVersion = "9.4.43.v20210629"
-  eclipselinkVersion = "2.7.7"
+  jettyVersion = "11.0.6"
+  eclipselinkVersion = "3.0.2"
   swaggerVersion = "2.1.9"
-  jerseyVersion = "2.32"
+  jerseyVersion = "3.0.2"
   slf4jVersion = "1.7.30"
-  logbackVersion = "1.2.3"
+  logbackVersion = "1.2.6"
+  hk2Version = "3.0.2"
 }
 
 allprojects {
@@ -46,6 +48,11 @@ allprojects {
         implementation "org.eclipse.persistence:org.eclipse.persistence.moxy:$eclipselinkVersion"
         implementation "org.eclipse.persistence:org.eclipse.persistence.jpa:$eclipselinkVersion"
         implementation "org.eclipse.persistence:org.eclipse.persistence.extension:$eclipselinkVersion"
+        implementation "org.eclipse.persistence:org.eclipse.persistence.asm:9.1.0"
+
+        implementation "org.glassfish.hk2:hk2-api:$hk2Version"
+        implementation "org.glassfish.hk2:hk2-metadata-generator:$hk2Version"
+        testImplementation "org.glassfish.hk2:hk2-metadata-generator:$hk2Version"
 
         testImplementation "junit:junit:4.13"
 
@@ -60,12 +67,12 @@ allprojects {
 
         //  testImplementation "com.github.stefanbirkner:system-lambda:1.1.1"
 
-        testImplementation "nl.jqno.equalsverifier:equalsverifier:3.4.3"
+        testImplementation "nl.jqno.equalsverifier:equalsverifier:3.7.1"
         testImplementation "com.mockrunner:mockrunner-jdbc:2.0.4"
 
         implementation "commons-cli:commons-cli:1.4"
         implementation "commons-codec:commons-codec:1.14"
-        implementation "commons-io:commons-io:2.6"
+        implementation "commons-io:commons-io:2.7"
         implementation "org.apache.commons:commons-lang3:3.7"
 
         implementation "com.github.jnr:jnr-unixsocket:0.38.3"
@@ -82,17 +89,20 @@ allprojects {
         implementation("org.glassfish.jersey.media:jersey-media-moxy:$jerseyVersion")
         implementation "org.glassfish.jersey.test-framework:jersey-test-framework-core:$jerseyVersion"
         implementation "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:$jerseyVersion"
+        implementation "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:$jerseyVersion"
         implementation "org.glassfish.jersey.core:jersey-server:$jerseyVersion"
         implementation "org.glassfish.jersey.ext:jersey-bean-validation:$jerseyVersion"
         implementation "org.glassfish.jersey.containers:jersey-container-servlet-core:$jerseyVersion"
         implementation "org.glassfish.jersey.inject:jersey-hk2:$jerseyVersion"
         implementation "org.glassfish.jersey.core:jersey-common:$jerseyVersion"
         implementation "org.glassfish.jersey.core:jersey-client:$jerseyVersion"
 
-        implementation "org.eclipse.jetty:jetty-unixsocket:$jettyVersion"
+        implementation "org.eclipse.jetty:jetty-unixsocket-common:$jettyVersion"
+        implementation "org.eclipse.jetty:jetty-unixsocket-client:$jettyVersion"
+        implementation "org.eclipse.jetty:jetty-unixsocket-server:$jettyVersion"
+
         implementation "org.eclipse.jetty:jetty-client:$jettyVersion"
         implementation "org.eclipse.jetty:jetty-servlet:$jettyVersion"
-        implementation "org.eclipse.jetty:jetty-unixsocket:$jettyVersion"
 
         implementation "org.eclipse.jetty:jetty-server:$jettyVersion"
         implementation "org.eclipse.jetty:jetty-http:$jettyVersion"
@@ -101,7 +111,10 @@ allprojects {
         implementation "org.cryptacular:cryptacular:1.2.4"
         implementation "eu.neilalexander:jnacl:1.0.0"
 
-        implementation "io.swagger.core.v3:swagger-annotations:$swaggerVersion"
+        implementation("io.swagger.core.v3:swagger-annotations-jakarta:$swaggerVersion")
+        implementation("io.swagger.core.v3:swagger-core-jakarta:$swaggerVersion")       //implementation "io.swagger.parser.v3:swagger-parser-jakarta:$swaggerVersion"
+        implementation('io.swagger.parser.v3:swagger-parser-v3:2.0.27')
+        implementation "io.swagger.core.v3:swagger-jaxrs2-jakarta:$swaggerVersion"
 
         implementation "org.bouncycastle:bcpkix-jdk15on:1.68"
         implementation "org.bouncycastle:bcprov-jdk15on:1.68"
@@ -111,40 +124,44 @@ allprojects {
         implementation "org.hsqldb:hsqldb:2.5.1"
         implementation "org.xerial:sqlite-jdbc:3.23.1"
 
-        api "jakarta.ws.rs:jakarta.ws.rs-api:2.1.6"
-        api "jakarta.persistence:jakarta.persistence-api:2.2.3"
+        api 'org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2'
+        api "jakarta.ws.rs:jakarta.ws.rs-api:3.0.0"
+        api "jakarta.persistence:jakarta.persistence-api:3.0.0"
         api "jakarta.inject:jakarta.inject-api:1.0.1"
-        api "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3"
+        api "jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
 
-        api "jakarta.activation:jakarta.activation-api:1.2.2"
-        implementation "com.sun.activation:jakarta.activation:1.2.2"
+        api "jakarta.activation:jakarta.activation-api:2.0.1"
+        implementation "com.sun.activation:jakarta.activation:2.0.1"
 
-        implementation "jakarta.annotation:jakarta.annotation-api:1.3.5"
+        api "jakarta.annotation:jakarta.annotation-api:2.0.0"
 
         api "jakarta.transaction:jakarta.transaction-api:1.3.3"
-        api "jakarta.servlet:jakarta.servlet-api:4.0.4"
+        api "jakarta.servlet:jakarta.servlet-api:5.0.0"
+
+        api "jakarta.mail:jakarta.mail-api:2.0.1"
+        implementation 'com.sun.mail:jakarta.mail:2.0.1'
 
-        api "jakarta.mail:jakarta.mail-api:1.6.5"
-        implementation "com.sun.mail:jakarta.mail:1.6.5"
 
-        implementation "org.glassfish.jaxb:jaxb-runtime:2.3.3"
-        runtimeOnly "com.sun.istack:istack-commons-runtime:4.0.0-M3"
+        implementation "org.glassfish.jaxb:jaxb-runtime:3.0.2"
+        runtimeOnly "com.sun.istack:istack-commons-runtime:4.0.1"
 
-        implementation "org.glassfish:jsonp-jaxrs:1.1.6"
+        implementation "org.glassfish:jsonp-jaxrs:2.0.1"
 
-        //api "jakarta.json:jakarta.json-api:1.1.6"
-        implementation "org.glassfish:jakarta.json:1.1.6"
+        api "jakarta.json:jakarta.json-api:2.0.1"
+        implementation("org.glassfish:jakarta.json:2.0.1:module")
 
-        api "jakarta.el:jakarta.el-api:3.0.3"
-        implementation "org.glassfish:jakarta.el:3.0.3"
+        api "jakarta.el:jakarta.el-api:4.0.0"
+        implementation "org.glassfish:jakarta.el:4.0.1"
 
-        api "jakarta.validation:jakarta.validation-api:2.0.2"
-        implementation "org.hibernate.validator:hibernate-validator:6.1.6.Final"
+        api "jakarta.validation:jakarta.validation-api:3.0.0"
+        implementation "org.hibernate.validator:hibernate-validator:7.0.1.Final"
+        implementation "com.fasterxml:classmate:1.5.1"
 
         implementation "net.java.dev.jna:jna:5.6.0"
 
         testImplementation "org.apache.tuweni:tuweni-rlp:1.1.0"
         testImplementation "org.apache.tuweni:tuweni-bytes:1.1.0"
+
       }
     }
   }
@@ -178,44 +195,28 @@ subprojects {
   task allDeps(type: DependencyReportTask) {}
 
   configurations.all {
-
-    //        exclude group: 'javax.servlet'
-    //        exclude group: 'javax.ws.rs'
+    exclude group: "commons-logging"
     exclude group: "javax.activation"
+    exclude group: "jakarta.activation"
+    exclude group: "javax.mail"
     exclude module: "jakarta.persistence"
-    exclude module: "jakarta.activation"
+    exclude module: "jetty-servlet-api"
+    exclude group: "io.swagger.core.v3", module: "swagger-models"
+    exclude group: "io.swagger.core.v3", module: "swagger-annotations"
+    exclude group: "jakarta.servlet"// TODO: when jetty fix their servlet module name change jetty-jakarta-servlet-api to jakarta.servlet
+    exclude group: "javax.servlet"
+    exclude group: "javax.ws.rs"
 
     resolutionStrategy.capabilitiesResolution.all {
       selectHighestVersion()
     }
 
     resolutionStrategy.eachDependency { details ->
-
-      if (details.requested.name == "jsr305") {//annoying com.google.guava:guava dependency needed my checkstyle plugin
-        details.useTarget("jakarta.annotation:jakarta.annotation-api:1.3.5")
-      } else if (details.requested.group == "jakarta.json") {//TODO: Review api + impl modules
-        details.useTarget("org.glassfish:jakarta.json:1.1.6")
-      } else if (details.requested.group == "javax.activation") {//TODO: Review api + impl modules
-        details.useTarget("com.sun.activation:jakarta.activation:1.2.2");
-      } else if (details.requested.group == "javax.servlet") {//TODO: stuborn transitive dep in swagger plugin
-        details.useTarget("jakarta.servlet:jakarta.servlet-api:4.0.4");
-      } else if (details.requested.group == "javax.ws.rs") {//TODO: stuborn transitive dep in swagger plugin
-        details.useTarget("jakarta.ws.rs:jakarta.ws.rs-api:2.1.6")
-      } else if (details.requested.group.startsWith("javax.")) {
-        def n = details.requested.name.replaceFirst("javax", "jakarta")
-        def g = details.requested.group.replaceFirst("javax", "jakarta")
-        def v = details.requested.version
-        details.useTarget(g + ":" + n + ":" + v)
-      }
-
-      if (details.requested.group == "com.sun.mail" && details.requested.name == "javax.mail") {
-        details.useTarget("com.sun.mail:jakarta.mail:1.6.5")
-      }
-
-      if (details.requested.group == "commons-logging") {
-        details.useTarget("org.slf4j:jcl-over-slf4j:$slf4jVersion")
+      if (details.requested.name == "slf4j-api" && details.requested.group == "org.slf4j") {//Downgrade jetty slf4j version
+        details.useTarget("org.slf4j:slf4j-api:${slf4jVersion}")
       }
     }
+
   }
 
 
@@ -238,6 +239,8 @@ subprojects {
   test {
     systemProperty("javax.xml.bind.JAXBContextFactory", "org.eclipse.persistence.jaxb.JAXBContextFactory")
     systemProperty("javax.xml.bind.context.factory", "org.eclipse.persistence.jaxb.JAXBContextFactory")
+    systemProperty("jakarta.xml.bind.JAXBContextFactory", "org.eclipse.persistence.jaxb.JAXBContextFactory")
+    systemProperty("jakarta.xml.bind.context.factory", "org.eclipse.persistence.jaxb.JAXBContextFactory")
   }
 
   dependencyCheck {

diff --git a/cli/cli-api/src/test/java/module-info.test b/cli/cli-api/src/test/java/module-info.test
@@ -1,3 +1,6 @@
 --add-opens
     tessera.cli.api/com.quorum.tessera.cli.parsers=openpojo
 
+--add-reads
+    tessera.cli.api=system.rules
+
diff --git a/cli/config-cli/src/main/java/com/quorum/tessera/config/cli/KeyGenCommand.java b/cli/config-cli/src/main/java/com/quorum/tessera/config/cli/KeyGenCommand.java
@@ -9,15 +9,15 @@
 import com.quorum.tessera.key.generation.KeyGenerator;
 import com.quorum.tessera.key.generation.KeyGeneratorFactory;
 import com.quorum.tessera.key.generation.KeyVaultOptions;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
-import javax.validation.Validator;
 import picocli.CommandLine;
 
 @CommandLine.Command(

diff --git a/cli/config-cli/src/main/java/com/quorum/tessera/config/cli/OverrideUtil.java b/cli/config-cli/src/main/java/com/quorum/tessera/config/cli/OverrideUtil.java
@@ -3,6 +3,8 @@
 import com.quorum.tessera.cli.CliException;
 import com.quorum.tessera.config.Config;
 import com.quorum.tessera.reflect.ReflectCallback;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
@@ -16,8 +18,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/cli/config-cli/src/main/java/com/quorum/tessera/config/cli/TesseraCommand.java b/cli/config-cli/src/main/java/com/quorum/tessera/config/cli/TesseraCommand.java
@@ -7,12 +7,12 @@
 import com.quorum.tessera.cli.parsers.PidFileMixin;
 import com.quorum.tessera.config.Config;
 import com.quorum.tessera.reflect.ReflectException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 import java.util.*;
 import java.util.concurrent.Callable;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
-import javax.validation.Validator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
@@ -41,17 +41,17 @@ public TesseraCommand() {
     this(
         ServiceLoader.load(KeyPasswordResolver.class)
             .findFirst()
-            .orElse(new CliKeyPasswordResolver()));
-  }
-
-  private TesseraCommand(final KeyPasswordResolver keyPasswordResolver) {
-    this.keyPasswordResolver = Objects.requireNonNull(keyPasswordResolver);
-    this.validator =
+            .orElse(new CliKeyPasswordResolver()),
         Validation.byDefaultProvider()
             .configure()
             .ignoreXmlConfiguration()
             .buildValidatorFactory()
-            .getValidator();
+            .getValidator());
+  }
+
+  private TesseraCommand(final KeyPasswordResolver keyPasswordResolver, Validator validator) {
+    this.keyPasswordResolver = Objects.requireNonNull(keyPasswordResolver);
+    this.validator = Objects.requireNonNull(validator);
   }
 
   @CommandLine.Option(

diff --git a/cli/config-cli/src/main/java/module-info.java b/cli/config-cli/src/main/java/module-info.java
@@ -1,7 +1,7 @@
 module tessera.cli.config {
   requires java.management;
-  requires java.validation;
-  requires java.xml.bind;
+  requires jakarta.validation;
+  requires jakarta.xml.bind;
   requires info.picocli;
   requires org.slf4j;
   requires tessera.cli.api;

diff --git a/cli/config-cli/src/test/java/com/quorum/tessera/config/cli/KeyGenCommandTest.java b/cli/config-cli/src/test/java/com/quorum/tessera/config/cli/KeyGenCommandTest.java
@@ -11,10 +11,10 @@
 import com.quorum.tessera.config.util.PasswordFileUpdaterWriter;
 import com.quorum.tessera.key.generation.KeyGenerator;
 import com.quorum.tessera.key.generation.KeyGeneratorFactory;
+import jakarta.validation.ConstraintViolationException;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import javax.validation.ConstraintViolationException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/cli/config-cli/src/test/java/com/quorum/tessera/config/cli/KeyUpdateCommandTest.java b/cli/config-cli/src/test/java/com/quorum/tessera/config/cli/KeyUpdateCommandTest.java
@@ -14,13 +14,13 @@
 import com.quorum.tessera.config.util.JaxbUtil;
 import com.quorum.tessera.encryption.PrivateKey;
 import com.quorum.tessera.passwords.PasswordReader;
+import jakarta.xml.bind.UnmarshalException;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Base64;
 import java.util.List;
-import javax.xml.bind.UnmarshalException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;

diff --git a/cli/config-cli/src/test/java/com/quorum/tessera/config/cli/OverrideUtilTest.java b/cli/config-cli/src/test/java/com/quorum/tessera/config/cli/OverrideUtilTest.java
@@ -5,14 +5,14 @@
 import com.quorum.tessera.cli.CliException;
 import com.quorum.tessera.config.*;
 import com.quorum.tessera.config.util.JaxbUtil;
+import jakarta.xml.bind.annotation.XmlElement;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
-import javax.xml.bind.annotation.XmlElement;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;

diff --git a/cli/config-cli/src/test/java/com/quorum/tessera/config/cli/PicoCliDelegateTest.java b/cli/config-cli/src/test/java/com/quorum/tessera/config/cli/PicoCliDelegateTest.java
@@ -16,6 +16,7 @@
 import com.quorum.tessera.config.util.JaxbUtil;
 import com.quorum.tessera.key.generation.KeyGenerator;
 import com.quorum.tessera.key.generation.KeyGeneratorFactory;
+import jakarta.validation.ConstraintViolationException;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
@@ -27,7 +28,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-import javax.validation.ConstraintViolationException;
 import org.assertj.core.util.Strings;
 import org.junit.After;
 import org.junit.Before;

diff --git a/cli/config-cli/src/test/java/com/quorum/tessera/config/cli/ToOverride.java b/cli/config-cli/src/test/java/com/quorum/tessera/config/cli/ToOverride.java
@@ -1,7 +1,7 @@
 package com.quorum.tessera.config.cli;
 
+import jakarta.xml.bind.annotation.XmlElement;
 import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
 
 class ToOverride {
   @XmlElement(name = "some_value")