From db8db6f326e5f248ca6d924cff086c72e6ff2620 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Sat, 31 Aug 2019 08:10:08 -0600 Subject: [PATCH 1/3] Upgrade kubernetes client to 4.4.2 --- resource-managers/kubernetes/core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index b350b050118fd..952dbd31989dd 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -29,7 +29,7 @@ Spark Project Kubernetes kubernetes - 4.1.2 + 4.4.2 From 6326638a229a95fcd66ab7ec41fde3939783b313 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Sat, 31 Aug 2019 10:13:40 -0600 Subject: [PATCH 2/3] update dependencies --- dev/deps/spark-deps-hadoop-2.7 | 9 +++++---- dev/deps/spark-deps-hadoop-3.2 | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 381340c0383e0..775fb3c0a22e8 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -55,7 +55,7 @@ datanucleus-core-3.2.10.jar datanucleus-rdbms-3.2.9.jar derby-10.12.1.1.jar flatbuffers-java-1.9.0.jar -generex-1.0.1.jar +generex-1.0.2.jar gson-2.2.4.jar guava-14.0.1.jar guice-3.0.jar @@ -101,6 +101,7 @@ jakarta.ws.rs-api-2.1.5.jar jakarta.xml.bind-api-2.3.2.jar janino-3.0.15.jar javassist-3.22.0-CR2.jar +javax.el-3.0.1-b11.jar javax.inject-1.jar javax.servlet-api-3.1.0.jar javolution-5.5.1.jar @@ -132,9 +133,9 @@ jta-1.1.jar jtransforms-2.4.0.jar jul-to-slf4j-1.7.16.jar kryo-shaded-4.0.2.jar -kubernetes-client-4.1.2.jar -kubernetes-model-4.1.2.jar -kubernetes-model-common-4.1.2.jar +kubernetes-client-4.4.2.jar +kubernetes-model-4.4.2.jar +kubernetes-model-common-4.4.2.jar leveldbjni-all-1.8.jar libfb303-0.9.3.jar libthrift-0.12.0.jar diff --git a/dev/deps/spark-deps-hadoop-3.2 b/dev/deps/spark-deps-hadoop-3.2 index 664cdbc442fa0..de046634eefbb 100644 --- a/dev/deps/spark-deps-hadoop-3.2 +++ b/dev/deps/spark-deps-hadoop-3.2 @@ -55,7 +55,7 @@ derby-10.12.1.1.jar dnsjava-2.1.7.jar ehcache-3.3.1.jar flatbuffers-java-1.9.0.jar -generex-1.0.1.jar +generex-1.0.2.jar geronimo-jcache_1.0_spec-1.0-alpha-1.jar gson-2.2.4.jar guava-14.0.1.jar @@ -102,6 +102,7 @@ jakarta.ws.rs-api-2.1.5.jar jakarta.xml.bind-api-2.3.2.jar janino-3.0.15.jar javassist-3.22.0-CR2.jar +javax.el-3.0.1-b11.jar javax.inject-1.jar javax.servlet-api-3.1.0.jar javolution-5.5.1.jar @@ -148,9 +149,9 @@ kerby-pkix-1.0.1.jar kerby-util-1.0.1.jar kerby-xdr-1.0.1.jar kryo-shaded-4.0.2.jar -kubernetes-client-4.1.2.jar -kubernetes-model-4.1.2.jar -kubernetes-model-common-4.1.2.jar +kubernetes-client-4.4.2.jar +kubernetes-model-4.4.2.jar +kubernetes-model-common-4.4.2.jar leveldbjni-all-1.8.jar libfb303-0.9.3.jar libthrift-0.12.0.jar From 9a29d0b28be115e6e4a025648b57a4e69758bfb8 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Sat, 31 Aug 2019 13:48:21 -0600 Subject: [PATCH 3/3] add javax.el to LICENSE-binary --- LICENSE-binary | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE-binary b/LICENSE-binary index 37d4a2021bece..ba20eea118687 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -463,6 +463,7 @@ javax.xml.stream:stax-api https://jcp.org/en/jsr/detail?id=173 Common Development and Distribution License (CDDL) 1.1 ------------------------------------------------------ +javax.el:javax.el-api https://javaee.github.io/uel-ri/ javax.servlet:javax.servlet-api https://javaee.github.io/servlet-spec/ javax.transaction:jta http://www.oracle.com/technetwork/java/index.html javax.xml.bind:jaxb-api https://github.com/javaee/jaxb-v2