Skip to content

Commit

Permalink
Merge branch 'master' into SPARK-29145
Browse files Browse the repository at this point in the history
  • Loading branch information
AngersZhuuuu authored Oct 15, 2019
2 parents bd7c098 + a988aaf commit 3108da2
Show file tree
Hide file tree
Showing 1,228 changed files with 23,604 additions and 9,066 deletions.
30 changes: 28 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,35 @@ jobs:
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
version: ${{ matrix.java }}
java-version: ${{ matrix.java }}
- name: Build with Maven
run: |
export MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=512m -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN"
export MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=1g -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN"
export MAVEN_CLI_OPTS="--no-transfer-progress"
./build/mvn $MAVEN_CLI_OPTS -DskipTests -Pyarn -Pmesos -Pkubernetes -Phive -Phive-thriftserver -P${{ matrix.hadoop }} -Phadoop-cloud -Djava.version=${{ matrix.java }} package
lint:
runs-on: ubuntu-latest
name: Linters
steps:
- uses: actions/checkout@master
- uses: actions/setup-java@v1
with:
java-version: '11'
- uses: actions/setup-python@v1
with:
python-version: '3.x'
architecture: 'x64'
- name: Scala
run: ./dev/lint-scala
- name: Java
run: ./dev/lint-java
- name: Python
run: |
pip install flake8 sphinx numpy
./dev/lint-python
- name: License
run: ./dev/check-license
- name: Dependencies
run: ./dev/test-dependencies.sh
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ MIT License
core/src/main/resources/org/apache/spark/ui/static/dagre-d3.min.js
core/src/main/resources/org/apache/spark/ui/static/*dataTables*
core/src/main/resources/org/apache/spark/ui/static/graphlib-dot.min.js
ore/src/main/resources/org/apache/spark/ui/static/jquery*
core/src/main/resources/org/apache/spark/ui/static/jquery*
core/src/main/resources/org/apache/spark/ui/static/sorttable.js
docs/js/vendor/anchor.min.js
docs/js/vendor/jquery*
Expand Down
80 changes: 67 additions & 13 deletions LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,14 @@ javax.jdo:jdo-api
joda-time:joda-time
net.sf.opencsv:opencsv
org.apache.derby:derby
org.ehcache:ehcache
org.objenesis:objenesis
org.roaringbitmap:RoaringBitmap
org.scalanlp:breeze-macros_2.12
org.scalanlp:breeze_2.12
org.typelevel:macro-compat_2.12
org.yaml:snakeyaml
org.apache.xbean:xbean-asm5-shaded
org.apache.xbean:xbean-asm7-shaded
com.squareup.okhttp3:logging-interceptor
com.squareup.okhttp3:okhttp
com.squareup.okio:okio
Expand Down Expand Up @@ -253,19 +254,22 @@ commons-codec:commons-codec
commons-collections:commons-collections
io.fabric8:kubernetes-client
io.fabric8:kubernetes-model
io.fabric8:kubernetes-model-common
io.netty:netty-all
net.hydromatic:eigenbase-properties
net.sf.supercsv:super-csv
org.apache.arrow:arrow-format
org.apache.arrow:arrow-memory
org.apache.arrow:arrow-vector
org.apache.commons:commons-configuration2
org.apache.commons:commons-crypto
org.apache.commons:commons-lang3
org.apache.hadoop:hadoop-annotations
org.apache.hadoop:hadoop-auth
org.apache.hadoop:hadoop-client
org.apache.hadoop:hadoop-common
org.apache.hadoop:hadoop-hdfs
org.apache.hadoop:hadoop-hdfs-client
org.apache.hadoop:hadoop-mapreduce-client-app
org.apache.hadoop:hadoop-mapreduce-client-common
org.apache.hadoop:hadoop-mapreduce-client-core
Expand All @@ -278,6 +282,21 @@ org.apache.hadoop:hadoop-yarn-server-common
org.apache.hadoop:hadoop-yarn-server-web-proxy
org.apache.httpcomponents:httpclient
org.apache.httpcomponents:httpcore
org.apache.kerby:kerb-admin
org.apache.kerby:kerb-client
org.apache.kerby:kerb-common
org.apache.kerby:kerb-core
org.apache.kerby:kerb-crypto
org.apache.kerby:kerb-identity
org.apache.kerby:kerb-server
org.apache.kerby:kerb-simplekdc
org.apache.kerby:kerb-util
org.apache.kerby:kerby-asn1
org.apache.kerby:kerby-config
org.apache.kerby:kerby-pkix
org.apache.kerby:kerby-util
org.apache.kerby:kerby-xdr
org.apache.kerby:token-provider
org.apache.orc:orc-core
org.apache.orc:orc-mapreduce
org.mortbay.jetty:jetty
Expand All @@ -292,16 +311,24 @@ com.fasterxml.jackson.core:jackson-annotations
com.fasterxml.jackson.core:jackson-core
com.fasterxml.jackson.core:jackson-databind
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
com.fasterxml.jackson.module:jackson-module-jaxb-annotations
com.fasterxml.jackson.module:jackson-module-paranamer
com.fasterxml.jackson.module:jackson-module-scala_2.12
com.fasterxml.woodstox:woodstox-core
com.github.mifmif:generex
com.github.stephenc.jcip:jcip-annotations
com.google.code.findbugs:jsr305
com.google.code.gson:gson
com.google.flatbuffers:flatbuffers-java
com.google.guava:guava
com.google.inject:guice
com.google.inject.extensions:guice-servlet
com.nimbusds:nimbus-jose-jwt
com.twitter:parquet-hadoop-bundle
commons-cli:commons-cli
commons-daemon:commons-daemon
commons-dbcp:commons-dbcp
commons-io:commons-io
commons-lang:commons-lang
Expand All @@ -313,6 +340,8 @@ javax.inject:javax.inject
javax.validation:validation-api
log4j:apache-log4j-extras
log4j:log4j
net.minidev:accessors-smart
net.minidev:json-smart
net.sf.jpam:jpam
org.apache.avro:avro
org.apache.avro:avro-ipc
Expand All @@ -328,6 +357,7 @@ org.apache.directory.server:apacheds-i18n
org.apache.directory.server:apacheds-kerberos-codec
org.apache.htrace:htrace-core
org.apache.ivy:ivy
org.apache.geronimo.specs:geronimo-jcache_1.0_spec
org.apache.mesos:mesos
org.apache.parquet:parquet-column
org.apache.parquet:parquet-common
Expand All @@ -343,11 +373,6 @@ org.datanucleus:datanucleus-api-jdo
org.datanucleus:datanucleus-core
org.datanucleus:datanucleus-rdbms
org.lz4:lz4-java
org.spark-project.hive:hive-beeline
org.spark-project.hive:hive-cli
org.spark-project.hive:hive-exec
org.spark-project.hive:hive-jdbc
org.spark-project.hive:hive-metastore
org.xerial.snappy:snappy-java
stax:stax-api
xerces:xercesImpl
Expand All @@ -369,6 +394,27 @@ org.eclipse.jetty:jetty-webapp
org.eclipse.jetty:jetty-xml
org.scala-lang.modules:scala-xml_2.12
org.opencypher:okapi-shade
com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter
com.zaxxer.HikariCP
org.apache.hive:hive-beeline
org.apache.hive:hive-cli
org.apache.hive:hive-common
org.apache.hive:hive-exec
org.apache.hive:hive-jdbc
org.apache.hive:hive-llap-common
org.apache.hive:hive-metastore
org.apache.hive:hive-serde
org.apache.hive:hive-service-rpc
org.apache.hive:hive-shims-0.23
org.apache.hive:hive-shims
org.apache.hive:hive-common
org.apache.hive:hive-shims-scheduler
org.apache.hive:hive-storage-api
org.apache.hive:hive-vector-code-gen
org.datanucleus:javax.jdo
com.tdunning:json
org.apache.velocity:velocity
org.apache.yetus:audience-annotations

core/src/main/java/org/apache/spark/util/collection/TimSort.java
core/src/main/resources/org/apache/spark/ui/static/bootstrap*
Expand All @@ -387,15 +433,19 @@ BSD 2-Clause
------------

com.github.luben:zstd-jni
dnsjava:dnsjava
javolution:javolution
com.esotericsoftware:kryo-shaded
com.esotericsoftware:minlog
com.esotericsoftware:reflectasm
com.google.protobuf:protobuf-java
org.codehaus.janino:commons-compiler
org.codehaus.janino:janino
org.codehaus.woodstox:stax2-api
jline:jline
org.jodd:jodd-core
com.github.wendykierp:JTransforms
pl.edu.icm:JLargeArrays


BSD 3-Clause
Expand All @@ -408,6 +458,7 @@ org.antlr:stringtemplate
org.antlr:antlr4-runtime
antlr:antlr
com.github.fommil.netlib:core
com.google.re2j:re2j
com.thoughtworks.paranamer:paranamer
org.scala-lang:scala-compiler
org.scala-lang:scala-library
Expand All @@ -433,8 +484,13 @@ is distributed under the 3-Clause BSD license.
MIT License
-----------

org.spire-math:spire-macros_2.12
org.spire-math:spire_2.12
com.microsoft.sqlserver:mssql-jdbc
org.typelevel:spire_2.12
org.typelevel:spire-macros_2.12
org.typelevel:spire-platform_2.12
org.typelevel:spire-util_2.12
org.typelevel:algebra_2.12:jar
org.typelevel:cats-kernel_2.12
org.typelevel:machinist_2.12
net.razorvine:pyrolite
org.slf4j:jcl-over-slf4j
Expand All @@ -458,13 +514,15 @@ Common Development and Distribution License (CDDL) 1.0

javax.activation:activation http://www.oracle.com/technetwork/java/javase/tech/index-jsp-138795.html
javax.xml.stream:stax-api https://jcp.org/en/jsr/detail?id=173
javax.transaction:javax.transaction-api


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.servlet.jsp:jsp-api
javax.transaction:jta http://www.oracle.com/technetwork/java/index.html
javax.xml.bind:jaxb-api https://github.com/javaee/jaxb-v2
org.glassfish.hk2:hk2-api https://github.com/javaee/glassfish
Expand Down Expand Up @@ -495,11 +553,7 @@ 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
--------------------------------

com.github.rwl:jtransforms https://sourceforge.net/projects/jtransforms/
org.glassfish.hk2.external:jakarta.inject


Python Software Foundation License
Expand Down
Loading

0 comments on commit 3108da2

Please sign in to comment.