Ref #34717: replace javax.json by jakarta

Author: LEDfan

pom.xml

@@ -38,7 +38,8 @@
         <bootstrap.version>3.4.1</bootstrap.version>
         <jquery.version>3.7.1</jquery.version>
         <fontawesome.version>4.7.0</fontawesome.version>
-        <javax-json.version>1.1.4</javax-json.version>
+        <jakarta-json-api.version>2.1.3</jakarta-json-api.version>
+        <glassfish-jakarta-json.version>2.0.1</glassfish-jakarta-json.version>
         <!-- Plugin versions -->
         <maven.license-plugin.version>4.6</maven.license-plugin.version>
         <maven.build-helper-maven.plugin.version>3.6.0</maven.build-helper-maven.plugin.version>
@@ -381,20 +382,19 @@
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>ecs</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
-            <version>${javax-json.version}</version>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
+            <version>${glassfish-jakarta-json.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-            <version>${javax-json.version}</version>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <version>${jakarta-json-api.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr353</artifactId>
+            <artifactId>jackson-datatype-jakarta-jsonp</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>

src/main/java/eu/openanalytics/containerproxy/ContainerProxyApplication.java

@@ -20,7 +20,7 @@
  */
 package eu.openanalytics.containerproxy;
 
-import com.fasterxml.jackson.datatype.jsr353.JSR353Module;
+import com.fasterxml.jackson.datatype.jsonp.JSONPModule;
 import eu.openanalytics.containerproxy.backend.dispatcher.proxysharing.ProxySharingDispatcher;
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
 import eu.openanalytics.containerproxy.service.hearbeat.ActiveProxiesService;
@@ -349,8 +349,8 @@ public FilterRegistrationBean<FormContentFilter> registration2(FormContentFilter
      * @return
      */
     @Bean
-    public JSR353Module jsr353Module() {
-        return new JSR353Module();
+    public JSONPModule jsonpModule() {
+        return new JSONPModule();
     }
 
     /**

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

@@ -23,7 +23,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.fasterxml.jackson.datatype.jsr353.JSR353Module;
+import com.fasterxml.jackson.datatype.jsonp.JSONPModule;
 import com.google.common.base.Splitter;
 import eu.openanalytics.containerproxy.ContainerFailedToStartException;
 import eu.openanalytics.containerproxy.backend.AbstractContainerBackend;
@@ -90,6 +90,7 @@
 import io.fabric8.kubernetes.client.dsl.base.PatchType;
 import io.fabric8.kubernetes.client.readiness.Readiness;
 import io.fabric8.kubernetes.client.utils.Serialization;
+import jakarta.json.JsonPatch;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -98,7 +99,6 @@
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import javax.json.JsonPatch;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -526,7 +526,7 @@ private JsonPatch readPatchFromSpec(String patchAsString) throws JsonProcessingE
         }
 
         ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
-        yamlReader.registerModule(new JSR353Module());
+        yamlReader.registerModule(new JSONPModule());
         return yamlReader.readValue(patchAsString, JsonPatch.class);
     }
 

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/PodPatcher.java

@@ -23,17 +23,17 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.fasterxml.jackson.datatype.jsr353.JSR353Module;
+import com.fasterxml.jackson.datatype.jsonp.JSONPModule;
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
 import eu.openanalytics.containerproxy.service.StructuredLogger;
 import io.fabric8.kubernetes.api.model.Pod;
+import jakarta.json.JsonPatch;
+import jakarta.json.JsonStructure;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import javax.json.JsonPatch;
-import javax.json.JsonStructure;
 
 @Component
 public class PodPatcher {
@@ -48,8 +48,8 @@ public class PodPatcher {
 
     @PostConstruct
     public void init() {
-        mapper.registerModule(new JSR353Module());
-        writer.registerModule(new JSR353Module());
+        mapper.registerModule(new JSONPModule());
+        writer.registerModule(new JSONPModule());
         loggingEnabled = environment.getProperty(DEBUG_PROPERTY, Boolean.class, false);
     }
 

src/test/java/eu/openanalytics/containerproxy/test/e2e/app_recovery/TestAppRecovery.java

@@ -23,13 +23,13 @@
 import eu.openanalytics.containerproxy.test.helpers.ContainerSetup;
 import eu.openanalytics.containerproxy.test.helpers.ShinyProxyClient;
 import eu.openanalytics.containerproxy.test.helpers.ShinyProxyInstance;
+import jakarta.json.JsonObject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import javax.json.JsonObject;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.stream.Stream;

src/test/java/eu/openanalytics/containerproxy/test/helpers/ShinyProxyClient.java

@@ -24,6 +24,10 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.openanalytics.containerproxy.model.runtime.ProxyStatus;
 import eu.openanalytics.containerproxy.util.Retrying;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
 import okhttp3.Call;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -33,10 +37,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.HashSet;

src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnKube.java

@@ -48,14 +48,14 @@
 import io.fabric8.kubernetes.api.model.Volume;
 import io.fabric8.kubernetes.api.model.VolumeMount;
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import jakarta.json.JsonObject;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
-import javax.json.JsonObject;
 import java.io.ByteArrayInputStream;
 import java.util.Collections;
 import java.util.List;

src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationProxySharing.java

@@ -39,6 +39,7 @@
 import eu.openanalytics.containerproxy.test.helpers.TestProxySharingScaler;
 import eu.openanalytics.containerproxy.test.helpers.TestUtil;
 import eu.openanalytics.containerproxy.util.Retrying;
+import jakarta.json.JsonObject;
 import okhttp3.Request;
 import okhttp3.Response;
 import org.junit.jupiter.api.Assertions;
@@ -51,7 +52,6 @@
 import org.mandas.docker.client.exceptions.DockerCertificateException;
 import org.mandas.docker.client.exceptions.DockerException;
 
-import javax.json.JsonObject;
 import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;