diff --git a/LICENSE-binary b/LICENSE-binary index d363661b1cc7..888574c04955 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -299,6 +299,7 @@ org.apache.kerby:kerby-xdr org.apache.kerby:token-provider org.apache.orc:orc-core org.apache.orc:orc-mapreduce +org.checkerframework:checker-qual org.mortbay.jetty:jetty org.mortbay.jetty:jetty-util com.jolbox:bonecp @@ -321,10 +322,14 @@ com.github.mifmif:generex com.github.stephenc.jcip:jcip-annotations com.google.code.findbugs:jsr305 com.google.code.gson:gson +com.google.errorprone:error_prone_annotations com.google.flatbuffers:flatbuffers-java +com.google.guava:failureaccess com.google.guava:guava +com.google.guava:listenablefuture com.google.inject:guice com.google.inject.extensions:guice-servlet +com.google.j2objc:j2objc-annotations com.nimbusds:nimbus-jose-jwt com.twitter:parquet-hadoop-bundle commons-cli:commons-cli diff --git a/assembly/pom.xml b/assembly/pom.xml index d17abe857ade..738264636e71 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -78,7 +78,7 @@ com.google.guava diff --git a/core/pom.xml b/core/pom.xml index 14b217d7fb22..769a986f8f05 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -510,7 +510,7 @@ true true - guava,jetty-io,jetty-servlet,jetty-servlets,jetty-continuation,jetty-http,jetty-plus,jetty-util,jetty-server,jetty-security,jetty-proxy,jetty-client + failureaccess,guava,jetty-io,jetty-servlet,jetty-servlets,jetty-continuation,jetty-http,jetty-plus,jetty-util,jetty-server,jetty-security,jetty-proxy,jetty-client true diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 index f049ad1f5bb7..9ea705a34b1d 100644 --- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 @@ -28,6 +28,7 @@ bonecp/0.8.0.RELEASE//bonecp-0.8.0.RELEASE.jar breeze-macros_2.12/1.0//breeze-macros_2.12-1.0.jar breeze_2.12/1.0//breeze_2.12-1.0.jar cats-kernel_2.12/2.0.0-M4//cats-kernel_2.12-2.0.0-M4.jar +checker-qual/2.11.1//checker-qual-2.11.1.jar chill-java/0.9.5//chill-java-0.9.5.jar chill_2.12/0.9.5//chill_2.12-0.9.5.jar commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar @@ -59,10 +60,12 @@ datanucleus-core/4.1.17//datanucleus-core-4.1.17.jar datanucleus-rdbms/4.1.19//datanucleus-rdbms-4.1.19.jar derby/10.12.1.1//derby-10.12.1.1.jar dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar +error_prone_annotations/2.3.4//error_prone_annotations-2.3.4.jar +failureaccess/1.0.1//failureaccess-1.0.1.jar flatbuffers-java/1.9.0//flatbuffers-java-1.9.0.jar generex/1.0.2//generex-1.0.2.jar gson/2.2.4//gson-2.2.4.jar -guava/14.0.1//guava-14.0.1.jar +guava/29.0-jre//guava-29.0-jre.jar guice-servlet/3.0//guice-servlet-3.0.jar guice/3.0//guice-3.0.jar hadoop-annotations/2.7.4//hadoop-annotations-2.7.4.jar @@ -102,6 +105,7 @@ httpclient/4.5.6//httpclient-4.5.6.jar httpcore/4.4.12//httpcore-4.4.12.jar istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar ivy/2.4.0//ivy-2.4.0.jar +j2objc-annotations/1.3//j2objc-annotations-1.3.jar jackson-annotations/2.10.0//jackson-annotations-2.10.0.jar jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar jackson-core/2.10.0//jackson-core-2.10.0.jar @@ -177,6 +181,7 @@ kubernetes-model-storageclass/4.10.3//kubernetes-model-storageclass-4.10.3.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar libthrift/0.12.0//libthrift-0.12.0.jar +listenablefuture/9999.0-empty-to-avoid-conflict-with-guava//listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar log4j/1.2.17//log4j-1.2.17.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.7.1//lz4-java-1.7.1.jar diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 index a4dbeb112473..1d6f0a713713 100644 --- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 @@ -25,6 +25,7 @@ bonecp/0.8.0.RELEASE//bonecp-0.8.0.RELEASE.jar breeze-macros_2.12/1.0//breeze-macros_2.12-1.0.jar breeze_2.12/1.0//breeze_2.12-1.0.jar cats-kernel_2.12/2.0.0-M4//cats-kernel_2.12-2.0.0-M4.jar +checker-qual/2.11.1//checker-qual-2.11.1.jar chill-java/0.9.5//chill-java-0.9.5.jar chill_2.12/0.9.5//chill_2.12-0.9.5.jar commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar @@ -58,11 +59,13 @@ derby/10.12.1.1//derby-10.12.1.1.jar dnsjava/2.1.7//dnsjava-2.1.7.jar dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar ehcache/3.3.1//ehcache-3.3.1.jar +error_prone_annotations/2.3.4//error_prone_annotations-2.3.4.jar +failureaccess/1.0.1//failureaccess-1.0.1.jar flatbuffers-java/1.9.0//flatbuffers-java-1.9.0.jar generex/1.0.2//generex-1.0.2.jar geronimo-jcache_1.0_spec/1.0-alpha-1//geronimo-jcache_1.0_spec-1.0-alpha-1.jar gson/2.2.4//gson-2.2.4.jar -guava/14.0.1//guava-14.0.1.jar +guava/29.0-jre//guava-29.0-jre.jar guice-servlet/4.0//guice-servlet-4.0.jar guice/4.0//guice-4.0.jar hadoop-annotations/3.2.0//hadoop-annotations-3.2.0.jar @@ -101,6 +104,7 @@ httpclient/4.5.6//httpclient-4.5.6.jar httpcore/4.4.12//httpcore-4.4.12.jar istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar ivy/2.4.0//ivy-2.4.0.jar +j2objc-annotations/1.3//j2objc-annotations-1.3.jar jackson-annotations/2.10.0//jackson-annotations-2.10.0.jar jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar jackson-core/2.10.0//jackson-core-2.10.0.jar @@ -189,6 +193,7 @@ kubernetes-model-storageclass/4.10.3//kubernetes-model-storageclass-4.10.3.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar libthrift/0.12.0//libthrift-0.12.0.jar +listenablefuture/9999.0-empty-to-avoid-conflict-with-guava//listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar log4j/1.2.17//log4j-1.2.17.jar logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar lz4-java/1.7.1//lz4-java-1.7.1.jar diff --git a/pom.xml b/pom.xml index 75b6776cbe47..7ee7facf9875 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ 2.6.2 4.1.17 - 14.0.1 + 29.0-jre 3.0.16 2.30 2.10.5 @@ -2877,6 +2877,7 @@ org.eclipse.jetty:jetty-security org.eclipse.jetty:jetty-util org.eclipse.jetty:jetty-server + com.google.guava:failureaccess com.google.guava:guava org.jpmml:*