diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index af0887ad16b..0bb7f36a9d9 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -104,6 +104,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.eclipse.jetty jetty-webapp + + org.glassfish.jersey.containers + jersey-container-servlet-core + ratis-server org.apache.ratis diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java index c4fb6063ac1..649bacbbfcc 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java @@ -84,7 +84,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import com.sun.jersey.spi.container.servlet.ServletContainer; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.server.ConnectionFactory; import org.eclipse.jetty.server.Connector; @@ -112,6 +111,8 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.webapp.WebAppContext; +import org.glassfish.jersey.server.ResourceConfig; +import org.glassfish.jersey.servlet.ServletContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -137,17 +138,17 @@ public final class HttpServer2 implements FilterContainer { public static final String HTTP_SCHEME = "http"; public static final String HTTPS_SCHEME = "https"; - private static final String HTTP_MAX_REQUEST_HEADER_SIZE_KEY = + public static final String HTTP_MAX_REQUEST_HEADER_SIZE_KEY = "hadoop.http.max.request.header.size"; private static final int HTTP_MAX_REQUEST_HEADER_SIZE_DEFAULT = 65536; - private static final String HTTP_MAX_RESPONSE_HEADER_SIZE_KEY = + public static final String HTTP_MAX_RESPONSE_HEADER_SIZE_KEY = "hadoop.http.max.response.header.size"; private static final int HTTP_MAX_RESPONSE_HEADER_SIZE_DEFAULT = 65536; private static final String HTTP_SOCKET_BACKLOG_SIZE_KEY = "hadoop.http.socket.backlog.size"; private static final int HTTP_SOCKET_BACKLOG_SIZE_DEFAULT = 128; - private static final String HTTP_MAX_THREADS_KEY = "hadoop.http.max.threads"; + public static final String HTTP_MAX_THREADS_KEY = "hadoop.http.max.threads"; private static final String HTTP_ACCEPTOR_COUNT_KEY = "hadoop.http.acceptor.count"; // -1 to use default behavior of setting count based on CPU core count @@ -171,7 +172,7 @@ public final class HttpServer2 implements FilterContainer { private static final int HTTP_IDLE_TIMEOUT_MS_DEFAULT = 60000; private static final String HTTP_TEMP_DIR_KEY = "hadoop.http.temp.dir"; - private static final String FILTER_INITIALIZER_PROPERTY + public static final String FILTER_INITIALIZER_PROPERTY = "ozone.http.filter.initializers"; // The ServletContext attribute where the daemon Configuration @@ -836,10 +837,8 @@ public void addJerseyResourcePackage(final String packageName, final String pathSpec) { LOG.info("addJerseyResourcePackage: packageName={}, pathSpec={}", packageName, pathSpec); - final ServletHolder sh = new ServletHolder(ServletContainer.class); - sh.setInitParameter("com.sun.jersey.config.property.resourceConfigClass", - "com.sun.jersey.api.core.PackagesResourceConfig"); - sh.setInitParameter("com.sun.jersey.config.property.packages", packageName); + final ResourceConfig config = new ResourceConfig().packages(packageName); + final ServletHolder sh = new ServletHolder(new ServletContainer(config)); webAppContext.addServlet(sh, pathSpec); } diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml index 47c57194591..11eee9e6d3b 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -97,7 +97,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.sun.jersey - jersey-json + * org.apache.kerby @@ -167,6 +167,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> ${hadoop.version} compile + + com.sun.jersey + * + org.apache.hadoop.thirdparty hadoop-shaded-guava diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index d118c92e29c..2120c16e240 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -250,9 +250,6 @@ CDDL 1.1 + GPLv2 with classpath exception com.sun.istack:istack-commons-runtime com.sun.jersey:jersey-client com.sun.jersey:jersey-core - com.sun.jersey:jersey-json - com.sun.jersey:jersey-server - com.sun.jersey:jersey-servlet javax.annotation:javax.annotation-api javax.el:javax.el-api javax.interceptor:javax.interceptor-api diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index 3a5f5066df9..28f38213cd1 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -129,8 +129,6 @@ share/ozone/lib/jersey-hk2.jar share/ozone/lib/jersey-media-jaxb.jar share/ozone/lib/jersey-media-json-jackson.jar share/ozone/lib/jersey-server.jar -share/ozone/lib/jersey-server.jar -share/ozone/lib/jersey-servlet.jar share/ozone/lib/jetty-client.jar share/ozone/lib/jetty-http.jar share/ozone/lib/jetty-io.jar diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml index 582e6c1034a..b25d8ec5d50 100644 --- a/hadoop-ozone/httpfsgateway/pom.xml +++ b/hadoop-ozone/httpfsgateway/pom.xml @@ -40,6 +40,10 @@ + + org.apache.ozone + hdds-server-framework + org.apache.ozone ozone-filesystem-common @@ -65,21 +69,6 @@ - - com.sun.jersey - jersey-core - compile - - - com.sun.jersey - jersey-server - compile - - - com.sun.jersey - jersey-servlet - compile - javax.servlet javax.servlet-api @@ -153,6 +142,14 @@ jakarta.xml.bind jakarta.xml.bind-api + + org.glassfish.hk2 + hk2-api + + + org.glassfish.jersey.inject + jersey-hk2 + org.glassfish.jaxb jaxb-runtime diff --git a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSExceptionProvider.java b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSExceptionProvider.java index 7da02b14bc7..cfed8c6afd5 100644 --- a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSExceptionProvider.java +++ b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSExceptionProvider.java @@ -18,10 +18,10 @@ package org.apache.ozone.fs.http.server; -import com.sun.jersey.api.container.ContainerException; import org.apache.hadoop.hdds.annotation.InterfaceAudience; import org.apache.ozone.lib.service.FileSystemAccessException; import org.apache.ozone.lib.wsrs.ExceptionProvider; +import org.glassfish.jersey.server.ContainerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; diff --git a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSParametersProvider.java b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSParametersProvider.java index 421c7f1fa66..dd504fcaa09 100644 --- a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSParametersProvider.java +++ b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSParametersProvider.java @@ -34,7 +34,6 @@ import org.apache.ozone.lib.wsrs.StringParam; import org.apache.hadoop.util.StringUtils; -import javax.ws.rs.ext.Provider; import java.util.HashMap; import java.util.Map; import java.util.regex.Pattern; @@ -42,9 +41,7 @@ /** * HttpFS ParametersProvider. */ -@Provider @InterfaceAudience.Private -@SuppressWarnings("unchecked") public class HttpFSParametersProvider extends ParametersProvider { private static final Map>[]> PARAMS_DEF diff --git a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServer.java b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServer.java index 0ba313e18b8..88ec7b48957 100644 --- a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServer.java +++ b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServer.java @@ -111,6 +111,14 @@ enum AccessMode { private static final Logger AUDIT_LOG = LoggerFactory.getLogger("httpfsaudit"); private static final Logger LOG = LoggerFactory.getLogger(HttpFSServer.class); + + private static final HttpFSParametersProvider PARAMETERS_PROVIDER = + new HttpFSParametersProvider(); + + private Parameters getParams(HttpServletRequest request) { + return PARAMETERS_PROVIDER.get(request); + } + private AccessMode accessMode = AccessMode.READWRITE; public HttpFSServer() { @@ -209,7 +217,6 @@ private void enforceRootPath(HttpFSConstants.Operation op, String path) { * * @param uriInfo uri info of the request. * @param op the HttpFS operation of the request. - * @param params the HttpFS parameters of the request. * * @return the request response. * @@ -223,10 +230,9 @@ private void enforceRootPath(HttpFSConstants.Operation op, String path) { @Produces(MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8) public Response getRoot(@Context UriInfo uriInfo, @QueryParam(OperationParam.NAME) OperationParam op, - @Context Parameters params, @Context HttpServletRequest request) throws IOException, FileSystemAccessException { - return get("", uriInfo, op, params, request); + return get("", uriInfo, op, request); } private String makeAbsolute(String path) { @@ -239,7 +245,6 @@ private String makeAbsolute(String path) { * @param path the path for operation. * @param uriInfo uri info of the request. * @param op the HttpFS operation of the request. - * @param params the HttpFS parameters of the request. * * @return the request response. * @@ -256,7 +261,6 @@ private String makeAbsolute(String path) { public Response get(@PathParam("path") String path, @Context UriInfo uriInfo, @QueryParam(OperationParam.NAME) OperationParam op, - @Context Parameters params, @Context HttpServletRequest request) throws IOException, FileSystemAccessException, UnsupportedOperationException { @@ -267,6 +271,7 @@ public Response get(@PathParam("path") String path, return Response.status(Response.Status.FORBIDDEN).build(); } UserGroupInformation user = HttpUserGroupInformation.get(); + final Parameters params = getParams(request); Response response; path = makeAbsolute(path); MDC.put(HttpFSConstants.OP_PARAM, op.value().name()); @@ -669,7 +674,6 @@ private URI createOpenRedirectionURL(UriInfo uriInfo) { * * @param path the path for operation. * @param op the HttpFS operation of the request. - * @param params the HttpFS parameters of the request. * * @return the request response. * @@ -684,7 +688,6 @@ private URI createOpenRedirectionURL(UriInfo uriInfo) { @Produces(MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8) public Response delete(@PathParam("path") String path, @QueryParam(OperationParam.NAME) OperationParam op, - @Context Parameters params, @Context HttpServletRequest request) throws IOException, FileSystemAccessException { // Do not allow DELETE commands in read-only mode @@ -692,6 +695,7 @@ public Response delete(@PathParam("path") String path, return Response.status(Response.Status.FORBIDDEN).build(); } UserGroupInformation user = HttpUserGroupInformation.get(); + final Parameters params = getParams(request); Response response; path = makeAbsolute(path); MDC.put(HttpFSConstants.OP_PARAM, op.value().name()); @@ -746,7 +750,6 @@ private Response handleDelete(String path, * @param is the inputstream for the request payload. * @param uriInfo the of the request. * @param op the HttpFS operation of the request. - * @param params the HttpFS parameters of the request. * * @return the request response. * @@ -760,9 +763,9 @@ private Response handleDelete(String path, @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8 }) public Response postRoot(InputStream is, @Context UriInfo uriInfo, @QueryParam(OperationParam.NAME) OperationParam op, - @Context Parameters params, @Context HttpServletRequest request) + @Context HttpServletRequest request) throws IOException, FileSystemAccessException { - return post(is, uriInfo, "/", op, params, request); + return post(is, uriInfo, "/", op, request); } /** @@ -772,7 +775,6 @@ public Response postRoot(InputStream is, @Context UriInfo uriInfo, * @param uriInfo the of the request. * @param path the path for operation. * @param op the HttpFS operation of the request. - * @param params the HttpFS parameters of the request. * * @return the request response. * @@ -790,7 +792,6 @@ public Response post(InputStream is, @Context UriInfo uriInfo, @PathParam("path") String path, @QueryParam(OperationParam.NAME) OperationParam op, - @Context Parameters params, @Context HttpServletRequest request) throws IOException, FileSystemAccessException { // Do not allow POST commands in read-only mode @@ -798,6 +799,7 @@ public Response post(InputStream is, return Response.status(Response.Status.FORBIDDEN).build(); } UserGroupInformation user = HttpUserGroupInformation.get(); + final Parameters params = getParams(request); Response response; path = makeAbsolute(path); MDC.put(HttpFSConstants.OP_PARAM, op.value().name()); @@ -928,7 +930,6 @@ protected URI createUploadRedirectionURL(UriInfo uriInfo, * @param is the inputstream for the request payload. * @param uriInfo the of the request. * @param op the HttpFS operation of the request. - * @param params the HttpFS parameters of the request. * * @return the request response. * @@ -942,9 +943,9 @@ protected URI createUploadRedirectionURL(UriInfo uriInfo, @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8 }) public Response putRoot(InputStream is, @Context UriInfo uriInfo, @QueryParam(OperationParam.NAME) OperationParam op, - @Context Parameters params, @Context HttpServletRequest request) + @Context HttpServletRequest request) throws IOException, FileSystemAccessException { - return put(is, uriInfo, "/", op, params, request); + return put(is, uriInfo, "/", op, request); } /** @@ -954,7 +955,6 @@ public Response putRoot(InputStream is, @Context UriInfo uriInfo, * @param uriInfo the of the request. * @param path the path for operation. * @param op the HttpFS operation of the request. - * @param params the HttpFS parameters of the request. * * @return the request response. * @@ -972,7 +972,6 @@ public Response put(InputStream is, @Context UriInfo uriInfo, @PathParam("path") String path, @QueryParam(OperationParam.NAME) OperationParam op, - @Context Parameters params, @Context HttpServletRequest request) throws IOException, FileSystemAccessException { // Do not allow PUT commands in read-only mode @@ -980,6 +979,7 @@ public Response put(InputStream is, return Response.status(Response.Status.FORBIDDEN).build(); } UserGroupInformation user = HttpUserGroupInformation.get(); + final Parameters params = getParams(request); Response response; path = makeAbsolute(path); MDC.put(HttpFSConstants.OP_PARAM, op.value().name()); diff --git a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServerWebServer.java b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServerWebServer.java index 143bb74e0f3..c194fd0ddaa 100644 --- a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServerWebServer.java +++ b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServerWebServer.java @@ -29,7 +29,9 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdds.annotation.InterfaceAudience; -import org.apache.hadoop.http.HttpServer2; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.server.http.HttpServer2; +import org.apache.hadoop.hdds.utils.LegacyHadoopConfigurationSource; import org.apache.hadoop.security.AuthenticationFilterInitializer; import org.apache.hadoop.security.authentication.server.ProxyUserAuthenticationFilterInitializer; import org.apache.hadoop.security.authorize.AccessControlList; @@ -71,7 +73,7 @@ public class HttpFSServerWebServer { private final HttpServer2 httpServer; private final String scheme; - HttpFSServerWebServer(Configuration conf, Configuration sslConf) throws + HttpFSServerWebServer(OzoneConfiguration conf, Configuration sslConf) throws Exception { // Override configuration with deprecated environment variables. deprecateEnv("HTTPFS_HTTP_HOSTNAME", conf, HTTP_HOSTNAME_KEY, @@ -122,7 +124,7 @@ public class HttpFSServerWebServer { httpServer = new HttpServer2.Builder() .setName(NAME) .setConf(conf) - .setSSLConf(sslConf) + .setSSLConf(new LegacyHadoopConfigurationSource(sslConf)) .authFilterConfigurationPrefix(HttpFSAuthenticationFilter.CONF_PREFIX) .setACL(new AccessControlList(conf.get(HTTP_ADMINS_KEY, " "))) .addEndpoint(endpoint) @@ -177,7 +179,7 @@ public URL getUrl() { public static void main(String[] args) throws Exception { startupShutdownMessage(HttpFSServerWebServer.class, args, LOG); - Configuration conf = new Configuration(true); + OzoneConfiguration conf = new OzoneConfiguration(); Configuration sslConf = SSLFactory.readSSLConfiguration(conf, SSLFactory.Mode.SERVER); HttpFSServerWebServer webServer = diff --git a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ParametersProvider.java b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ParametersProvider.java index 9cdac336468..a9bacc78d4a 100644 --- a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ParametersProvider.java +++ b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ParametersProvider.java @@ -18,18 +18,10 @@ package org.apache.ozone.lib.wsrs; -import com.sun.jersey.api.core.HttpContext; -import com.sun.jersey.core.spi.component.ComponentContext; -import com.sun.jersey.core.spi.component.ComponentScope; -import com.sun.jersey.server.impl.inject.AbstractHttpContextInjectable; -import com.sun.jersey.spi.inject.Injectable; -import com.sun.jersey.spi.inject.InjectableProvider; import org.apache.hadoop.hdds.annotation.InterfaceAudience; import org.apache.hadoop.util.StringUtils; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MultivaluedMap; -import java.lang.reflect.Type; +import javax.servlet.http.HttpServletRequest; import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; @@ -37,13 +29,11 @@ import java.util.Map; /** - * Jersey provider that parses the request parameters based on the + * Provider that parses the request parameters based on the * given parameter definition. */ @InterfaceAudience.Private -public class ParametersProvider - extends AbstractHttpContextInjectable - implements InjectableProvider { +public class ParametersProvider { private String driverParam; private Class enumClass; @@ -56,34 +46,31 @@ public ParametersProvider(String driverParam, Class enumClass, this.paramsDef = paramsDef; } - @Override - @SuppressWarnings("unchecked") - public Parameters getValue(HttpContext httpContext) { - Map>> map = new HashMap>>(); - Map> queryString - = httpContext.getRequest().getQueryParameters(); - String str = ((MultivaluedMap) queryString). - getFirst(driverParam); + public Parameters get(HttpServletRequest request) { + Map>> map = new HashMap<>(); + + Map queryString = request.getParameterMap(); + String str = queryString.get(driverParam)[0]; if (str == null) { throw new IllegalArgumentException( - MessageFormat.format("Missing Operation parameter [{0}]", - driverParam)); + MessageFormat.format("Missing Operation parameter [{0}]", + driverParam)); } Enum op; try { op = Enum.valueOf(enumClass, StringUtils.toUpperCase(str)); } catch (IllegalArgumentException ex) { throw new IllegalArgumentException( - MessageFormat.format("Invalid Operation [{0}]", str)); + MessageFormat.format("Invalid Operation [{0}]", str)); } if (!paramsDef.containsKey(op)) { throw new IllegalArgumentException( - MessageFormat.format("Unsupported Operation [{0}]", op)); + MessageFormat.format("Unsupported Operation [{0}]", op)); } for (Class> paramClass : paramsDef.get(op)) { Param param = newParam(paramClass); List> paramList = new ArrayList<>(); - List ps = queryString.get(param.getName()); + String[] ps = queryString.get(param.getName()); if (ps != null) { for (String p : ps) { try { @@ -114,15 +101,4 @@ private Param newParam(Class> paramClass) { } } - @Override - public ComponentScope getScope() { - return ComponentScope.PerRequest; - } - - @Override - public Injectable getInjectable(ComponentContext componentContext, - Context context, - Type type) { - return (type.equals(Parameters.class)) ? this : null; - } } diff --git a/hadoop-ozone/httpfsgateway/src/main/resources/webapps/webhdfs/WEB-INF/web.xml b/hadoop-ozone/httpfsgateway/src/main/resources/webapps/webhdfs/WEB-INF/web.xml index 130a1a7028a..9fa17b3e984 100644 --- a/hadoop-ozone/httpfsgateway/src/main/resources/webapps/webhdfs/WEB-INF/web.xml +++ b/hadoop-ozone/httpfsgateway/src/main/resources/webapps/webhdfs/WEB-INF/web.xml @@ -20,23 +20,11 @@ webservices-driver - com.sun.jersey.spi.container.servlet.ServletContainer + org.glassfish.jersey.servlet.ServletContainer - com.sun.jersey.config.property.packages + jersey.config.server.provider.packages org.apache.ozone.fs.http.server,org.apache.ozone.lib.wsrs - - - 1 diff --git a/hadoop-ozone/httpfsgateway/src/main/webapp/WEB-INF/web.xml b/hadoop-ozone/httpfsgateway/src/main/webapp/WEB-INF/web.xml index d6cb046969f..61c99c43bcb 100644 --- a/hadoop-ozone/httpfsgateway/src/main/webapp/WEB-INF/web.xml +++ b/hadoop-ozone/httpfsgateway/src/main/webapp/WEB-INF/web.xml @@ -20,23 +20,11 @@ webservices-driver - com.sun.jersey.spi.container.servlet.ServletContainer + org.glassfish.jersey.servlet.ServletContainer - com.sun.jersey.config.property.packages + jersey.config.server.provider.packages org.apache.ozone.fs.http.server,org.apache.ozone.lib.wsrs - - - 1 diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml index 8e31b055daa..86ec372bcba 100644 --- a/hadoop-ozone/ozonefs-hadoop2/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml @@ -66,6 +66,10 @@ org.slf4j slf4j-log4j12 + + com.sun.jersey + * + diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index 917a691c543..50798cf565f 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -204,20 +204,6 @@ org.apache.ozone ozone-common - - - jersey-server - com.sun.jersey - - - jersey-core - com.sun.jersey - - - jersey-servlet - com.sun.jersey - - org.apache.ozone diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 18bbd906a0b..b861b48b7ee 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -121,24 +121,6 @@ org.apache.ozone hdds-hadoop-dependency-server - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-servlet - - - com.sun.jersey - jersey-json - - - com.sun.jersey - jersey-server - - org.apache.ozone diff --git a/pom.xml b/pom.xml index fd311032a67..38ea60b2d1b 100644 --- a/pom.xml +++ b/pom.xml @@ -631,27 +631,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs jersey-core ${jersey.version} - - com.sun.jersey - jersey-servlet - ${jersey.version} - - - com.sun.jersey - jersey-json - ${jersey.version} - - - stax - stax-api - - - - - com.sun.jersey - jersey-server - ${jersey.version} - com.google.errorprone @@ -680,11 +659,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs bonecp ${bonecp.version} - - com.sun.jersey.contribs - jersey-guice - ${jersey.version} - org.apache.ratis