remove some forgotten javax dependencies

apache · Jan 22, 2025 · 2d52bfd · 2d52bfd
1 parent 7496981
commit 2d52bfd
Show file tree

Hide file tree

Showing 29 changed files with 91 additions and 92 deletions.
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerDatasetHeader.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerDatasetHeader.java
@@ -23,9 +23,9 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.Map;
 
 public class RangerDatasetHeader {

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerGds.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerGds.java
@@ -28,9 +28,9 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPrincipal.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPrincipal.java
@@ -23,9 +23,9 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.Objects;
 
 @JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServerHealth.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServerHealth.java
@@ -26,9 +26,9 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
 @JsonIgnoreProperties(ignoreUnknown=true)

diff --git a/.../main/java/org/apache/ranger/plugin/model/validation/RangerValidityScheduleValidator.java b/.../main/java/org/apache/ranger/plugin/model/validation/RangerValidityScheduleValidator.java
@@ -41,7 +41,7 @@
 import org.apache.ranger.plugin.model.RangerValidityRecurrence.RecurrenceSchedule;
 import org.apache.ranger.plugin.model.RangerValiditySchedule;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 public class RangerValidityScheduleValidator {
     private static final Logger LOG = LoggerFactory.getLogger(RangerValidityScheduleValidator.class);

diff --git a/...c/main/java/org/apache/ranger/plugin/policyevaluator/RangerValidityScheduleEvaluator.java b/...c/main/java/org/apache/ranger/plugin/policyevaluator/RangerValidityScheduleEvaluator.java
@@ -31,7 +31,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml
@@ -55,7 +55,7 @@
                     <include>org.apache.curator:curator-test</include>
                     <include>asm:asm-all</include>
                     <include>org.apache.httpcomponents:httpclient</include>
-                    <include>javax.activation:activation</include>
+                    <include>jakarta.activation:jakarta.activation-api</include>
                     <include>org.apache.directory.server:apacheds-i18n</include>
                     <include>org.apache.directory.server:apacheds-kerberos-codec</include>
                     <include>org.apache.directory.api:api-asn1-api</include>
@@ -76,7 +76,7 @@
                     <include>jakarta.annotation:jakarta.annotation-api:jar:${jakarta.annotation-api}</include>
                     <include>jakarta.inject:jakarta.inject-api:jar:${jakarta-inject.version}</include>
                     <include>jakarta.persistence:jakarta.persistence-api:jar:${jakarta.persistence.version}</include>
-                    <include>jakarta.validation:jakarta.validation-api</include>
+                    <include>jakarta.validation:jakarta.validation-api:jar:${jakarta.validation-api.version}</include>
                     <include>jakarta.ws.rs:jakarta.ws.rs-api:jar:${jakarta.ws.version}</include>
                     <include>jakarta.xml.bind:jakarta.xml.bind-api:jar:${jakarta.xml.version}</include>
                     <include>org.glassfish.jaxb:jaxb-core:jar:${jaxb.api.version}</include>

diff --git a/distro/src/main/assembly/plugin-presto.xml b/distro/src/main/assembly/plugin-presto.xml
@@ -41,7 +41,7 @@
                     <include>io.airlift:log:jar:${presto.airlift.version}</include>
                     <include>io.airlift:log-manager:jar:${presto.airlift.version}</include>
                     <include>io.airlift:configuration:jar:${presto.airlift.version}</include>
-                    <include>javax.validation:validation-api:jar:${presto.validation-api.version}</include>
+                    <include>jakarta.validation:jakarta.validation-api:jar:${jakarta.validation-api.version}</include>
                     <include>jakarta.inject:jakarta.inject-api:jar:${jakarta-inject.version}</include>
                     <include>org.apache.bval:bval-jsr:jar:${presto.bval-jsr.version}</include>
                     <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>

diff --git a/distro/src/main/assembly/plugin-trino.xml b/distro/src/main/assembly/plugin-trino.xml
@@ -43,7 +43,7 @@
                     <include>io.airlift:log:jar:${trino.airlift.version}</include>
                     <include>io.airlift:log-manager:jar:${trino.airlift.version}</include>
                     <include>io.airlift:configuration:jar:${trino.airlift.version}</include>
-                    <include>javax.validation:validation-api:jar:${trino.validation-api.version}</include>
+                    <include>jakarta.validation:jakarta.validation-api:jar:${jakarta.validation-api.version}</include>
                     <include>jakarta.inject:jakarta.inject-api:jar:${jakarta-inject.version}</include>
                     <include>org.apache.bval:bval-jsr:jar:${trino.bval-jsr.version}</include>
                     <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>

diff --git a/kms/pom.xml b/kms/pom.xml
@@ -188,8 +188,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta.annotation-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
@@ -33,21 +33,21 @@
 import org.apache.hadoop.crypto.key.kms.KMSClientProvider.KMSEncryptedKeyVersion;
 import org.apache.hadoop.crypto.key.kms.server.KMSACLsType.Type;
 import org.apache.hadoop.security.token.delegation.web.HttpUserGroupInformation;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import jakarta.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import java.io.IOException;
 import java.net.URI;

diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java
@@ -20,12 +20,12 @@
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.ranger.plugin.util.JsonUtilsV2;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.annotation.Annotation;

diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java
@@ -20,12 +20,12 @@
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.ranger.plugin.util.JsonUtilsV2;
 
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;

diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/MetricREST.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/MetricREST.java
@@ -24,10 +24,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import java.util.Map;
 
 @Path("metrics")

diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/RangerKMSRestApi.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/RangerKMSRestApi.java
@@ -18,10 +18,10 @@
 
 package org.apache.hadoop.crypto.key.kms.server;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.google.gson.JsonObject;

diff --git a/kms/src/main/java/org/apache/ranger/common/RangerJsonProvider.java b/kms/src/main/java/org/apache/ranger/common/RangerJsonProvider.java
@@ -23,7 +23,7 @@
 import jakarta.ws.rs.ext.ContextResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.Provider;
 
 
 @Provider

diff --git a/kms/src/main/java/org/apache/ranger/kms/biz/RangerKMSStartUp.java b/kms/src/main/java/org/apache/ranger/kms/biz/RangerKMSStartUp.java
@@ -17,7 +17,7 @@
 
 package org.apache.ranger.kms.biz;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.servlet.http.HttpServlet;
 
 import org.slf4j.Logger;

diff --git a/...ch/src/main/java/org/apache/ranger/services/elasticsearch/client/ElasticsearchClient.java b/...ch/src/main/java/org/apache/ranger/services/elasticsearch/client/ElasticsearchClient.java
@@ -29,7 +29,7 @@
 import java.util.Set;
 
 import javax.security.auth.Subject;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;

diff --git a/...try/src/main/java/org/apache/ranger/services/nifi/registry/client/NiFiRegistryClient.java b/...try/src/main/java/org/apache/ranger/services/nifi/registry/client/NiFiRegistryClient.java
@@ -34,7 +34,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSession;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.Certificate;

diff --git a/...src/test/java/org/apache/ranger/services/nifi/registry/client/TestNiFiRegistryClient.java b/...src/test/java/org/apache/ranger/services/nifi/registry/client/TestNiFiRegistryClient.java
@@ -26,7 +26,7 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/plugin-nifi/src/main/java/org/apache/ranger/services/nifi/client/NiFiClient.java b/plugin-nifi/src/main/java/org/apache/ranger/services/nifi/client/NiFiClient.java
@@ -34,7 +34,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSession;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.Certificate;

diff --git a/plugin-nifi/src/test/java/org/apache/ranger/services/nifi/client/TestNiFiClient.java b/plugin-nifi/src/test/java/org/apache/ranger/services/nifi/client/TestNiFiClient.java
@@ -25,7 +25,7 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;

diff --git a/plugin-schema-registry/pom.xml b/plugin-schema-registry/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <avro.version>1.11.3</avro.version>
-        <jersey.version>2.22.1</jersey.version>
+        <jersey.version>3.0.16</jersey.version>
         <schema.registry.version>0.9.1</schema.registry.version>
         <jettison.version>1.5.4</jettison.version>
         <servlet-api.version>3.0.1</servlet-api.version>
@@ -284,9 +284,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet-api.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/...apache/ranger/services/schema/registry/client/connection/DefaultSchemaRegistryClient.java b/...apache/ranger/services/schema/registry/client/connection/DefaultSchemaRegistryClient.java
@@ -25,15 +25,14 @@
 import org.codehaus.jettison.json.JSONObject;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.JerseyClientBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.SSLContext;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URLEncoder;
@@ -56,7 +55,7 @@ public class DefaultSchemaRegistryClient implements ISchemaRegistryClient {
     private static final String SCHEMAS_PATH = SCHEMA_REGISTRY_PATH + "/schemas/";
     private static final String SCHEMA_REGISTRY_VERSION_PATH = SCHEMA_REGISTRY_PATH + "/version";
     private static final String SSL_ALGORITHM = "TLSv1.2";
-    private final javax.ws.rs.client.Client client;
+    private final jakarta.ws.rs.client.Client client;
     private final Login login;
     private final UrlSelector urlSelector;
     private final Map<String, SchemaRegistryTargets> urlWithTargets;
@@ -67,7 +66,7 @@ public DefaultSchemaRegistryClient(Map<String, ?> conf) {
         login = SecurityUtils.initializeSecurityContext(conf);
         ClientConfig config = createClientConfig(conf);
         final boolean SSLEnabled = SecurityUtils.isHttpsConnection(conf);
-        ClientBuilder clientBuilder = JerseyClientBuilder.newBuilder()
+        ClientBuilder clientBuilder = ClientBuilder.newBuilder()
                 .withConfig(config)
                 .property(ClientProperties.FOLLOW_REDIRECTS, Boolean.TRUE);
         if (SSLEnabled) {

diff --git a/pom.xml b/pom.xml
@@ -141,23 +141,22 @@
         <io.opentelemetry.version>1.40.0</io.opentelemetry.version>
         <io.opentelemetry-semconv.version>1.26.0-alpha</io.opentelemetry-semconv.version>
         <jakarta.activation.version>2.1.3</jakarta.activation.version>
-        <jakarta.persistence.version>3.2.0</jakarta.persistence.version>
-        <jakarta.servlet.version>6.1.0</jakarta.servlet.version>
-        <jakarta-inject.version>2.0.1</jakarta-inject.version>
         <jakarta.annotation-api>3.0.0</jakarta.annotation-api>
         <jakarta.el.version>6.0.1</jakarta.el.version>
+        <jakarta-inject.version>2.0.1</jakarta-inject.version>
+        <jakarta.persistence.version>3.2.0</jakarta.persistence.version>
+        <jakarta.servlet.version>6.1.0</jakarta.servlet.version>
+        <jakarta.security.version>4.0.0</jakarta.security.version>
+        <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
         <jakarta.ws.version>3.0.0</jakarta.ws.version>
         <jakarta.xml.version>4.0.2</jakarta.xml.version>
-        <jakarta.security.version>4.0.0</jakarta.security.version>
         <jaxb.api.version>3.0.2</jaxb.api.version>
         <jericho.html.version>3.3</jericho.html.version>
-
         <jersey-core.version>3.0.16</jersey-core.version>
         <jersey-media.version>3.0.16</jersey-media.version>
         <jersey-spring.version>3.0.16</jersey-spring.version>
         <glassfish.jaxb.version>3.0.2</glassfish.jaxb.version>
         <hk2.version>3.0.6</hk2.version>
-
         <jaxb-impl.version>2.3.3</jaxb-impl.version>
         <jettison.version>1.5.4</jettison.version>
         <jetty-client.version>9.4.49.v20220914</jetty-client.version>
@@ -999,9 +998,9 @@
                 <version>${hbase.version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.annotation</groupId>
-                <artifactId>jsr250-api</artifactId>
-                <version>${jsr250.version}</version>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${jakarta.annotation-api}</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>