First pass at Jersey 2.29 update

apache · Aug 16, 2019 · 431f3d5 · 431f3d5
1 parent 43101c7
commit 431f3d5
Show file tree

Hide file tree

Showing 7 changed files with 615 additions and 37 deletions.
diff --git a/LICENSE-binary b/LICENSE-binary
@@ -464,10 +464,8 @@ javax.xml.stream:stax-api    https://jcp.org/en/jsr/detail?id=173
 Common Development and Distribution License (CDDL) 1.1
 ------------------------------------------------------
 
-javax.annotation:javax.annotation-api    https://jcp.org/en/jsr/detail?id=250
 javax.servlet:javax.servlet-api   https://javaee.github.io/servlet-spec/
 javax.transaction:jta http://www.oracle.com/technetwork/java/index.html
-javax.ws.rs:javax.ws.rs-api https://github.com/jax-rs
 javax.xml.bind:jaxb-api    https://github.com/javaee/jaxb-v2
 org.glassfish.hk2:hk2-api https://github.com/javaee/glassfish
 org.glassfish.hk2:hk2-locator (same)
@@ -492,6 +490,12 @@ jakarta.xml.bind:jakarta.xml.bind-api
 com.sun.istack:istack-commons-runtime
 
 
+Eclipse Public License (EPL) 2.0
+--------------------------------
+
+jakarta.annotation:jakarta-annotation-api https://projects.eclipse.org/projects/ee4j.ca
+jakarta.ws.rs:jakarta.ws.rs-api https://github.com/eclipse-ee4j/jaxrs-api
+
 Mozilla Public License (MPL) 1.1
 --------------------------------
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -260,6 +260,15 @@
       <groupId>org.glassfish.jersey.containers</groupId>
       <artifactId>jersey-container-servlet-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+      <artifactId>jersey-test-framework-provider-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>

diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
@@ -7,7 +7,7 @@ antlr-2.7.7.jar
 antlr-runtime-3.4.jar
 antlr4-runtime-4.7.1.jar
 aopalliance-1.0.jar
-aopalliance-repackaged-2.4.0-b34.jar
+aopalliance-repackaged-2.5.0.jar
 apache-log4j-extras-1.2.17.jar
 apacheds-i18n-2.0.0-M15.jar
 apacheds-kerberos-codec-2.0.0-M15.jar
@@ -75,9 +75,9 @@ hadoop-yarn-client-2.7.4.jar
 hadoop-yarn-common-2.7.4.jar
 hadoop-yarn-server-common-2.7.4.jar
 hadoop-yarn-server-web-proxy-2.7.4.jar
-hk2-api-2.4.0-b34.jar
-hk2-locator-2.4.0-b34.jar
-hk2-utils-2.4.0-b34.jar
+hk2-api-2.5.0.jar
+hk2-locator-2.5.0.jar
+hk2-utils-2.5.0.jar
 hppc-0.7.2.jar
 htrace-core-3.1.0-incubating.jar
 httpclient-4.5.6.jar
@@ -95,26 +95,26 @@ jackson-module-jaxb-annotations-2.9.9.jar
 jackson-module-paranamer-2.9.9.jar
 jackson-module-scala_2.12-2.9.9.jar
 jackson-xc-1.9.13.jar
+jakarta.annotation-api-1.3.4.jar
+jakarta.inject-2.5.0.jar
+jakarta.ws.rs-api-2.1.5.jar
 jakarta.xml.bind-api-2.3.2.jar
 janino-3.0.15.jar
-javassist-3.18.1-GA.jar
-javax.annotation-api-1.2.jar
+javassist-3.22.0-CR2.jar
 javax.inject-1.jar
-javax.inject-2.4.0-b34.jar
 javax.servlet-api-3.1.0.jar
-javax.ws.rs-api-2.0.1.jar
 javolution-5.5.1.jar
 jaxb-api-2.2.2.jar
 jaxb-runtime-2.3.2.jar
 jcl-over-slf4j-1.7.16.jar
 jdo-api-3.0.1.jar
-jersey-client-2.22.2.jar
-jersey-common-2.22.2.jar
-jersey-container-servlet-2.22.2.jar
-jersey-container-servlet-core-2.22.2.jar
-jersey-guava-2.22.2.jar
-jersey-media-jaxb-2.22.2.jar
-jersey-server-2.22.2.jar
+jersey-client-2.29.jar
+jersey-common-2.29.jar
+jersey-container-servlet-2.29.jar
+jersey-container-servlet-core-2.29.jar
+jersey-hk2-2.29.jar
+jersey-media-jaxb-2.29.jar
+jersey-server-2.29.jar
 jetty-6.1.26.jar
 jetty-sslengine-6.1.26.jar
 jetty-util-6.1.26.jar
