From 2d52bfd9c03fd60dbef5261ba9bc939cc1a6cb57 Mon Sep 17 00:00:00 2001 From: "alexander.vazquez" Date: Tue, 21 Jan 2025 12:38:27 +0100 Subject: [PATCH] remove some forgotten javax dependencies --- .../plugin/model/RangerDatasetHeader.java | 6 ++--- .../apache/ranger/plugin/model/RangerGds.java | 6 ++--- .../ranger/plugin/model/RangerPrincipal.java | 6 ++--- .../plugin/model/RangerServerHealth.java | 6 ++--- .../RangerValidityScheduleValidator.java | 2 +- .../RangerValidityScheduleEvaluator.java | 2 +- distro/src/main/assembly/kms.xml | 4 +-- distro/src/main/assembly/plugin-presto.xml | 2 +- distro/src/main/assembly/plugin-trino.xml | 2 +- kms/pom.xml | 5 ++-- .../hadoop/crypto/key/kms/server/KMS.java | 26 +++++++++---------- .../crypto/key/kms/server/KMSJSONReader.java | 12 ++++----- .../crypto/key/kms/server/KMSJSONWriter.java | 12 ++++----- .../crypto/key/kms/server/MetricREST.java | 8 +++--- .../key/kms/server/RangerKMSRestApi.java | 8 +++--- .../ranger/common/RangerJsonProvider.java | 2 +- .../ranger/kms/biz/RangerKMSStartUp.java | 2 +- .../client/ElasticsearchClient.java | 2 +- .../registry/client/NiFiRegistryClient.java | 2 +- .../client/TestNiFiRegistryClient.java | 2 +- .../services/nifi/client/NiFiClient.java | 2 +- .../services/nifi/client/TestNiFiClient.java | 2 +- plugin-schema-registry/pom.xml | 8 +++--- .../DefaultSchemaRegistryClient.java | 13 +++++----- pom.xml | 17 ++++++------ ranger-common-ha/pom.xml | 12 ++++----- .../ranger/ha/service/ServiceManager.java | 4 +-- ranger-presto-plugin-shim/pom.xml | 6 ++--- .../atlas/EntityNotificationWrapper.java | 2 +- 29 files changed, 91 insertions(+), 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 index 4641b119a3..6c8479ca32 100644 --- 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 index d582e420f9..3ea487c3d2 100644 --- 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 index bf96922595..cc9f208b09 100644 --- 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 index e7127833ac..80fa0a1ace 100644 --- 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/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidityScheduleValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidityScheduleValidator.java index 9a0b44aea0..79b1f59622 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidityScheduleValidator.java +++ b/agents-common/src/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/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerValidityScheduleEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerValidityScheduleEvaluator.java index 31501c709b..262f624134 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerValidityScheduleEvaluator.java +++ b/agents-common/src/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 index 208f28ad1b..bcd0129f82 100755 --- a/distro/src/main/assembly/kms.xml +++ b/distro/src/main/assembly/kms.xml @@ -55,7 +55,7 @@ org.apache.curator:curator-test asm:asm-all org.apache.httpcomponents:httpclient - javax.activation:activation + jakarta.activation:jakarta.activation-api org.apache.directory.server:apacheds-i18n org.apache.directory.server:apacheds-kerberos-codec org.apache.directory.api:api-asn1-api @@ -76,7 +76,7 @@ jakarta.annotation:jakarta.annotation-api:jar:${jakarta.annotation-api} jakarta.inject:jakarta.inject-api:jar:${jakarta-inject.version} jakarta.persistence:jakarta.persistence-api:jar:${jakarta.persistence.version} - jakarta.validation:jakarta.validation-api + jakarta.validation:jakarta.validation-api:jar:${jakarta.validation-api.version} jakarta.ws.rs:jakarta.ws.rs-api:jar:${jakarta.ws.version} jakarta.xml.bind:jakarta.xml.bind-api:jar:${jakarta.xml.version} org.glassfish.jaxb:jaxb-core:jar:${jaxb.api.version} diff --git a/distro/src/main/assembly/plugin-presto.xml b/distro/src/main/assembly/plugin-presto.xml index 508e5837cc..8b26345bb7 100644 --- a/distro/src/main/assembly/plugin-presto.xml +++ b/distro/src/main/assembly/plugin-presto.xml @@ -41,7 +41,7 @@ io.airlift:log:jar:${presto.airlift.version} io.airlift:log-manager:jar:${presto.airlift.version} io.airlift:configuration:jar:${presto.airlift.version} - javax.validation:validation-api:jar:${presto.validation-api.version} + jakarta.validation:jakarta.validation-api:jar:${jakarta.validation-api.version} jakarta.inject:jakarta.inject-api:jar:${jakarta-inject.version} org.apache.bval:bval-jsr:jar:${presto.bval-jsr.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} diff --git a/distro/src/main/assembly/plugin-trino.xml b/distro/src/main/assembly/plugin-trino.xml index 208f349ead..e636c97a0c 100644 --- a/distro/src/main/assembly/plugin-trino.xml +++ b/distro/src/main/assembly/plugin-trino.xml @@ -43,7 +43,7 @@ io.airlift:log:jar:${trino.airlift.version} io.airlift:log-manager:jar:${trino.airlift.version} io.airlift:configuration:jar:${trino.airlift.version} - javax.validation:validation-api:jar:${trino.validation-api.version} + jakarta.validation:jakarta.validation-api:jar:${jakarta.validation-api.version} jakarta.inject:jakarta.inject-api:jar:${jakarta-inject.version} org.apache.bval:bval-jsr:jar:${trino.bval-jsr.version} org.slf4j:slf4j-api:jar:${slf4j-api.version} diff --git a/kms/pom.xml b/kms/pom.xml index ba0eae59a4..0a73c3177f 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -188,8 +188,9 @@ - javax.annotation - jsr250-api + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation-api} provided 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 index 7f8871c56c..d88a42474e 100644 --- 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 index 59cc21823a..feba035a4c 100644 --- 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 index a4e2b30423..9f4926014c 100644 --- 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 index f91902d1c7..57c4b294da 100644 --- 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 index 04d26f7e7f..73f6684ce8 100644 --- 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 index 5219647bf6..d044541a6f 100644 --- 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 index 03aeb809ba..26060a728a 100644 --- 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/plugin-elasticsearch/src/main/java/org/apache/ranger/services/elasticsearch/client/ElasticsearchClient.java b/plugin-elasticsearch/src/main/java/org/apache/ranger/services/elasticsearch/client/ElasticsearchClient.java index b72051073f..88cef12023 100644 --- a/plugin-elasticsearch/src/main/java/org/apache/ranger/services/elasticsearch/client/ElasticsearchClient.java +++ b/plugin-elasticsearch/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/plugin-nifi-registry/src/main/java/org/apache/ranger/services/nifi/registry/client/NiFiRegistryClient.java b/plugin-nifi-registry/src/main/java/org/apache/ranger/services/nifi/registry/client/NiFiRegistryClient.java index 44817901e3..b8be177663 100644 --- a/plugin-nifi-registry/src/main/java/org/apache/ranger/services/nifi/registry/client/NiFiRegistryClient.java +++ b/plugin-nifi-registry/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/plugin-nifi-registry/src/test/java/org/apache/ranger/services/nifi/registry/client/TestNiFiRegistryClient.java b/plugin-nifi-registry/src/test/java/org/apache/ranger/services/nifi/registry/client/TestNiFiRegistryClient.java index 35eed467b4..60d1c5c8f6 100644 --- a/plugin-nifi-registry/src/test/java/org/apache/ranger/services/nifi/registry/client/TestNiFiRegistryClient.java +++ b/plugin-nifi-registry/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 index cd56855752..50ab6c4dd9 100644 --- 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 index 20a57f67d2..97a2c8ce2f 100644 --- 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 index 46cb1140b4..65aef218a7 100644 --- a/plugin-schema-registry/pom.xml +++ b/plugin-schema-registry/pom.xml @@ -33,7 +33,7 @@ 1.11.3 - 2.22.1 + 3.0.16 0.9.1 1.5.4 3.0.1 @@ -284,9 +284,9 @@ test - javax.servlet - javax.servlet-api - ${servlet-api.version} + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.version} test diff --git a/plugin-schema-registry/src/main/java/org/apache/ranger/services/schema/registry/client/connection/DefaultSchemaRegistryClient.java b/plugin-schema-registry/src/main/java/org/apache/ranger/services/schema/registry/client/connection/DefaultSchemaRegistryClient.java index 217bf71d15..d24859871b 100644 --- a/plugin-schema-registry/src/main/java/org/apache/ranger/services/schema/registry/client/connection/DefaultSchemaRegistryClient.java +++ b/plugin-schema-registry/src/main/java/org/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 urlWithTargets; @@ -67,7 +66,7 @@ public DefaultSchemaRegistryClient(Map 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 index 0e57037caa..a111e03e22 100644 --- a/pom.xml +++ b/pom.xml @@ -141,23 +141,22 @@ 1.40.0 1.26.0-alpha 2.1.3 - 3.2.0 - 6.1.0 - 2.0.1 3.0.0 6.0.1 + 2.0.1 + 3.2.0 + 6.1.0 + 4.0.0 + 3.0.2 3.0.0 4.0.2 - 4.0.0 3.0.2 3.3 - 3.0.16 3.0.16 3.0.16 3.0.2 3.0.6 - 2.3.3 1.5.4 9.4.49.v20220914 @@ -999,9 +998,9 @@ ${hbase.version} - javax.annotation - jsr250-api - ${jsr250.version} + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation-api} org.glassfish.jaxb diff --git a/ranger-common-ha/pom.xml b/ranger-common-ha/pom.xml index 68aa6ea968..95e8590528 100644 --- a/ranger-common-ha/pom.xml +++ b/ranger-common-ha/pom.xml @@ -110,9 +110,9 @@ ${commons.lang.version} - javax.inject - javax.inject - 1 + jakarta.inject + jakarta.inject-api + ${jakarta-inject.version} org.slf4j @@ -125,9 +125,9 @@ ${slf4j.version} - javax.annotation - jsr250-api - provided + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation-api} diff --git a/ranger-common-ha/src/main/java/org/apache/ranger/ha/service/ServiceManager.java b/ranger-common-ha/src/main/java/org/apache/ranger/ha/service/ServiceManager.java index fe7bd91f4d..fdad102e22 100644 --- a/ranger-common-ha/src/main/java/org/apache/ranger/ha/service/ServiceManager.java +++ b/ranger-common-ha/src/main/java/org/apache/ranger/ha/service/ServiceManager.java @@ -20,8 +20,8 @@ import java.util.List; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.ranger.ha.annotation.HAService; diff --git a/ranger-presto-plugin-shim/pom.xml b/ranger-presto-plugin-shim/pom.xml index 28a3e23e02..d448caad56 100644 --- a/ranger-presto-plugin-shim/pom.xml +++ b/ranger-presto-plugin-shim/pom.xml @@ -72,9 +72,9 @@ - javax.validation - validation-api - ${presto.validation-api.version} + jakarta.validation + jakarta.validation-api + ${jakarta.validation-api.version} diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/EntityNotificationWrapper.java b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/EntityNotificationWrapper.java index bedadba187..273a0dceda 100644 --- a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/EntityNotificationWrapper.java +++ b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/EntityNotificationWrapper.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import java.util.ArrayList; import java.util.HashMap; import java.util.List;