Skip to content

Commit 3108da2

Browse files
authored
Merge branch 'master' into SPARK-29145
2 parents bd7c098 + a988aaf commit 3108da2

File tree

1,228 files changed

+23604
-9066
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,228 files changed

+23604
-9066
lines changed

.github/workflows/master.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,35 @@ jobs:
2626
- name: Set up JDK ${{ matrix.java }}
2727
uses: actions/setup-java@v1
2828
with:
29-
version: ${{ matrix.java }}
29+
java-version: ${{ matrix.java }}
3030
- name: Build with Maven
3131
run: |
32-
export MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=512m -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN"
32+
export MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=1g -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN"
3333
export MAVEN_CLI_OPTS="--no-transfer-progress"
3434
./build/mvn $MAVEN_CLI_OPTS -DskipTests -Pyarn -Pmesos -Pkubernetes -Phive -Phive-thriftserver -P${{ matrix.hadoop }} -Phadoop-cloud -Djava.version=${{ matrix.java }} package
35+
36+
37+
lint:
38+
runs-on: ubuntu-latest
39+
name: Linters
40+
steps:
41+
- uses: actions/checkout@master
42+
- uses: actions/setup-java@v1
43+
with:
44+
java-version: '11'
45+
- uses: actions/setup-python@v1
46+
with:
47+
python-version: '3.x'
48+
architecture: 'x64'
49+
- name: Scala
50+
run: ./dev/lint-scala
51+
- name: Java
52+
run: ./dev/lint-java
53+
- name: Python
54+
run: |
55+
pip install flake8 sphinx numpy
56+
./dev/lint-python
57+
- name: License
58+
run: ./dev/check-license
59+
- name: Dependencies
60+
run: ./dev/test-dependencies.sh

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ MIT License
243243
core/src/main/resources/org/apache/spark/ui/static/dagre-d3.min.js
244244
core/src/main/resources/org/apache/spark/ui/static/*dataTables*
245245
core/src/main/resources/org/apache/spark/ui/static/graphlib-dot.min.js
246-
ore/src/main/resources/org/apache/spark/ui/static/jquery*
246+
core/src/main/resources/org/apache/spark/ui/static/jquery*
247247
core/src/main/resources/org/apache/spark/ui/static/sorttable.js
248248
docs/js/vendor/anchor.min.js
249249
docs/js/vendor/jquery*

LICENSE-binary

Lines changed: 67 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,14 @@ javax.jdo:jdo-api
218218
joda-time:joda-time
219219
net.sf.opencsv:opencsv
220220
org.apache.derby:derby
221+
org.ehcache:ehcache
221222
org.objenesis:objenesis
222223
org.roaringbitmap:RoaringBitmap
223224
org.scalanlp:breeze-macros_2.12
224225
org.scalanlp:breeze_2.12
225226
org.typelevel:macro-compat_2.12
226227
org.yaml:snakeyaml
227-
org.apache.xbean:xbean-asm5-shaded
228+
org.apache.xbean:xbean-asm7-shaded
228229
com.squareup.okhttp3:logging-interceptor
229230
com.squareup.okhttp3:okhttp
230231
com.squareup.okio:okio
@@ -253,19 +254,22 @@ commons-codec:commons-codec
253254
commons-collections:commons-collections
254255
io.fabric8:kubernetes-client
255256
io.fabric8:kubernetes-model
257+
io.fabric8:kubernetes-model-common
256258
io.netty:netty-all
257259
net.hydromatic:eigenbase-properties
258260
net.sf.supercsv:super-csv
259261
org.apache.arrow:arrow-format
260262
org.apache.arrow:arrow-memory
261263
org.apache.arrow:arrow-vector
264+
org.apache.commons:commons-configuration2
262265
org.apache.commons:commons-crypto
263266
org.apache.commons:commons-lang3
264267
org.apache.hadoop:hadoop-annotations
265268
org.apache.hadoop:hadoop-auth
266269
org.apache.hadoop:hadoop-client
267270
org.apache.hadoop:hadoop-common
268271
org.apache.hadoop:hadoop-hdfs
272+
org.apache.hadoop:hadoop-hdfs-client
269273
org.apache.hadoop:hadoop-mapreduce-client-app
270274
org.apache.hadoop:hadoop-mapreduce-client-common
271275
org.apache.hadoop:hadoop-mapreduce-client-core
@@ -278,6 +282,21 @@ org.apache.hadoop:hadoop-yarn-server-common
278282
org.apache.hadoop:hadoop-yarn-server-web-proxy
279283
org.apache.httpcomponents:httpclient
280284
org.apache.httpcomponents:httpcore
285+
org.apache.kerby:kerb-admin
286+
org.apache.kerby:kerb-client
287+
org.apache.kerby:kerb-common
288+
org.apache.kerby:kerb-core
289+
org.apache.kerby:kerb-crypto
290+
org.apache.kerby:kerb-identity
291+
org.apache.kerby:kerb-server
292+
org.apache.kerby:kerb-simplekdc
293+
org.apache.kerby:kerb-util
294+
org.apache.kerby:kerby-asn1
295+
org.apache.kerby:kerby-config
296+
org.apache.kerby:kerby-pkix
297+
org.apache.kerby:kerby-util
298+
org.apache.kerby:kerby-xdr
299+
org.apache.kerby:token-provider
281300
org.apache.orc:orc-core
282301
org.apache.orc:orc-mapreduce
283302
org.mortbay.jetty:jetty
@@ -292,16 +311,24 @@ com.fasterxml.jackson.core:jackson-annotations
292311
com.fasterxml.jackson.core:jackson-core
293312
com.fasterxml.jackson.core:jackson-databind
294313
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
314+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base
315+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
295316
com.fasterxml.jackson.module:jackson-module-jaxb-annotations
296317
com.fasterxml.jackson.module:jackson-module-paranamer
297318
com.fasterxml.jackson.module:jackson-module-scala_2.12
319+
com.fasterxml.woodstox:woodstox-core
298320
com.github.mifmif:generex
321+
com.github.stephenc.jcip:jcip-annotations
299322
com.google.code.findbugs:jsr305
300323
com.google.code.gson:gson
324+
com.google.flatbuffers:flatbuffers-java
325+
com.google.guava:guava
301326
com.google.inject:guice
302327
com.google.inject.extensions:guice-servlet
328+
com.nimbusds:nimbus-jose-jwt
303329
com.twitter:parquet-hadoop-bundle
304330
commons-cli:commons-cli
331+
commons-daemon:commons-daemon
305332
commons-dbcp:commons-dbcp
306333
commons-io:commons-io
307334
commons-lang:commons-lang
@@ -313,6 +340,8 @@ javax.inject:javax.inject
313340
javax.validation:validation-api
314341
log4j:apache-log4j-extras
315342
log4j:log4j
343+
net.minidev:accessors-smart
344+
net.minidev:json-smart
316345
net.sf.jpam:jpam
317346
org.apache.avro:avro
318347
org.apache.avro:avro-ipc
@@ -328,6 +357,7 @@ org.apache.directory.server:apacheds-i18n
328357
org.apache.directory.server:apacheds-kerberos-codec
329358
org.apache.htrace:htrace-core
330359
org.apache.ivy:ivy
360+
org.apache.geronimo.specs:geronimo-jcache_1.0_spec
331361
org.apache.mesos:mesos
332362
org.apache.parquet:parquet-column
333363
org.apache.parquet:parquet-common
@@ -343,11 +373,6 @@ org.datanucleus:datanucleus-api-jdo
343373
org.datanucleus:datanucleus-core
344374
org.datanucleus:datanucleus-rdbms
345375
org.lz4:lz4-java
346-
org.spark-project.hive:hive-beeline
347-
org.spark-project.hive:hive-cli
348-
org.spark-project.hive:hive-exec
349-
org.spark-project.hive:hive-jdbc
350-
org.spark-project.hive:hive-metastore
351376
org.xerial.snappy:snappy-java
352377
stax:stax-api
353378
xerces:xercesImpl
@@ -369,6 +394,27 @@ org.eclipse.jetty:jetty-webapp
369394
org.eclipse.jetty:jetty-xml
370395
org.scala-lang.modules:scala-xml_2.12
371396
org.opencypher:okapi-shade
397+
com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter
398+
com.zaxxer.HikariCP
399+
org.apache.hive:hive-beeline
400+
org.apache.hive:hive-cli
401+
org.apache.hive:hive-common
402+
org.apache.hive:hive-exec
403+
org.apache.hive:hive-jdbc
404+
org.apache.hive:hive-llap-common
405+
org.apache.hive:hive-metastore
406+
org.apache.hive:hive-serde
407+
org.apache.hive:hive-service-rpc
408+
org.apache.hive:hive-shims-0.23
409+
org.apache.hive:hive-shims
410+
org.apache.hive:hive-common
411+
org.apache.hive:hive-shims-scheduler
412+
org.apache.hive:hive-storage-api
413+
org.apache.hive:hive-vector-code-gen
414+
org.datanucleus:javax.jdo
415+
com.tdunning:json
416+
org.apache.velocity:velocity
417+
org.apache.yetus:audience-annotations
372418

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

389435
com.github.luben:zstd-jni
436+
dnsjava:dnsjava
390437
javolution:javolution
391438
com.esotericsoftware:kryo-shaded
392439
com.esotericsoftware:minlog
393440
com.esotericsoftware:reflectasm
394441
com.google.protobuf:protobuf-java
395442
org.codehaus.janino:commons-compiler
396443
org.codehaus.janino:janino
444+
org.codehaus.woodstox:stax2-api
397445
jline:jline
398446
org.jodd:jodd-core
447+
com.github.wendykierp:JTransforms
448+
pl.edu.icm:JLargeArrays
399449

400450

401451
BSD 3-Clause
@@ -408,6 +458,7 @@ org.antlr:stringtemplate
408458
org.antlr:antlr4-runtime
409459
antlr:antlr
410460
com.github.fommil.netlib:core
461+
com.google.re2j:re2j
411462
com.thoughtworks.paranamer:paranamer
412463
org.scala-lang:scala-compiler
413464
org.scala-lang:scala-library
@@ -433,8 +484,13 @@ is distributed under the 3-Clause BSD license.
433484
MIT License
434485
-----------
435486

436-
org.spire-math:spire-macros_2.12
437-
org.spire-math:spire_2.12
487+
com.microsoft.sqlserver:mssql-jdbc
488+
org.typelevel:spire_2.12
489+
org.typelevel:spire-macros_2.12
490+
org.typelevel:spire-platform_2.12
491+
org.typelevel:spire-util_2.12
492+
org.typelevel:algebra_2.12:jar
493+
org.typelevel:cats-kernel_2.12
438494
org.typelevel:machinist_2.12
439495
net.razorvine:pyrolite
440496
org.slf4j:jcl-over-slf4j
@@ -458,13 +514,15 @@ Common Development and Distribution License (CDDL) 1.0
458514

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

462519

463520
Common Development and Distribution License (CDDL) 1.1
464521
------------------------------------------------------
465522

466523
javax.el:javax.el-api https://javaee.github.io/uel-ri/
467524
javax.servlet:javax.servlet-api https://javaee.github.io/servlet-spec/
525+
javax.servlet.jsp:jsp-api
468526
javax.transaction:jta http://www.oracle.com/technetwork/java/index.html
469527
javax.xml.bind:jaxb-api https://github.com/javaee/jaxb-v2
470528
org.glassfish.hk2:hk2-api https://github.com/javaee/glassfish
@@ -495,11 +553,7 @@ Eclipse Public License (EPL) 2.0
495553

496554
jakarta.annotation:jakarta-annotation-api https://projects.eclipse.org/projects/ee4j.ca
497555
jakarta.ws.rs:jakarta.ws.rs-api https://github.com/eclipse-ee4j/jaxrs-api
498-
499-
Mozilla Public License (MPL) 1.1
500-
--------------------------------
501-
502-
com.github.rwl:jtransforms https://sourceforge.net/projects/jtransforms/
556+
org.glassfish.hk2.external:jakarta.inject
503557

504558

505559
Python Software Foundation License

0 commit comments

Comments
 (0)