@@ -160,7 +160,7 @@ orc-core-1.5.5-nohive.jar
 orc-mapreduce-1.5.5-nohive.jar
 orc-shims-1.5.5.jar
 oro-2.0.8.jar
-osgi-resource-locator-1.0.1.jar
+osgi-resource-locator-1.0.3.jar
 paranamer-2.8.jar
 parquet-column-1.10.1.jar
 parquet-common-1.10.1.jar
@@ -192,7 +192,7 @@ stream-2.9.6.jar
 stringtemplate-3.2.1.jar
 super-csv-2.2.0.jar
 univocity-parsers-2.7.3.jar
-validation-api-1.1.0.Final.jar
+validation-api-2.0.1.Final.jar
 xbean-asm7-shaded-4.14.jar
 xercesImpl-2.9.1.jar
 xmlenc-0.52.jar

diff --git a/dev/deps/spark-deps-hadoop-3.2 b/dev/deps/spark-deps-hadoop-3.2
@@ -8,7 +8,7 @@ antlr-2.7.7.jar
 antlr-runtime-3.4.jar
 antlr4-runtime-4.7.1.jar
 aopalliance-1.0.jar
-aopalliance-repackaged-2.4.0-b34.jar
+aopalliance-repackaged-2.5.0.jar
 apache-log4j-extras-1.2.17.jar
 arpack_combined_all-0.1.jar
 arrow-format-0.12.0.jar
@@ -76,9 +76,9 @@ hadoop-yarn-registry-3.2.0.jar
 hadoop-yarn-server-common-3.2.0.jar
 hadoop-yarn-server-web-proxy-3.2.0.jar
 hive-storage-api-2.6.0.jar
-hk2-api-2.4.0-b34.jar
-hk2-locator-2.4.0-b34.jar
-hk2-utils-2.4.0-b34.jar
+hk2-api-2.5.0.jar
+hk2-locator-2.5.0.jar
+hk2-utils-2.5.0.jar
 hppc-0.7.2.jar
 htrace-core4-4.1.0-incubating.jar
 httpclient-4.5.6.jar
@@ -96,27 +96,27 @@ jackson-mapper-asl-1.9.13.jar
 jackson-module-jaxb-annotations-2.9.9.jar
 jackson-module-paranamer-2.9.9.jar
 jackson-module-scala_2.12-2.9.9.jar
+jakarta.annotation-api-1.3.4.jar
+jakarta.inject-2.5.0.jar
+jakarta.ws.rs-api-2.1.5.jar
 jakarta.xml.bind-api-2.3.2.jar
 janino-3.0.15.jar
-javassist-3.18.1-GA.jar
-javax.annotation-api-1.2.jar
+javassist-3.22.0-CR2.jar
 javax.inject-1.jar
-javax.inject-2.4.0-b34.jar
 javax.servlet-api-3.1.0.jar
-javax.ws.rs-api-2.0.1.jar
 javolution-5.5.1.jar
 jaxb-api-2.2.11.jar
 jaxb-runtime-2.3.2.jar
 jcip-annotations-1.0-1.jar
 jcl-over-slf4j-1.7.16.jar
 jdo-api-3.0.1.jar
-jersey-client-2.22.2.jar
-jersey-common-2.22.2.jar
-jersey-container-servlet-2.22.2.jar
-jersey-container-servlet-core-2.22.2.jar
-jersey-guava-2.22.2.jar
-jersey-media-jaxb-2.22.2.jar
-jersey-server-2.22.2.jar
+jersey-client-2.29.jar
+jersey-common-2.29.jar
+jersey-container-servlet-2.29.jar
+jersey-container-servlet-core-2.29.jar
+jersey-hk2-2.29.jar
+jersey-media-jaxb-2.29.jar
+jersey-server-2.29.jar
 jetty-webapp-9.4.18.v20190429.jar
 jetty-xml-9.4.18.v20190429.jar
 jline-2.14.6.jar
@@ -179,7 +179,7 @@ orc-core-1.5.5-nohive.jar
 orc-mapreduce-1.5.5-nohive.jar
 orc-shims-1.5.5.jar
 oro-2.0.8.jar
-osgi-resource-locator-1.0.1.jar
+osgi-resource-locator-1.0.3.jar
 paranamer-2.8.jar
 parquet-column-1.10.1.jar
 parquet-common-1.10.1.jar
@@ -212,7 +212,7 @@ stringtemplate-3.2.1.jar
 super-csv-2.2.0.jar
 token-provider-1.0.1.jar
 univocity-parsers-2.7.3.jar
-validation-api-1.1.0.Final.jar
+validation-api-2.0.1.Final.jar
 woodstox-core-5.0.3.jar
 xbean-asm7-shaded-4.14.jar
 xz-1.5.jar