Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f7b8fb4
Working fix for stdout logging bug
dylanw-spotify Sep 10, 2020
dc98c77
Cleaning up some code
dylanw-spotify Sep 11, 2020
fdb9cdd
Fixing like all of the test cases
dylanw-spotify Sep 11, 2020
0c4ab5f
Adding build-info.yaml
dylanw-spotify Sep 14, 2020
e6e8cbe
Removing build copy
dylanw-spotify Sep 14, 2020
3f33f30
Removing uneccesary dep
dylanw-spotify Sep 14, 2020
d0e4edd
adding service info
dylanw-spotify Sep 14, 2020
8e490d8
Adding service info
dylanw-spotify Sep 14, 2020
97647e6
Errant comments
dylanw-spotify Sep 14, 2020
e3073dd
Adding build-info.yaml
dylanw-spotify Sep 15, 2020
008c7f2
Merge branch 'master' into dylanw/VIV-886-fork
dylanw-spotify Sep 15, 2020
46bc7ee
Fixign maven container
dylanw-spotify Sep 16, 2020
f69b6bf
Merge branch 'dylanw/VIV-886-fork' of ghe:core-data/incubator-livy in…
dylanw-spotify Sep 16, 2020
f49030d
Forcing maven update
dylanw-spotify Sep 17, 2020
dc3d7aa
Fixing pom version issue
dylanw-spotify Sep 18, 2020
7ff75f2
Fixing unlicensed files
dylanw-spotify Sep 18, 2020
f9815eb
Skipping verify
dylanw-spotify Sep 18, 2020
c7b2e08
Removing bad version
dylanw-spotify Sep 22, 2020
048f525
Checkpointing build fixes
dylanw-spotify Sep 23, 2020
3d840ce
Removing spotify specific build config
dylanw-spotify Sep 23, 2020
0f8ba3f
Adding stdout logging test case
dylanw-spotify Sep 23, 2020
b1b145b
Fixing scalastyle
dylanw-spotify Sep 23, 2020
8b7438b
Updating test cases
dylanw-spotify Sep 23, 2020
33a5f75
merging from fork branch
dylanw-spotify Sep 23, 2020
8f751e8
Installing pip deps for build
dylanw-spotify Sep 23, 2020
eb998e9
Fixing error
dylanw-spotify Sep 23, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,8 @@ logs/*
docs/**/*.html
docs/**/JB/**
venv/*
spark-*-bin-*/**
service-info.yaml
build-info.yaml
**/.python-version
**/Dockerfile*
20 changes: 14 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,21 @@ language: scala
matrix:
include:
- name: "Spark 2.4 Unit Tests"
env: MVN_FLAG='-Pthriftserver -DskipITs'
env:
- MVN_FLAG='-Pthriftserver -DskipITs'
- PIP_FILES='pyspark==2.4.5'
- name: "Spark 2.4 ITs"
env: MVN_FLAG='-Pthriftserver -DskipTests'
env:
- MVN_FLAG='-Pthriftserver -DskipTests'
- PIP_FILES='pyspark==2.4.5'
- name: "Spark 3.0 Unit Tests"
env: MVN_FLAG='-Pthriftserver -Pspark-3.0 -DskipITs'
env:
- MVN_FLAG='-Pthriftserver -Pspark-3.0 -DskipITs'
- PIP_FILES='pyspark==3.0.0'
- name: "Spark 3.0 ITs"
env: MVN_FLAG='-Pthriftserver -Pspark-3.0 -DskipTests'
env:
- MVN_FLAG='-Pthriftserver -Pspark-3.0 -DskipTests'
- PIP_FILES='pyspark==3.0.0'

jdk:
- openjdk8
Expand All @@ -50,8 +58,8 @@ install:
- sudo python3 -m pip -q install --upgrade "pip < 10.0.0" "setuptools < 36"
- sudo pip2 -q install codecov cloudpickle
- sudo python3 -m pip -q install cloudpickle
- sudo pip2 -q install "requests >= 2.10.0" pytest flaky flake8 requests-kerberos
- sudo pip3 -q install "requests >= 2.10.0" pytest flaky requests-kerberos
- sudo pip2 -q install "requests >= 2.10.0" pytest flaky flake8 requests-kerberos $PIP_FILES
- sudo pip3 -q install "requests >= 2.10.0" pytest flaky requests-kerberos $PIP_FILES

script:
- mvn $MVN_FLAG -Dmaven.javadoc.skip=true -B -V -e verify
Expand Down
3 changes: 1 addition & 2 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<groupId>org.apache.livy</groupId>
<artifactId>livy-api</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
4 changes: 1 addition & 3 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<version>${revision}</version>
</parent>

<artifactId>livy-assembly</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
3 changes: 1 addition & 2 deletions client-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<groupId>org.apache.livy</groupId>
<artifactId>livy-client-common</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
3 changes: 1 addition & 2 deletions client-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<groupId>org.apache.livy</groupId>
<artifactId>livy-client-http</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
5 changes: 2 additions & 3 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>multi-scala-project-root</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<relativePath>../scala/pom.xml</relativePath>
<version>${revision}</version>
<relativePath>../scala/</relativePath>
</parent>

<artifactId>livy-core-parent</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<dependencies>
Expand Down
4 changes: 1 addition & 3 deletions core/scala-2.11/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.livy</groupId>
<artifactId>livy-core_2.11</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-core-parent</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<version>${revision}</version>
</parent>

<properties>
Expand Down
4 changes: 1 addition & 3 deletions core/scala-2.12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.livy</groupId>
<artifactId>livy-core_2.12</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-core-parent</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<version>${revision}</version>
</parent>

<properties>
Expand Down
4 changes: 1 addition & 3 deletions coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<relativePath>../pom.xml</relativePath>
<version>0.8.0-incubating-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>livy-coverage-report</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<dependencies>
Expand Down
4 changes: 1 addition & 3 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<version>${revision}</version>
</parent>

<groupId>org.apache.livy</groupId>
<artifactId>livy-examples</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
4 changes: 1 addition & 3 deletions integration-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<relativePath>../pom.xml</relativePath>
<version>0.8.0-incubating-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>livy-integration-test</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<version>${revision}</version>
<packaging>pom</packaging>
<name>Livy Project Parent POM</name>
<description>Livy Project</description>
Expand Down Expand Up @@ -78,6 +78,7 @@
</mailingLists>

<properties>
<revision>0.8.0-incubating-SNAPSHOT</revision>
<asynchttpclient.version>2.10.1</asynchttpclient.version>
<hadoop.version>2.7.3</hadoop.version>
<hadoop.scope>compile</hadoop.scope>
Expand Down
4 changes: 1 addition & 3 deletions python-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@
<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<version>${revision}</version>
</parent>

<groupId>org.apache.livy</groupId>
<artifactId>livy-python-api</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<build>
Expand Down
3 changes: 1 addition & 2 deletions repl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@
<groupId>org.apache.livy</groupId>
<artifactId>multi-scala-project-root</artifactId>
<relativePath>../scala/pom.xml</relativePath>
<version>0.8.0-incubating-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>livy-repl-parent</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<dependencies>
Expand Down
4 changes: 1 addition & 3 deletions repl/scala-2.11/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.livy</groupId>
<artifactId>livy-repl_2.11</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-repl-parent</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<version>${revision}</version>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions repl/scala-2.12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.livy</groupId>
<artifactId>livy-repl_2.12</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<version>${revision}</version>
<packaging>jar</packaging>

<parent>
<groupId>org.apache.livy</groupId>
<artifactId>livy-repl-parent</artifactId>
<version>0.8.0-incubating-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Loading