Skip to content

Commit

Permalink
remove some forgotten javax dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander.vazquez committed Jan 21, 2025
1 parent 7496981 commit 385d76b
Show file tree
Hide file tree
Showing 16 changed files with 64 additions and 64 deletions.
4 changes: 2 additions & 2 deletions distro/src/main/assembly/kms.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion distro/src/main/assembly/plugin-presto.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion distro/src/main/assembly/plugin-trino.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions kms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
26 changes: 13 additions & 13 deletions kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/MetricREST.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/RangerKMSRestApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion kms/src/main/java/org/apache/ranger/common/RangerJsonProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kms/src/main/java/org/apache/ranger/kms/biz/RangerKMSStartUp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions plugin-schema-registry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
17 changes: 8 additions & 9 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions ranger-common-ha/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@
<version>${commons.lang.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta-inject.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -125,9 +125,9 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<scope>provided</scope>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation-api}</version>
</dependency>

<!-- Test -->
Expand Down
4 changes: 2 additions & 2 deletions ranger-common-ha/src/main/java/org/apache/ranger/ha/service/ServiceManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ranger-presto-plugin-shim/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${presto.validation-api.version}</version>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>${jakarta.validation-api.version}</version>
</dependency>

<dependency>
Expand Down

0 comments on commit 385d76b

Please sign in to comment.