From 1affcadaa35c99ad2b8c34d2ed47fece535f5a2f Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Thu, 13 Oct 2016 15:09:19 +0100 Subject: [PATCH 1/3] bump parquet version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e42a7aa88f63..b371b913389b7 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ 1.2.1 10.12.1.1 - 1.9.0-palantir1 + 1.9.0-palantir2 1.6.0 9.2.16.v20160414 3.1.0 From 872d73c6b130bee5621d02ddb38fd4e705083da9 Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Thu, 13 Oct 2016 15:44:50 +0100 Subject: [PATCH 2/3] update deps --- build/mvn | 18 ++-- dev/deps/spark-deps-hadoop-2.2 | 167 ------------------------------ dev/deps/spark-deps-hadoop-2.3 | 175 ------------------------------- dev/deps/spark-deps-hadoop-2.4 | 175 ------------------------------- dev/deps/spark-deps-hadoop-2.6 | 184 --------------------------------- dev/deps/spark-deps-hadoop-2.7 | 13 +-- 6 files changed, 18 insertions(+), 714 deletions(-) delete mode 100644 dev/deps/spark-deps-hadoop-2.2 delete mode 100644 dev/deps/spark-deps-hadoop-2.3 delete mode 100644 dev/deps/spark-deps-hadoop-2.4 delete mode 100644 dev/deps/spark-deps-hadoop-2.6 diff --git a/build/mvn b/build/mvn index 39dd3271c522a..c3ab62da36868 100755 --- a/build/mvn +++ b/build/mvn @@ -36,8 +36,15 @@ install_app() { local binary="${_DIR}/$3" # setup `curl` and `wget` silent options if we're running on Jenkins - local curl_opts="-s -L" - local wget_opts="--quiet" + local curl_opts="-L" + local wget_opts="" + if [ -n "$AMPLAB_JENKINS" ]; then + curl_opts="-s ${curl_opts}" + wget_opts="--quiet ${wget_opts}" + else + curl_opts="--progress-bar ${curl_opts}" + wget_opts="--progress=bar:force ${wget_opts}" + fi if [ -z "$3" -o ! -f "$binary" ]; then # check if we already have the tarball @@ -78,10 +85,7 @@ install_mvn() { "apache-maven-${MVN_VERSION}-bin.tar.gz" \ "apache-maven-${MVN_VERSION}/bin/mvn" - export M2_HOME="${_DIR}/apache-maven-${MVN_VERSION}" - export M2="$M2_HOME/bin" - export PATH=$M2:$PATH - MVN_BIN="$M2/mvn" + MVN_BIN="${_DIR}/apache-maven-${MVN_VERSION}/bin/mvn" fi } @@ -154,4 +158,4 @@ export MAVEN_OPTS=${MAVEN_OPTS:-"$_COMPILE_JVM_OPTS"} echo "Using \`mvn\` from path: $MVN_BIN" 1>&2 # Last, call the `mvn` command as usual -${MVN_BIN} -DzincPort=${ZINC_PORT} -e "$@" +${MVN_BIN} -DzincPort=${ZINC_PORT} "$@" diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 deleted file mode 100644 index b30f8c347c0af..0000000000000 --- a/dev/deps/spark-deps-hadoop-2.2 +++ /dev/null @@ -1,167 +0,0 @@ -JavaEWAH-0.3.2.jar -RoaringBitmap-0.5.11.jar -ST4-4.0.4.jar -antlr-2.7.7.jar -antlr-runtime-3.4.jar -antlr4-runtime-4.5.3.jar -aopalliance-1.0.jar -aopalliance-repackaged-2.4.0-b34.jar -apache-log4j-extras-1.2.17.jar -arpack_combined_all-0.1.jar -avro-1.7.7.jar -avro-ipc-1.7.7.jar -avro-mapred-1.7.7-hadoop2.jar -bonecp-0.8.0.RELEASE.jar -breeze-macros_2.11-0.12.jar -breeze_2.11-0.12.jar -calcite-avatica-1.2.0-incubating.jar -calcite-core-1.2.0-incubating.jar -calcite-linq4j-1.2.0-incubating.jar -chill-java-0.8.0.jar -chill_2.11-0.8.0.jar -commons-beanutils-1.7.0.jar -commons-beanutils-core-1.8.0.jar -commons-cli-1.2.jar -commons-codec-1.10.jar -commons-collections-3.2.2.jar -commons-compiler-2.7.6.jar -commons-compress-1.4.1.jar -commons-configuration-1.6.jar -commons-crypto-1.0.0.jar -commons-dbcp-1.4.jar -commons-digester-1.8.jar -commons-httpclient-3.1.jar -commons-io-2.4.jar -commons-lang-2.6.jar -commons-lang3-3.3.2.jar -commons-logging-1.1.3.jar -commons-math-2.1.jar -commons-math3-3.4.1.jar -commons-net-2.2.jar -commons-pool-1.5.4.jar -compress-lzf-1.0.3.jar -core-1.1.2.jar -curator-client-2.4.0.jar -curator-framework-2.4.0.jar -curator-recipes-2.4.0.jar -datanucleus-api-jdo-3.2.6.jar -datanucleus-core-3.2.10.jar -datanucleus-rdbms-3.2.9.jar -derby-10.12.1.1.jar -eigenbase-properties-1.1.5.jar -guava-14.0.1.jar -guice-3.0.jar -guice-servlet-3.0.jar -hadoop-annotations-2.2.0.jar -hadoop-auth-2.2.0.jar -hadoop-client-2.2.0.jar -hadoop-common-2.2.0.jar -hadoop-hdfs-2.2.0.jar -hadoop-mapreduce-client-app-2.2.0.jar -hadoop-mapreduce-client-common-2.2.0.jar -hadoop-mapreduce-client-core-2.2.0.jar -hadoop-mapreduce-client-jobclient-2.2.0.jar -hadoop-mapreduce-client-shuffle-2.2.0.jar -hadoop-yarn-api-2.2.0.jar -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-b34.jar -hk2-locator-2.4.0-b34.jar -hk2-utils-2.4.0-b34.jar -httpclient-4.5.2.jar -httpcore-4.4.4.jar -ivy-2.4.0.jar -jackson-annotations-2.6.5.jar -jackson-core-2.6.5.jar -jackson-core-asl-1.9.13.jar -jackson-databind-2.6.5.jar -jackson-mapper-asl-1.9.13.jar -jackson-module-paranamer-2.6.5.jar -jackson-module-scala_2.11-2.6.5.jar -janino-3.0.0.jar -javassist-3.18.1-GA.jar -javax.annotation-api-1.2.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 -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 -jets3t-0.7.1.jar -jetty-util-6.1.26.jar -jline-2.12.1.jar -joda-time-2.9.3.jar -jodd-core-3.5.2.jar -jpam-1.1.jar -json-20090211.jar -json4s-ast_2.11-3.2.11.jar -json4s-core_2.11-3.2.11.jar -json4s-jackson_2.11-3.2.11.jar -jsr305-1.3.9.jar -jta-1.1.jar -jtransforms-2.4.0.jar -jul-to-slf4j-1.7.16.jar -kryo-shaded-3.0.3.jar -leveldbjni-all-1.8.jar -libfb303-0.9.2.jar -libthrift-0.9.2.jar -log4j-1.2.17.jar -lz4-1.3.0.jar -mesos-1.0.0-shaded-protobuf.jar -metrics-core-3.1.2.jar -metrics-graphite-3.1.2.jar -metrics-json-3.1.2.jar -metrics-jvm-3.1.2.jar -minlog-1.3.0.jar -netty-3.8.0.Final.jar -netty-all-4.0.41.Final.jar -objenesis-2.1.jar -opencsv-2.3.jar -oro-2.0.8.jar -osgi-resource-locator-1.0.1.jar -paranamer-2.3.jar -parquet-column-1.8.1.jar -parquet-common-1.8.1.jar -parquet-encoding-1.8.1.jar -parquet-format-2.3.0-incubating.jar -parquet-hadoop-1.8.1.jar -parquet-hadoop-bundle-1.6.0.jar -parquet-jackson-1.8.1.jar -pmml-model-1.2.15.jar -pmml-schema-1.2.15.jar -protobuf-java-2.5.0.jar -py4j-0.10.3.jar -pyrolite-4.13.jar -scala-compiler-2.11.8.jar -scala-library-2.11.8.jar -scala-parser-combinators_2.11-1.0.4.jar -scala-reflect-2.11.8.jar -scala-xml_2.11-1.0.2.jar -scalap-2.11.8.jar -shapeless_2.11-2.0.0.jar -slf4j-api-1.7.16.jar -slf4j-log4j12-1.7.16.jar -snappy-0.2.jar -snappy-java-1.1.2.6.jar -spire-macros_2.11-0.7.4.jar -spire_2.11-0.7.4.jar -stax-api-1.0.1.jar -stream-2.7.0.jar -stringtemplate-3.2.1.jar -super-csv-2.2.0.jar -univocity-parsers-2.2.1.jar -validation-api-1.1.0.Final.jar -xbean-asm5-shaded-4.4.jar -xmlenc-0.52.jar -xz-1.0.jar -zookeeper-3.4.5.jar diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 deleted file mode 100644 index 5b3a7651dd299..0000000000000 --- a/dev/deps/spark-deps-hadoop-2.3 +++ /dev/null @@ -1,175 +0,0 @@ -JavaEWAH-0.3.2.jar -RoaringBitmap-0.5.11.jar -ST4-4.0.4.jar -activation-1.1.1.jar -antlr-2.7.7.jar -antlr-runtime-3.4.jar -antlr4-runtime-4.5.3.jar -aopalliance-1.0.jar -aopalliance-repackaged-2.4.0-b34.jar -apache-log4j-extras-1.2.17.jar -arpack_combined_all-0.1.jar -avro-1.7.7.jar -avro-ipc-1.7.7.jar -avro-mapred-1.7.7-hadoop2.jar -base64-2.3.8.jar -bcprov-jdk15on-1.51.jar -bonecp-0.8.0.RELEASE.jar -breeze-macros_2.11-0.12.jar -breeze_2.11-0.12.jar -calcite-avatica-1.2.0-incubating.jar -calcite-core-1.2.0-incubating.jar -calcite-linq4j-1.2.0-incubating.jar -chill-java-0.8.0.jar -chill_2.11-0.8.0.jar -commons-beanutils-1.7.0.jar -commons-beanutils-core-1.8.0.jar -commons-cli-1.2.jar -commons-codec-1.10.jar -commons-collections-3.2.2.jar -commons-compiler-2.7.6.jar -commons-compress-1.4.1.jar -commons-configuration-1.6.jar -commons-crypto-1.0.0.jar -commons-dbcp-1.4.jar -commons-digester-1.8.jar -commons-httpclient-3.1.jar -commons-io-2.4.jar -commons-lang-2.6.jar -commons-lang3-3.3.2.jar -commons-logging-1.1.3.jar -commons-math3-3.4.1.jar -commons-net-2.2.jar -commons-pool-1.5.4.jar -compress-lzf-1.0.3.jar -core-1.1.2.jar -curator-client-2.4.0.jar -curator-framework-2.4.0.jar -curator-recipes-2.4.0.jar -datanucleus-api-jdo-3.2.6.jar -datanucleus-core-3.2.10.jar -datanucleus-rdbms-3.2.9.jar -derby-10.12.1.1.jar -eigenbase-properties-1.1.5.jar -guava-14.0.1.jar -guice-3.0.jar -guice-servlet-3.0.jar -hadoop-annotations-2.3.0.jar -hadoop-auth-2.3.0.jar -hadoop-client-2.3.0.jar -hadoop-common-2.3.0.jar -hadoop-hdfs-2.3.0.jar -hadoop-mapreduce-client-app-2.3.0.jar -hadoop-mapreduce-client-common-2.3.0.jar -hadoop-mapreduce-client-core-2.3.0.jar -hadoop-mapreduce-client-jobclient-2.3.0.jar -hadoop-mapreduce-client-shuffle-2.3.0.jar -hadoop-yarn-api-2.3.0.jar -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-b34.jar -hk2-locator-2.4.0-b34.jar -hk2-utils-2.4.0-b34.jar -httpclient-4.5.2.jar -httpcore-4.4.4.jar -ivy-2.4.0.jar -jackson-annotations-2.6.5.jar -jackson-core-2.6.5.jar -jackson-core-asl-1.9.13.jar -jackson-databind-2.6.5.jar -jackson-mapper-asl-1.9.13.jar -jackson-module-paranamer-2.6.5.jar -jackson-module-scala_2.11-2.6.5.jar -janino-3.0.0.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-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 -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 -jets3t-0.9.3.jar -jetty-6.1.26.jar -jetty-util-6.1.26.jar -jline-2.12.1.jar -joda-time-2.9.3.jar -jodd-core-3.5.2.jar -jpam-1.1.jar -json-20090211.jar -json4s-ast_2.11-3.2.11.jar -json4s-core_2.11-3.2.11.jar -json4s-jackson_2.11-3.2.11.jar -jsr305-1.3.9.jar -jta-1.1.jar -jtransforms-2.4.0.jar -jul-to-slf4j-1.7.16.jar -kryo-shaded-3.0.3.jar -leveldbjni-all-1.8.jar -libfb303-0.9.2.jar -libthrift-0.9.2.jar -log4j-1.2.17.jar -lz4-1.3.0.jar -mail-1.4.7.jar -mesos-1.0.0-shaded-protobuf.jar -metrics-core-3.1.2.jar -metrics-graphite-3.1.2.jar -metrics-json-3.1.2.jar -metrics-jvm-3.1.2.jar -minlog-1.3.0.jar -mx4j-3.0.2.jar -netty-3.8.0.Final.jar -netty-all-4.0.41.Final.jar -objenesis-2.1.jar -opencsv-2.3.jar -oro-2.0.8.jar -osgi-resource-locator-1.0.1.jar -paranamer-2.3.jar -parquet-column-1.8.1.jar -parquet-common-1.8.1.jar -parquet-encoding-1.8.1.jar -parquet-format-2.3.0-incubating.jar -parquet-hadoop-1.8.1.jar -parquet-hadoop-bundle-1.6.0.jar -parquet-jackson-1.8.1.jar -pmml-model-1.2.15.jar -pmml-schema-1.2.15.jar -protobuf-java-2.5.0.jar -py4j-0.10.3.jar -pyrolite-4.13.jar -scala-compiler-2.11.8.jar -scala-library-2.11.8.jar -scala-parser-combinators_2.11-1.0.4.jar -scala-reflect-2.11.8.jar -scala-xml_2.11-1.0.2.jar -scalap-2.11.8.jar -shapeless_2.11-2.0.0.jar -slf4j-api-1.7.16.jar -slf4j-log4j12-1.7.16.jar -snappy-0.2.jar -snappy-java-1.1.2.6.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 -stringtemplate-3.2.1.jar -super-csv-2.2.0.jar -univocity-parsers-2.2.1.jar -validation-api-1.1.0.Final.jar -xbean-asm5-shaded-4.4.jar -xmlenc-0.52.jar -xz-1.0.jar -zookeeper-3.4.5.jar diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 deleted file mode 100644 index e323efe30f64b..0000000000000 --- a/dev/deps/spark-deps-hadoop-2.4 +++ /dev/null @@ -1,175 +0,0 @@ -JavaEWAH-0.3.2.jar -RoaringBitmap-0.5.11.jar -ST4-4.0.4.jar -activation-1.1.1.jar -antlr-2.7.7.jar -antlr-runtime-3.4.jar -antlr4-runtime-4.5.3.jar -aopalliance-1.0.jar -aopalliance-repackaged-2.4.0-b34.jar -apache-log4j-extras-1.2.17.jar -arpack_combined_all-0.1.jar -avro-1.7.7.jar -avro-ipc-1.7.7.jar -avro-mapred-1.7.7-hadoop2.jar -base64-2.3.8.jar -bcprov-jdk15on-1.51.jar -bonecp-0.8.0.RELEASE.jar -breeze-macros_2.11-0.12.jar -breeze_2.11-0.12.jar -calcite-avatica-1.2.0-incubating.jar -calcite-core-1.2.0-incubating.jar -calcite-linq4j-1.2.0-incubating.jar -chill-java-0.8.0.jar -chill_2.11-0.8.0.jar -commons-beanutils-1.7.0.jar -commons-beanutils-core-1.8.0.jar -commons-cli-1.2.jar -commons-codec-1.10.jar -commons-collections-3.2.2.jar -commons-compiler-2.7.6.jar -commons-compress-1.4.1.jar -commons-configuration-1.6.jar -commons-crypto-1.0.0.jar -commons-dbcp-1.4.jar -commons-digester-1.8.jar -commons-httpclient-3.1.jar -commons-io-2.4.jar -commons-lang-2.6.jar -commons-lang3-3.3.2.jar -commons-logging-1.1.3.jar -commons-math3-3.4.1.jar -commons-net-2.2.jar -commons-pool-1.5.4.jar -compress-lzf-1.0.3.jar -core-1.1.2.jar -curator-client-2.4.0.jar -curator-framework-2.4.0.jar -curator-recipes-2.4.0.jar -datanucleus-api-jdo-3.2.6.jar -datanucleus-core-3.2.10.jar -datanucleus-rdbms-3.2.9.jar -derby-10.12.1.1.jar -eigenbase-properties-1.1.5.jar -guava-14.0.1.jar -guice-3.0.jar -guice-servlet-3.0.jar -hadoop-annotations-2.4.1.jar -hadoop-auth-2.4.1.jar -hadoop-client-2.4.1.jar -hadoop-common-2.4.1.jar -hadoop-hdfs-2.4.1.jar -hadoop-mapreduce-client-app-2.4.1.jar -hadoop-mapreduce-client-common-2.4.1.jar -hadoop-mapreduce-client-core-2.4.1.jar -hadoop-mapreduce-client-jobclient-2.4.1.jar -hadoop-mapreduce-client-shuffle-2.4.1.jar -hadoop-yarn-api-2.4.1.jar -hadoop-yarn-client-2.4.1.jar -hadoop-yarn-common-2.4.1.jar -hadoop-yarn-server-common-2.4.1.jar -hadoop-yarn-server-web-proxy-2.4.1.jar -hk2-api-2.4.0-b34.jar -hk2-locator-2.4.0-b34.jar -hk2-utils-2.4.0-b34.jar -httpclient-4.5.2.jar -httpcore-4.4.4.jar -ivy-2.4.0.jar -jackson-annotations-2.6.5.jar -jackson-core-2.6.5.jar -jackson-core-asl-1.9.13.jar -jackson-databind-2.6.5.jar -jackson-mapper-asl-1.9.13.jar -jackson-module-paranamer-2.6.5.jar -jackson-module-scala_2.11-2.6.5.jar -janino-3.0.0.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-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 -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 -jets3t-0.9.3.jar -jetty-6.1.26.jar -jetty-util-6.1.26.jar -jline-2.12.1.jar -joda-time-2.9.3.jar -jodd-core-3.5.2.jar -jpam-1.1.jar -json-20090211.jar -json4s-ast_2.11-3.2.11.jar -json4s-core_2.11-3.2.11.jar -json4s-jackson_2.11-3.2.11.jar -jsr305-1.3.9.jar -jta-1.1.jar -jtransforms-2.4.0.jar -jul-to-slf4j-1.7.16.jar -kryo-shaded-3.0.3.jar -leveldbjni-all-1.8.jar -libfb303-0.9.2.jar -libthrift-0.9.2.jar -log4j-1.2.17.jar -lz4-1.3.0.jar -mail-1.4.7.jar -mesos-1.0.0-shaded-protobuf.jar -metrics-core-3.1.2.jar -metrics-graphite-3.1.2.jar -metrics-json-3.1.2.jar -metrics-jvm-3.1.2.jar -minlog-1.3.0.jar -mx4j-3.0.2.jar -netty-3.8.0.Final.jar -netty-all-4.0.41.Final.jar -objenesis-2.1.jar -opencsv-2.3.jar -oro-2.0.8.jar -osgi-resource-locator-1.0.1.jar -paranamer-2.3.jar -parquet-column-1.8.1.jar -parquet-common-1.8.1.jar -parquet-encoding-1.8.1.jar -parquet-format-2.3.0-incubating.jar -parquet-hadoop-1.8.1.jar -parquet-hadoop-bundle-1.6.0.jar -parquet-jackson-1.8.1.jar -pmml-model-1.2.15.jar -pmml-schema-1.2.15.jar -protobuf-java-2.5.0.jar -py4j-0.10.3.jar -pyrolite-4.13.jar -scala-compiler-2.11.8.jar -scala-library-2.11.8.jar -scala-parser-combinators_2.11-1.0.4.jar -scala-reflect-2.11.8.jar -scala-xml_2.11-1.0.2.jar -scalap-2.11.8.jar -shapeless_2.11-2.0.0.jar -slf4j-api-1.7.16.jar -slf4j-log4j12-1.7.16.jar -snappy-0.2.jar -snappy-java-1.1.2.6.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 -stringtemplate-3.2.1.jar -super-csv-2.2.0.jar -univocity-parsers-2.2.1.jar -validation-api-1.1.0.Final.jar -xbean-asm5-shaded-4.4.jar -xmlenc-0.52.jar -xz-1.0.jar -zookeeper-3.4.5.jar diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 deleted file mode 100644 index 77d97e5365b9f..0000000000000 --- a/dev/deps/spark-deps-hadoop-2.6 +++ /dev/null @@ -1,184 +0,0 @@ -JavaEWAH-0.3.2.jar -RoaringBitmap-0.5.11.jar -ST4-4.0.4.jar -activation-1.1.1.jar -antlr-2.7.7.jar -antlr-runtime-3.4.jar -antlr4-runtime-4.5.3.jar -aopalliance-1.0.jar -aopalliance-repackaged-2.4.0-b34.jar -apache-log4j-extras-1.2.17.jar -apacheds-i18n-2.0.0-M15.jar -apacheds-kerberos-codec-2.0.0-M15.jar -api-asn1-api-1.0.0-M20.jar -api-util-1.0.0-M20.jar -arpack_combined_all-0.1.jar -avro-1.7.7.jar -avro-ipc-1.7.7.jar -avro-mapred-1.7.7-hadoop2.jar -base64-2.3.8.jar -bcprov-jdk15on-1.51.jar -bonecp-0.8.0.RELEASE.jar -breeze-macros_2.11-0.12.jar -breeze_2.11-0.12.jar -calcite-avatica-1.2.0-incubating.jar -calcite-core-1.2.0-incubating.jar -calcite-linq4j-1.2.0-incubating.jar -chill-java-0.8.0.jar -chill_2.11-0.8.0.jar -commons-beanutils-1.7.0.jar -commons-beanutils-core-1.8.0.jar -commons-cli-1.2.jar -commons-codec-1.10.jar -commons-collections-3.2.2.jar -commons-compiler-2.7.6.jar -commons-compress-1.4.1.jar -commons-configuration-1.6.jar -commons-crypto-1.0.0.jar -commons-dbcp-1.4.jar -commons-digester-1.8.jar -commons-httpclient-3.1.jar -commons-io-2.4.jar -commons-lang-2.6.jar -commons-lang3-3.3.2.jar -commons-logging-1.1.3.jar -commons-math3-3.4.1.jar -commons-net-2.2.jar -commons-pool-1.5.4.jar -compress-lzf-1.0.3.jar -core-1.1.2.jar -curator-client-2.6.0.jar -curator-framework-2.6.0.jar -curator-recipes-2.6.0.jar -datanucleus-api-jdo-3.2.6.jar -datanucleus-core-3.2.10.jar -datanucleus-rdbms-3.2.9.jar -derby-10.12.1.1.jar -eigenbase-properties-1.1.5.jar -gson-2.2.4.jar -guava-14.0.1.jar -guice-3.0.jar -guice-servlet-3.0.jar -hadoop-annotations-2.6.4.jar -hadoop-auth-2.6.4.jar -hadoop-client-2.6.4.jar -hadoop-common-2.6.4.jar -hadoop-hdfs-2.6.4.jar -hadoop-mapreduce-client-app-2.6.4.jar -hadoop-mapreduce-client-common-2.6.4.jar -hadoop-mapreduce-client-core-2.6.4.jar -hadoop-mapreduce-client-jobclient-2.6.4.jar -hadoop-mapreduce-client-shuffle-2.6.4.jar -hadoop-yarn-api-2.6.4.jar -hadoop-yarn-client-2.6.4.jar -hadoop-yarn-common-2.6.4.jar -hadoop-yarn-server-common-2.6.4.jar -hadoop-yarn-server-web-proxy-2.6.4.jar -hk2-api-2.4.0-b34.jar -hk2-locator-2.4.0-b34.jar -hk2-utils-2.4.0-b34.jar -htrace-core-3.0.4.jar -httpclient-4.5.2.jar -httpcore-4.4.4.jar -ivy-2.4.0.jar -jackson-annotations-2.6.5.jar -jackson-core-2.6.5.jar -jackson-core-asl-1.9.13.jar -jackson-databind-2.6.5.jar -jackson-jaxrs-1.9.13.jar -jackson-mapper-asl-1.9.13.jar -jackson-module-paranamer-2.6.5.jar -jackson-module-scala_2.11-2.6.5.jar -jackson-xc-1.9.13.jar -janino-3.0.0.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-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 -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 -jets3t-0.9.3.jar -jetty-6.1.26.jar -jetty-util-6.1.26.jar -jline-2.12.1.jar -joda-time-2.9.3.jar -jodd-core-3.5.2.jar -jpam-1.1.jar -json-20090211.jar -json4s-ast_2.11-3.2.11.jar -json4s-core_2.11-3.2.11.jar -json4s-jackson_2.11-3.2.11.jar -jsr305-1.3.9.jar -jta-1.1.jar -jtransforms-2.4.0.jar -jul-to-slf4j-1.7.16.jar -kryo-shaded-3.0.3.jar -leveldbjni-all-1.8.jar -libfb303-0.9.2.jar -libthrift-0.9.2.jar -log4j-1.2.17.jar -lz4-1.3.0.jar -mail-1.4.7.jar -mesos-1.0.0-shaded-protobuf.jar -metrics-core-3.1.2.jar -metrics-graphite-3.1.2.jar -metrics-json-3.1.2.jar -metrics-jvm-3.1.2.jar -minlog-1.3.0.jar -mx4j-3.0.2.jar -netty-3.8.0.Final.jar -netty-all-4.0.41.Final.jar -objenesis-2.1.jar -opencsv-2.3.jar -oro-2.0.8.jar -osgi-resource-locator-1.0.1.jar -paranamer-2.3.jar -parquet-column-1.8.1.jar -parquet-common-1.8.1.jar -parquet-encoding-1.8.1.jar -parquet-format-2.3.0-incubating.jar -parquet-hadoop-1.8.1.jar -parquet-hadoop-bundle-1.6.0.jar -parquet-jackson-1.8.1.jar -pmml-model-1.2.15.jar -pmml-schema-1.2.15.jar -protobuf-java-2.5.0.jar -py4j-0.10.3.jar -pyrolite-4.13.jar -scala-compiler-2.11.8.jar -scala-library-2.11.8.jar -scala-parser-combinators_2.11-1.0.4.jar -scala-reflect-2.11.8.jar -scala-xml_2.11-1.0.2.jar -scalap-2.11.8.jar -shapeless_2.11-2.0.0.jar -slf4j-api-1.7.16.jar -slf4j-log4j12-1.7.16.jar -snappy-0.2.jar -snappy-java-1.1.2.6.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 -stringtemplate-3.2.1.jar -super-csv-2.2.0.jar -univocity-parsers-2.2.1.jar -validation-api-1.1.0.Final.jar -xbean-asm5-shaded-4.4.jar -xercesImpl-2.9.1.jar -xmlenc-0.52.jar -xz-1.0.jar -zookeeper-3.4.6.jar diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 572edfa0cc29e..2a568cc8010db 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -55,6 +55,7 @@ datanucleus-core-3.2.10.jar datanucleus-rdbms-3.2.9.jar derby-10.12.1.1.jar eigenbase-properties-1.1.5.jar +fastutil-6.5.7.jar gson-2.2.4.jar guava-14.0.1.jar guice-3.0.jar @@ -146,13 +147,13 @@ opencsv-2.3.jar oro-2.0.8.jar osgi-resource-locator-1.0.1.jar paranamer-2.3.jar -parquet-column-1.8.1.jar -parquet-common-1.8.1.jar -parquet-encoding-1.8.1.jar -parquet-format-2.3.0-incubating.jar -parquet-hadoop-1.8.1.jar +parquet-column-1.9.0-palantir2.jar +parquet-common-1.9.0-palantir2.jar +parquet-encoding-1.9.0-palantir2.jar +parquet-format-2.3.1.jar +parquet-hadoop-1.9.0-palantir2.jar parquet-hadoop-bundle-1.6.0.jar -parquet-jackson-1.8.1.jar +parquet-jackson-1.9.0-palantir2.jar pmml-model-1.2.15.jar pmml-schema-1.2.15.jar protobuf-java-2.5.0.jar From aa7106b65dd2bd5df6e1ecb318dd5bd7f5610411 Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Thu, 13 Oct 2016 16:26:03 +0100 Subject: [PATCH 3/3] revert maven --- build/mvn | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/build/mvn b/build/mvn index c3ab62da36868..39dd3271c522a 100755 --- a/build/mvn +++ b/build/mvn @@ -36,15 +36,8 @@ install_app() { local binary="${_DIR}/$3" # setup `curl` and `wget` silent options if we're running on Jenkins - local curl_opts="-L" - local wget_opts="" - if [ -n "$AMPLAB_JENKINS" ]; then - curl_opts="-s ${curl_opts}" - wget_opts="--quiet ${wget_opts}" - else - curl_opts="--progress-bar ${curl_opts}" - wget_opts="--progress=bar:force ${wget_opts}" - fi + local curl_opts="-s -L" + local wget_opts="--quiet" if [ -z "$3" -o ! -f "$binary" ]; then # check if we already have the tarball @@ -85,7 +78,10 @@ install_mvn() { "apache-maven-${MVN_VERSION}-bin.tar.gz" \ "apache-maven-${MVN_VERSION}/bin/mvn" - MVN_BIN="${_DIR}/apache-maven-${MVN_VERSION}/bin/mvn" + export M2_HOME="${_DIR}/apache-maven-${MVN_VERSION}" + export M2="$M2_HOME/bin" + export PATH=$M2:$PATH + MVN_BIN="$M2/mvn" fi } @@ -158,4 +154,4 @@ export MAVEN_OPTS=${MAVEN_OPTS:-"$_COMPILE_JVM_OPTS"} echo "Using \`mvn\` from path: $MVN_BIN" 1>&2 # Last, call the `mvn` command as usual -${MVN_BIN} -DzincPort=${ZINC_PORT} "$@" +${MVN_BIN} -DzincPort=${ZINC_PORT} -e "$@"