From 39b65e2af3445584d3a19739f3bb37dda7db6848 Mon Sep 17 00:00:00 2001 From: mcheah Date: Mon, 15 Feb 2016 15:30:10 -0800 Subject: [PATCH 1/6] [SPARK-12154] Upgrade to Jersey 2 Changes to the Spark Web UI code were required to compile. The changes were relatively standard Jersey migration things. --- core/pom.xml | 10 ++-- .../spark/status/api/v1/ApiRootResource.scala | 12 ++--- .../spark/status/api/v1/SecurityFilter.scala | 16 +++--- docker-integration-tests/pom.xml | 29 ++++------- examples/pom.xml | 30 ++++++++--- external/kafka-assembly/pom.xml | 6 +-- external/mqtt-assembly/pom.xml | 6 +-- extras/kinesis-asl-assembly/pom.xml | 4 +- pom.xml | 50 ++++++++++++++++--- sql/hive-thriftserver/pom.xml | 6 +-- yarn/pom.xml | 10 ++-- 11 files changed, 111 insertions(+), 68 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index be40d9936afd7..0f0918e49909f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -195,12 +195,16 @@ 3.2.10 - com.sun.jersey + org.glassfish.jersey.core jersey-server - com.sun.jersey - jersey-core + org.glassfish.jersey.core + jersey-common + + + org.glassfish.jersey.containers + jersey-container-servlet org.apache.mesos diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala index 50b6ba67e9931..041755239df34 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala @@ -20,9 +20,10 @@ import java.util.zip.ZipOutputStream import javax.servlet.ServletContext import javax.ws.rs._ import javax.ws.rs.core.{Context, Response} +import javax.ws.rs.ext.Provider -import com.sun.jersey.api.core.ResourceConfig -import com.sun.jersey.spi.container.servlet.ServletContainer +import org.glassfish.jersey.server.{ServerProperties, ResourceConfig} +import org.glassfish.jersey.servlet.ServletContainer import org.eclipse.jetty.server.handler.ContextHandler import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder} @@ -185,12 +186,7 @@ private[spark] object ApiRootResource { val jerseyContext = new ServletContextHandler(ServletContextHandler.NO_SESSIONS) jerseyContext.setContextPath("/api") val holder: ServletHolder = new ServletHolder(classOf[ServletContainer]) - holder.setInitParameter("com.sun.jersey.config.property.resourceConfigClass", - "com.sun.jersey.api.core.PackagesResourceConfig") - holder.setInitParameter("com.sun.jersey.config.property.packages", - "org.apache.spark.status.api.v1") - holder.setInitParameter(ResourceConfig.PROPERTY_CONTAINER_REQUEST_FILTERS, - classOf[SecurityFilter].getCanonicalName) + holder.setInitParameter(ServerProperties.PROVIDER_PACKAGES, "org.apache.spark.status.api.v1") UIRootFromServletContext.setUiRoot(jerseyContext, uiRoot) jerseyContext.addServlet(holder, "/*") jerseyContext diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/SecurityFilter.scala b/core/src/main/scala/org/apache/spark/status/api/v1/SecurityFilter.scala index 95fbd96ade5ab..b4a991eda35f3 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/SecurityFilter.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/SecurityFilter.scala @@ -16,18 +16,16 @@ */ package org.apache.spark.status.api.v1 -import javax.ws.rs.WebApplicationException +import javax.ws.rs.container.{ContainerRequestContext, ContainerRequestFilter} import javax.ws.rs.core.Response +import javax.ws.rs.ext.Provider -import com.sun.jersey.spi.container.{ContainerRequest, ContainerRequestFilter} - +@Provider private[v1] class SecurityFilter extends ContainerRequestFilter with UIRootFromServletContext { - def filter(req: ContainerRequest): ContainerRequest = { - val user = Option(req.getUserPrincipal).map { _.getName }.orNull - if (uiRoot.securityManager.checkUIViewPermissions(user)) { - req - } else { - throw new WebApplicationException( + override def filter(req: ContainerRequestContext): Unit = { + val user = Option(req.getSecurityContext.getUserPrincipal).map { _.getName }.orNull + if (!uiRoot.securityManager.checkUIViewPermissions(user)) { + req.abortWith( Response .status(Response.Status.FORBIDDEN) .entity(raw"""user "$user"is not authorized""") diff --git a/docker-integration-tests/pom.xml b/docker-integration-tests/pom.xml index 833ca29cd8218..21d0386bcb922 100644 --- a/docker-integration-tests/pom.xml +++ b/docker-integration-tests/pom.xml @@ -131,33 +131,27 @@ postgresql test - - com.sun.jersey + org.glassfish.jersey.core jersey-server - 1.19 + 2.22.1 test - com.sun.jersey - jersey-core - 1.19 + org.glassfish.jersey.core + jersey-common + 2.22.1 test - com.sun.jersey - jersey-servlet - 1.19 - test + org.glassfish.jersey.containers + jersey-container-servlet + 2.22.1 - com.sun.jersey - jersey-json - 1.19 + org.glassfish.jersey.media + jersey-media-json-jackson + 2.22.1 test @@ -166,6 +160,5 @@ - diff --git a/examples/pom.xml b/examples/pom.xml index 82baa9085b4f9..c0c695df3879e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -123,6 +123,12 @@ hbase-protocol ${hbase.version} ${hbase.deps.scope} + + + com.sun.jersey + * + + org.apache.hbase @@ -201,25 +207,37 @@ org.apache.commons commons-math + + com.sun.jersey + jersey-common + com.sun.jersey jersey-core - org.slf4j - slf4j-api + com.sun.jersey + jersey-json com.sun.jersey jersey-server - com.sun.jersey - jersey-core + org.glassfish.jersey.core + jersey-common - com.sun.jersey - jersey-json + org.slf4j + slf4j-api + + + org.glassfish.jersey.core + jersey-server + + + org.glassfish.jersey.media + jersey-media-json-jackson diff --git a/external/kafka-assembly/pom.xml b/external/kafka-assembly/pom.xml index 62818f5e8f434..d3fcd821311a3 100644 --- a/external/kafka-assembly/pom.xml +++ b/external/kafka-assembly/pom.xml @@ -66,13 +66,13 @@ provided - com.sun.jersey + org.glassfish.jersey.core jersey-server provided - com.sun.jersey - jersey-core + org.glassfish.jersey.core + jersey-common provided diff --git a/external/mqtt-assembly/pom.xml b/external/mqtt-assembly/pom.xml index ac2a3f65ed2f5..83858101cac77 100644 --- a/external/mqtt-assembly/pom.xml +++ b/external/mqtt-assembly/pom.xml @@ -61,13 +61,13 @@ provided - com.sun.jersey + org.glassfish.jersey.core jersey-server provided - com.sun.jersey - jersey-core + org.glassfish.jersey.core + jersey-common provided diff --git a/extras/kinesis-asl-assembly/pom.xml b/extras/kinesis-asl-assembly/pom.xml index d1c38c7ca5d69..8b0f3fd027292 100644 --- a/extras/kinesis-asl-assembly/pom.xml +++ b/extras/kinesis-asl-assembly/pom.xml @@ -66,12 +66,12 @@ provided - com.sun.jersey + org.glassfish.jersey jersey-server provided - com.sun.jersey + org.glassfish.jersey jersey-core provided diff --git a/pom.xml b/pom.xml index 4f7a0574c52dc..156e8238eb7d6 100644 --- a/pom.xml +++ b/pom.xml @@ -180,7 +180,7 @@ 3.3.2 3.2.10 2.7.8 - 1.9 + 2.22.1 2.9 3.5.2 1.3.9 @@ -629,20 +629,23 @@ - com.sun.jersey + javax.ws.rs + javax.ws.rs-api + 2.0.1 + + + org.glassfish.jersey.core jersey-server ${jersey.version} - ${hadoop.deps.scope} - com.sun.jersey - jersey-core + org.glassfish.jersey.core + jersey-common ${jersey.version} - ${hadoop.deps.scope} - com.sun.jersey - jersey-json + org.glassfish.jersey.media + jersey-media-json-jackson ${jersey.version} @@ -651,6 +654,21 @@ + + org.glassfish.jersey.core + jersey-client + ${jersey.version} + + + org.glassfish.jersey.containers + jersey-container-servlet + ${jersey.version} + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey.version} + org.scala-lang scala-compiler @@ -829,6 +847,10 @@ junit junit + + com.sun.jersey + * + @@ -990,6 +1012,10 @@ commons-logging commons-logging + + com.sun.jersey + * + @@ -1018,6 +1044,10 @@ commons-logging commons-logging + + com.sun.jersey + * + @@ -1046,6 +1076,10 @@ commons-logging commons-logging + + com.sun.jersey + * + diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index c8d17bd468582..9b7468b7d3a91 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -69,15 +69,15 @@ hive-beeline - com.sun.jersey + org.glassfish.jersey jersey-core - com.sun.jersey + org.glassfish.jersey jersey-json - com.sun.jersey + org.glassfish.jersey jersey-server diff --git a/yarn/pom.xml b/yarn/pom.xml index 328bb6678db99..2f3bce9db8fd0 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -148,17 +148,17 @@ test - com.sun.jersey - jersey-core + org.glassfish.jersey.core + jersey-common test - com.sun.jersey - jersey-json + org.glassfish.jersey.media + jersey-media-json-jackson test - com.sun.jersey + org.glassfish.jersey.core jersey-server test From f8f852dbcb331a331bcca10e8aca0db2e660f7c2 Mon Sep 17 00:00:00 2001 From: mcheah Date: Tue, 16 Feb 2016 11:55:00 -0800 Subject: [PATCH 2/6] Fix jersey dependency in kinesis-asl-assembly --- extras/kinesis-asl-assembly/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extras/kinesis-asl-assembly/pom.xml b/extras/kinesis-asl-assembly/pom.xml index 8b0f3fd027292..ddf081ef9dccc 100644 --- a/extras/kinesis-asl-assembly/pom.xml +++ b/extras/kinesis-asl-assembly/pom.xml @@ -66,13 +66,13 @@ provided - org.glassfish.jersey + org.glassfish.jersey.core jersey-server provided - org.glassfish.jersey - jersey-core + org.glassfish.jersey.core + jersey-common provided From 565c63c63d8fb2270a3403a165d72f1826c0cfbd Mon Sep 17 00:00:00 2001 From: mcheah Date: Tue, 16 Feb 2016 14:51:28 -0800 Subject: [PATCH 3/6] Fix sql thriftserver jersey dependency --- .../sql/catalyst/plans/logical/basicOperators.scala | 2 +- sql/hive-thriftserver/pom.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala index 502d898fea86c..a744f7709126b 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala @@ -348,7 +348,7 @@ case class WithWindowDefinition( */ case class Sort( order: Seq[SortOrder], - global: Boolean, + ndowglobal: Boolean, child: LogicalPlan) extends UnaryNode { override def output: Seq[Attribute] = child.output override def maxRows: Option[Long] = child.maxRows diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 9b7468b7d3a91..6c69b8939b4eb 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -69,16 +69,16 @@ hive-beeline - org.glassfish.jersey - jersey-core + org.glassfish.jersey.core + jersey-common - org.glassfish.jersey - jersey-json + org.glassfish.jersey.core + jersey-server - org.glassfish.jersey - jersey-server + org.glassfish.jersey.media + jersey-media-json-jackson From c7318cb5e404fae81ed1e8701ebecd49a52ef904 Mon Sep 17 00:00:00 2001 From: mcheah Date: Wed, 17 Feb 2016 17:33:17 -0800 Subject: [PATCH 4/6] Fix scalastyle, address comments --- .../apache/spark/status/api/v1/ApiRootResource.scala | 5 ++--- docker-integration-tests/pom.xml | 2 -- examples/pom.xml | 12 ------------ .../sql/catalyst/plans/logical/basicOperators.scala | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala index 041755239df34..f0db450cba50e 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala @@ -20,12 +20,11 @@ import java.util.zip.ZipOutputStream import javax.servlet.ServletContext import javax.ws.rs._ import javax.ws.rs.core.{Context, Response} -import javax.ws.rs.ext.Provider -import org.glassfish.jersey.server.{ServerProperties, ResourceConfig} -import org.glassfish.jersey.servlet.ServletContainer import org.eclipse.jetty.server.handler.ContextHandler import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder} +import org.glassfish.jersey.server.ServerProperties +import org.glassfish.jersey.servlet.ServletContainer import org.apache.spark.SecurityManager import org.apache.spark.ui.SparkUI diff --git a/docker-integration-tests/pom.xml b/docker-integration-tests/pom.xml index 21d0386bcb922..bd25b7bf9a956 100644 --- a/docker-integration-tests/pom.xml +++ b/docker-integration-tests/pom.xml @@ -134,13 +134,11 @@ org.glassfish.jersey.core jersey-server - 2.22.1 test org.glassfish.jersey.core jersey-common - 2.22.1 test diff --git a/examples/pom.xml b/examples/pom.xml index c0c695df3879e..1b75068bffd13 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -223,22 +223,10 @@ com.sun.jersey jersey-server - - org.glassfish.jersey.core - jersey-common - org.slf4j slf4j-api - - org.glassfish.jersey.core - jersey-server - - - org.glassfish.jersey.media - jersey-media-json-jackson - commons-io diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala index a744f7709126b..502d898fea86c 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala @@ -348,7 +348,7 @@ case class WithWindowDefinition( */ case class Sort( order: Seq[SortOrder], - ndowglobal: Boolean, + global: Boolean, child: LogicalPlan) extends UnaryNode { override def output: Seq[Attribute] = child.output override def maxRows: Option[Long] = child.maxRows From 2d274db55a6c1644ec3c8958692fadce97c369f7 Mon Sep 17 00:00:00 2001 From: mcheah Date: Thu, 18 Feb 2016 16:25:17 -0800 Subject: [PATCH 5/6] Ran test-dependencies to update manifest --- dev/deps/spark-deps-hadoop-2.2 | 23 ++++++++++++++++++++++- dev/deps/spark-deps-hadoop-2.3 | 22 ++++++++++++++++++++++ dev/deps/spark-deps-hadoop-2.4 | 23 ++++++++++++++++++++++- dev/deps/spark-deps-hadoop-2.6 | 22 ++++++++++++++++++++++ dev/deps/spark-deps-hadoop-2.7 | 22 ++++++++++++++++++++++ 5 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index 3a14499d9b4d9..ab043afeb7d27 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -4,6 +4,7 @@ ST4-4.0.4.jar activation-1.1.jar antlr-runtime-3.5.2.jar aopalliance-1.0.jar +aopalliance-repackaged-2.4.0-b31.jar apache-log4j-extras-1.2.17.jar arpack_combined_all-0.1.jar asm-3.1.jar @@ -77,6 +78,9 @@ hadoop-yarn-client-2.2.0.jar hadoop-yarn-common-2.2.0.jar hadoop-yarn-server-common-2.2.0.jar hadoop-yarn-server-web-proxy-2.2.0.jar +hk2-api-2.4.0-b31.jar +hk2-locator-2.4.0-b31.jar +hk2-utils-2.4.0-b31.jar httpclient-4.3.2.jar httpcore-4.3.2.jar ivy-2.4.0.jar @@ -85,25 +89,41 @@ jackson-core-2.5.3.jar jackson-core-asl-1.9.13.jar jackson-databind-2.5.3.jar jackson-jaxrs-1.9.13.jar +jackson-jaxrs-base-2.5.4.jar +jackson-jaxrs-json-provider-2.5.4.jar jackson-mapper-asl-1.9.13.jar +jackson-module-jaxb-annotations-2.5.4.jar jackson-module-scala_2.11-2.5.3.jar jackson-xc-1.9.13.jar janino-2.7.8.jar +javassist-3.18.1-GA.jar +javax.annotation-api-1.2.jar javax.inject-1.jar +javax.inject-2.4.0-b31.jar javax.servlet-3.0.0.v201112011016.jar javax.servlet-3.1.jar javax.servlet-api-3.0.1.jar +javax.ws.rs-api-2.0.1.jar javolution-5.5.1.jar jaxb-api-2.2.2.jar jaxb-impl-2.2.3-1.jar jcl-over-slf4j-1.7.10.jar jdo-api-3.0.1.jar jersey-client-1.9.jar +jersey-client-2.22.1.jar +jersey-common-2.22.1.jar +jersey-container-servlet-2.22.1.jar +jersey-container-servlet-core-2.22.1.jar jersey-core-1.9.jar +jersey-entity-filtering-2.22.1.jar jersey-grizzly2-1.9.jar +jersey-guava-2.22.1.jar jersey-guice-1.9.jar jersey-json-1.9.jar +jersey-media-jaxb-2.22.1.jar +jersey-media-json-jackson-2.22.1.jar jersey-server-1.9.jar +jersey-server-2.22.1.jar jersey-test-framework-core-1.9.jar jersey-test-framework-grizzly2-1.9.jar jets3t-0.7.1.jar @@ -141,6 +161,7 @@ netty-all-4.0.29.Final.jar objenesis-1.2.jar opencsv-2.3.jar oro-2.0.8.jar +osgi-resource-locator-1.0.1.jar paranamer-2.6.jar parquet-column-1.7.0.jar parquet-common-1.7.0.jar @@ -170,12 +191,12 @@ snappy-0.2.jar snappy-java-1.1.2.jar spire-macros_2.11-0.7.4.jar spire_2.11-0.7.4.jar -stax-api-1.0-2.jar stax-api-1.0.1.jar stream-2.7.0.jar super-csv-2.2.0.jar univocity-parsers-1.5.6.jar unused-1.0.0.jar +validation-api-1.1.0.Final.jar xbean-asm5-shaded-4.4.jar xmlenc-0.52.jar xz-1.0.jar diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index 615836b3d3b77..41bb836483c08 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -4,6 +4,7 @@ ST4-4.0.4.jar activation-1.1.1.jar antlr-runtime-3.5.2.jar aopalliance-1.0.jar +aopalliance-repackaged-2.4.0-b31.jar apache-log4j-extras-1.2.17.jar arpack_combined_all-0.1.jar asm-3.1.jar @@ -72,6 +73,9 @@ hadoop-yarn-client-2.3.0.jar hadoop-yarn-common-2.3.0.jar hadoop-yarn-server-common-2.3.0.jar hadoop-yarn-server-web-proxy-2.3.0.jar +hk2-api-2.4.0-b31.jar +hk2-locator-2.4.0-b31.jar +hk2-utils-2.4.0-b31.jar httpclient-4.3.2.jar httpcore-4.3.2.jar ivy-2.4.0.jar @@ -80,22 +84,38 @@ jackson-core-2.5.3.jar jackson-core-asl-1.9.13.jar jackson-databind-2.5.3.jar jackson-jaxrs-1.9.13.jar +jackson-jaxrs-base-2.5.4.jar +jackson-jaxrs-json-provider-2.5.4.jar jackson-mapper-asl-1.9.13.jar +jackson-module-jaxb-annotations-2.5.4.jar jackson-module-scala_2.11-2.5.3.jar jackson-xc-1.9.13.jar janino-2.7.8.jar java-xmlbuilder-1.0.jar +javassist-3.18.1-GA.jar +javax.annotation-api-1.2.jar javax.inject-1.jar +javax.inject-2.4.0-b31.jar javax.servlet-3.0.0.v201112011016.jar +javax.ws.rs-api-2.0.1.jar javolution-5.5.1.jar jaxb-api-2.2.2.jar jaxb-impl-2.2.3-1.jar jcl-over-slf4j-1.7.10.jar jdo-api-3.0.1.jar +jersey-client-2.22.1.jar +jersey-common-2.22.1.jar +jersey-container-servlet-2.22.1.jar +jersey-container-servlet-core-2.22.1.jar jersey-core-1.9.jar +jersey-entity-filtering-2.22.1.jar +jersey-guava-2.22.1.jar jersey-guice-1.9.jar jersey-json-1.9.jar +jersey-media-jaxb-2.22.1.jar +jersey-media-json-jackson-2.22.1.jar jersey-server-1.9.jar +jersey-server-2.22.1.jar jets3t-0.9.3.jar jettison-1.1.jar jetty-6.1.26.jar @@ -132,6 +152,7 @@ netty-all-4.0.29.Final.jar objenesis-1.2.jar opencsv-2.3.jar oro-2.0.8.jar +osgi-resource-locator-1.0.1.jar paranamer-2.6.jar parquet-column-1.7.0.jar parquet-common-1.7.0.jar @@ -167,6 +188,7 @@ stream-2.7.0.jar super-csv-2.2.0.jar univocity-parsers-1.5.6.jar unused-1.0.0.jar +validation-api-1.1.0.Final.jar xbean-asm5-shaded-4.4.jar xmlenc-0.52.jar xz-1.0.jar diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index f275226f1d088..0de746106ddc1 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -4,6 +4,7 @@ ST4-4.0.4.jar activation-1.1.1.jar antlr-runtime-3.5.2.jar aopalliance-1.0.jar +aopalliance-repackaged-2.4.0-b31.jar apache-log4j-extras-1.2.17.jar arpack_combined_all-0.1.jar asm-3.1.jar @@ -72,6 +73,9 @@ hadoop-yarn-client-2.4.0.jar hadoop-yarn-common-2.4.0.jar hadoop-yarn-server-common-2.4.0.jar hadoop-yarn-server-web-proxy-2.4.0.jar +hk2-api-2.4.0-b31.jar +hk2-locator-2.4.0-b31.jar +hk2-utils-2.4.0-b31.jar httpclient-4.3.2.jar httpcore-4.3.2.jar ivy-2.4.0.jar @@ -80,23 +84,38 @@ jackson-core-2.5.3.jar jackson-core-asl-1.9.13.jar jackson-databind-2.5.3.jar jackson-jaxrs-1.9.13.jar +jackson-jaxrs-base-2.5.4.jar +jackson-jaxrs-json-provider-2.5.4.jar jackson-mapper-asl-1.9.13.jar +jackson-module-jaxb-annotations-2.5.4.jar jackson-module-scala_2.11-2.5.3.jar jackson-xc-1.9.13.jar janino-2.7.8.jar java-xmlbuilder-1.0.jar +javassist-3.18.1-GA.jar +javax.annotation-api-1.2.jar javax.inject-1.jar +javax.inject-2.4.0-b31.jar javax.servlet-3.0.0.v201112011016.jar +javax.ws.rs-api-2.0.1.jar javolution-5.5.1.jar jaxb-api-2.2.2.jar jaxb-impl-2.2.3-1.jar jcl-over-slf4j-1.7.10.jar jdo-api-3.0.1.jar -jersey-client-1.9.jar +jersey-client-2.22.1.jar +jersey-common-2.22.1.jar +jersey-container-servlet-2.22.1.jar +jersey-container-servlet-core-2.22.1.jar jersey-core-1.9.jar +jersey-entity-filtering-2.22.1.jar +jersey-guava-2.22.1.jar jersey-guice-1.9.jar jersey-json-1.9.jar +jersey-media-jaxb-2.22.1.jar +jersey-media-json-jackson-2.22.1.jar jersey-server-1.9.jar +jersey-server-2.22.1.jar jets3t-0.9.3.jar jettison-1.1.jar jetty-6.1.26.jar @@ -133,6 +152,7 @@ netty-all-4.0.29.Final.jar objenesis-1.2.jar opencsv-2.3.jar oro-2.0.8.jar +osgi-resource-locator-1.0.1.jar paranamer-2.6.jar parquet-column-1.7.0.jar parquet-common-1.7.0.jar @@ -168,6 +188,7 @@ stream-2.7.0.jar super-csv-2.2.0.jar univocity-parsers-1.5.6.jar unused-1.0.0.jar +validation-api-1.1.0.Final.jar xbean-asm5-shaded-4.4.jar xmlenc-0.52.jar xz-1.0.jar diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index 21432a16e3659..dd49831db9b63 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -4,6 +4,7 @@ ST4-4.0.4.jar activation-1.1.1.jar antlr-runtime-3.5.2.jar aopalliance-1.0.jar +aopalliance-repackaged-2.4.0-b31.jar apache-log4j-extras-1.2.17.jar apacheds-i18n-2.0.0-M15.jar apacheds-kerberos-codec-2.0.0-M15.jar @@ -77,6 +78,9 @@ hadoop-yarn-client-2.6.0.jar hadoop-yarn-common-2.6.0.jar hadoop-yarn-server-common-2.6.0.jar hadoop-yarn-server-web-proxy-2.6.0.jar +hk2-api-2.4.0-b31.jar +hk2-locator-2.4.0-b31.jar +hk2-utils-2.4.0-b31.jar htrace-core-3.0.4.jar httpclient-4.3.2.jar httpcore-4.3.2.jar @@ -86,23 +90,39 @@ jackson-core-2.5.3.jar jackson-core-asl-1.9.13.jar jackson-databind-2.5.3.jar jackson-jaxrs-1.9.13.jar +jackson-jaxrs-base-2.5.4.jar +jackson-jaxrs-json-provider-2.5.4.jar jackson-mapper-asl-1.9.13.jar +jackson-module-jaxb-annotations-2.5.4.jar jackson-module-scala_2.11-2.5.3.jar jackson-xc-1.9.13.jar janino-2.7.8.jar java-xmlbuilder-1.0.jar +javassist-3.18.1-GA.jar +javax.annotation-api-1.2.jar javax.inject-1.jar +javax.inject-2.4.0-b31.jar javax.servlet-3.0.0.v201112011016.jar +javax.ws.rs-api-2.0.1.jar javolution-5.5.1.jar jaxb-api-2.2.2.jar jaxb-impl-2.2.3-1.jar jcl-over-slf4j-1.7.10.jar jdo-api-3.0.1.jar jersey-client-1.9.jar +jersey-client-2.22.1.jar +jersey-common-2.22.1.jar +jersey-container-servlet-2.22.1.jar +jersey-container-servlet-core-2.22.1.jar jersey-core-1.9.jar +jersey-entity-filtering-2.22.1.jar +jersey-guava-2.22.1.jar jersey-guice-1.9.jar jersey-json-1.9.jar +jersey-media-jaxb-2.22.1.jar +jersey-media-json-jackson-2.22.1.jar jersey-server-1.9.jar +jersey-server-2.22.1.jar jets3t-0.9.3.jar jettison-1.1.jar jetty-6.1.26.jar @@ -139,6 +159,7 @@ netty-all-4.0.29.Final.jar objenesis-1.2.jar opencsv-2.3.jar oro-2.0.8.jar +osgi-resource-locator-1.0.1.jar paranamer-2.6.jar parquet-column-1.7.0.jar parquet-common-1.7.0.jar @@ -174,6 +195,7 @@ stream-2.7.0.jar super-csv-2.2.0.jar univocity-parsers-1.5.6.jar unused-1.0.0.jar +validation-api-1.1.0.Final.jar xbean-asm5-shaded-4.4.jar xercesImpl-2.9.1.jar xmlenc-0.52.jar diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 20e09cd002635..07343c9827776 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -4,6 +4,7 @@ ST4-4.0.4.jar activation-1.1.1.jar antlr-runtime-3.5.2.jar aopalliance-1.0.jar +aopalliance-repackaged-2.4.0-b31.jar apache-log4j-extras-1.2.17.jar apacheds-i18n-2.0.0-M15.jar apacheds-kerberos-codec-2.0.0-M15.jar @@ -77,6 +78,9 @@ hadoop-yarn-client-2.7.0.jar hadoop-yarn-common-2.7.0.jar hadoop-yarn-server-common-2.7.0.jar hadoop-yarn-server-web-proxy-2.7.0.jar +hk2-api-2.4.0-b31.jar +hk2-locator-2.4.0-b31.jar +hk2-utils-2.4.0-b31.jar htrace-core-3.1.0-incubating.jar httpclient-4.3.2.jar httpcore-4.3.2.jar @@ -86,23 +90,39 @@ jackson-core-2.5.3.jar jackson-core-asl-1.9.13.jar jackson-databind-2.5.3.jar jackson-jaxrs-1.9.13.jar +jackson-jaxrs-base-2.5.4.jar +jackson-jaxrs-json-provider-2.5.4.jar jackson-mapper-asl-1.9.13.jar +jackson-module-jaxb-annotations-2.5.4.jar jackson-module-scala_2.11-2.5.3.jar jackson-xc-1.9.13.jar janino-2.7.8.jar java-xmlbuilder-1.0.jar +javassist-3.18.1-GA.jar +javax.annotation-api-1.2.jar javax.inject-1.jar +javax.inject-2.4.0-b31.jar javax.servlet-3.0.0.v201112011016.jar +javax.ws.rs-api-2.0.1.jar javolution-5.5.1.jar jaxb-api-2.2.2.jar jaxb-impl-2.2.3-1.jar jcl-over-slf4j-1.7.10.jar jdo-api-3.0.1.jar jersey-client-1.9.jar +jersey-client-2.22.1.jar +jersey-common-2.22.1.jar +jersey-container-servlet-2.22.1.jar +jersey-container-servlet-core-2.22.1.jar jersey-core-1.9.jar +jersey-entity-filtering-2.22.1.jar +jersey-guava-2.22.1.jar jersey-guice-1.9.jar jersey-json-1.9.jar +jersey-media-jaxb-2.22.1.jar +jersey-media-json-jackson-2.22.1.jar jersey-server-1.9.jar +jersey-server-2.22.1.jar jets3t-0.9.3.jar jettison-1.1.jar jetty-6.1.26.jar @@ -140,6 +160,7 @@ netty-all-4.0.29.Final.jar objenesis-1.2.jar opencsv-2.3.jar oro-2.0.8.jar +osgi-resource-locator-1.0.1.jar paranamer-2.6.jar parquet-column-1.7.0.jar parquet-common-1.7.0.jar @@ -175,6 +196,7 @@ stream-2.7.0.jar super-csv-2.2.0.jar univocity-parsers-1.5.6.jar unused-1.0.0.jar +validation-api-1.1.0.Final.jar xbean-asm5-shaded-4.4.jar xercesImpl-2.9.1.jar xmlenc-0.52.jar From 34f001acb2ebe5569441758fe898a2f1a9764e04 Mon Sep 17 00:00:00 2001 From: mcheah Date: Mon, 22 Feb 2016 14:52:11 -0800 Subject: [PATCH 6/6] Removing some more com.sun.jersey references. --- dev/deps/spark-deps-hadoop-2.2 | 18 ------------------ dev/deps/spark-deps-hadoop-2.3 | 7 ------- dev/deps/spark-deps-hadoop-2.4 | 7 ------- dev/deps/spark-deps-hadoop-2.6 | 6 ------ dev/deps/spark-deps-hadoop-2.7 | 6 ------ examples/pom.xml | 4 ++++ pom.xml | 4 ++++ yarn/pom.xml | 6 ++++++ 8 files changed, 14 insertions(+), 44 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index ab043afeb7d27..cfc75fcd12e42 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -54,12 +54,6 @@ eigenbase-properties-1.1.5.jar geronimo-annotation_1.0_spec-1.1.1.jar geronimo-jaspic_1.0_spec-1.0.jar geronimo-jta_1.1_spec-1.1.1.jar -gmbal-api-only-3.0.0-b023.jar -grizzly-framework-2.1.2.jar -grizzly-http-2.1.2.jar -grizzly-http-server-2.1.2.jar -grizzly-http-servlet-2.1.2.jar -grizzly-rcm-2.1.2.jar groovy-all-2.1.6.jar guice-3.0.jar guice-servlet-3.0.jar @@ -88,46 +82,35 @@ jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar jackson-core-asl-1.9.13.jar jackson-databind-2.5.3.jar -jackson-jaxrs-1.9.13.jar jackson-jaxrs-base-2.5.4.jar jackson-jaxrs-json-provider-2.5.4.jar jackson-mapper-asl-1.9.13.jar jackson-module-jaxb-annotations-2.5.4.jar jackson-module-scala_2.11-2.5.3.jar -jackson-xc-1.9.13.jar janino-2.7.8.jar javassist-3.18.1-GA.jar javax.annotation-api-1.2.jar javax.inject-1.jar javax.inject-2.4.0-b31.jar javax.servlet-3.0.0.v201112011016.jar -javax.servlet-3.1.jar javax.servlet-api-3.0.1.jar javax.ws.rs-api-2.0.1.jar javolution-5.5.1.jar -jaxb-api-2.2.2.jar -jaxb-impl-2.2.3-1.jar jcl-over-slf4j-1.7.10.jar jdo-api-3.0.1.jar -jersey-client-1.9.jar jersey-client-2.22.1.jar jersey-common-2.22.1.jar jersey-container-servlet-2.22.1.jar jersey-container-servlet-core-2.22.1.jar -jersey-core-1.9.jar jersey-entity-filtering-2.22.1.jar -jersey-grizzly2-1.9.jar jersey-guava-2.22.1.jar jersey-guice-1.9.jar -jersey-json-1.9.jar jersey-media-jaxb-2.22.1.jar jersey-media-json-jackson-2.22.1.jar -jersey-server-1.9.jar jersey-server-2.22.1.jar jersey-test-framework-core-1.9.jar jersey-test-framework-grizzly2-1.9.jar jets3t-0.7.1.jar -jettison-1.1.jar jetty-all-7.6.0.v20120127.jar jetty-util-6.1.26.jar jline-2.12.jar @@ -149,7 +132,6 @@ libthrift-0.9.2.jar log4j-1.2.17.jar lz4-1.3.0.jar mail-1.4.1.jar -management-api-3.0.0-b012.jar mesos-0.21.1-shaded-protobuf.jar metrics-core-3.1.2.jar metrics-graphite-3.1.2.jar diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index 41bb836483c08..650b3e849083e 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -83,13 +83,11 @@ jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar jackson-core-asl-1.9.13.jar jackson-databind-2.5.3.jar -jackson-jaxrs-1.9.13.jar jackson-jaxrs-base-2.5.4.jar jackson-jaxrs-json-provider-2.5.4.jar jackson-mapper-asl-1.9.13.jar jackson-module-jaxb-annotations-2.5.4.jar jackson-module-scala_2.11-2.5.3.jar -jackson-xc-1.9.13.jar janino-2.7.8.jar java-xmlbuilder-1.0.jar javassist-3.18.1-GA.jar @@ -100,24 +98,19 @@ javax.servlet-3.0.0.v201112011016.jar javax.ws.rs-api-2.0.1.jar javolution-5.5.1.jar jaxb-api-2.2.2.jar -jaxb-impl-2.2.3-1.jar jcl-over-slf4j-1.7.10.jar jdo-api-3.0.1.jar jersey-client-2.22.1.jar jersey-common-2.22.1.jar jersey-container-servlet-2.22.1.jar jersey-container-servlet-core-2.22.1.jar -jersey-core-1.9.jar jersey-entity-filtering-2.22.1.jar jersey-guava-2.22.1.jar jersey-guice-1.9.jar -jersey-json-1.9.jar jersey-media-jaxb-2.22.1.jar jersey-media-json-jackson-2.22.1.jar -jersey-server-1.9.jar jersey-server-2.22.1.jar jets3t-0.9.3.jar -jettison-1.1.jar jetty-6.1.26.jar jetty-all-7.6.0.v20120127.jar jetty-util-6.1.26.jar diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index 0de746106ddc1..9682f6c68df64 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -83,13 +83,11 @@ jackson-annotations-2.5.3.jar jackson-core-2.5.3.jar jackson-core-asl-1.9.13.jar jackson-databind-2.5.3.jar -jackson-jaxrs-1.9.13.jar jackson-jaxrs-base-2.5.4.jar jackson-jaxrs-json-provider-2.5.4.jar jackson-mapper-asl-1.9.13.jar jackson-module-jaxb-annotations-2.5.4.jar jackson-module-scala_2.11-2.5.3.jar -jackson-xc-1.9.13.jar janino-2.7.8.jar java-xmlbuilder-1.0.jar javassist-3.18.1-GA.jar @@ -100,24 +98,19 @@ javax.servlet-3.0.0.v201112011016.jar javax.ws.rs-api-2.0.1.jar javolution-5.5.1.jar jaxb-api-2.2.2.jar -jaxb-impl-2.2.3-1.jar jcl-over-slf4j-1.7.10.jar jdo-api-3.0.1.jar jersey-client-2.22.1.jar jersey-common-2.22.1.jar jersey-container-servlet-2.22.1.jar jersey-container-servlet-core-2.22.1.jar -jersey-core-1.9.jar jersey-entity-filtering-2.22.1.jar jersey-guava-2.22.1.jar jersey-guice-1.9.jar -jersey-json-1.9.jar jersey-media-jaxb-2.22.1.jar jersey-media-json-jackson-2.22.1.jar -jersey-server-1.9.jar jersey-server-2.22.1.jar jets3t-0.9.3.jar -jettison-1.1.jar jetty-6.1.26.jar jetty-all-7.6.0.v20120127.jar jetty-util-6.1.26.jar diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index dd49831db9b63..55166e112a20b 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -106,25 +106,19 @@ javax.servlet-3.0.0.v201112011016.jar javax.ws.rs-api-2.0.1.jar javolution-5.5.1.jar jaxb-api-2.2.2.jar -jaxb-impl-2.2.3-1.jar jcl-over-slf4j-1.7.10.jar jdo-api-3.0.1.jar -jersey-client-1.9.jar jersey-client-2.22.1.jar jersey-common-2.22.1.jar jersey-container-servlet-2.22.1.jar jersey-container-servlet-core-2.22.1.jar -jersey-core-1.9.jar jersey-entity-filtering-2.22.1.jar jersey-guava-2.22.1.jar jersey-guice-1.9.jar -jersey-json-1.9.jar jersey-media-jaxb-2.22.1.jar jersey-media-json-jackson-2.22.1.jar -jersey-server-1.9.jar jersey-server-2.22.1.jar jets3t-0.9.3.jar -jettison-1.1.jar jetty-6.1.26.jar jetty-all-7.6.0.v20120127.jar jetty-util-6.1.26.jar diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 07343c9827776..5ced30a3f19f6 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -106,25 +106,19 @@ javax.servlet-3.0.0.v201112011016.jar javax.ws.rs-api-2.0.1.jar javolution-5.5.1.jar jaxb-api-2.2.2.jar -jaxb-impl-2.2.3-1.jar jcl-over-slf4j-1.7.10.jar jdo-api-3.0.1.jar -jersey-client-1.9.jar jersey-client-2.22.1.jar jersey-common-2.22.1.jar jersey-container-servlet-2.22.1.jar jersey-container-servlet-core-2.22.1.jar -jersey-core-1.9.jar jersey-entity-filtering-2.22.1.jar jersey-guava-2.22.1.jar jersey-guice-1.9.jar -jersey-json-1.9.jar jersey-media-jaxb-2.22.1.jar jersey-media-json-jackson-2.22.1.jar -jersey-server-1.9.jar jersey-server-2.22.1.jar jets3t-0.9.3.jar -jettison-1.1.jar jetty-6.1.26.jar jetty-all-7.6.0.v20120127.jar jetty-util-6.1.26.jar diff --git a/examples/pom.xml b/examples/pom.xml index 1b75068bffd13..22f2719524709 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -116,6 +116,10 @@ org.jruby jruby-complete + + com.sun.jersey + * + diff --git a/pom.xml b/pom.xml index 156e8238eb7d6..268ba2cf95b7d 100644 --- a/pom.xml +++ b/pom.xml @@ -955,6 +955,10 @@ commons-logging commons-logging + + com.sun.jersey + * + diff --git a/yarn/pom.xml b/yarn/pom.xml index 2f3bce9db8fd0..fe60a0b6139f2 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -62,6 +62,12 @@ org.apache.hadoop hadoop-yarn-common + + + com.sun.jersey + * + + org.apache.hadoop