This is an automated email from the ASF dual-hosted git repository.
pdallig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new ec33eb5 [ZEPPELIN-5557] Dependency convergence errors
ec33eb5 is described below
commit ec33eb5af5e1033a9371e033521f70e9703abc25
Author: Philipp Dallig <philipp.dal...@gmail.com>
AuthorDate: Tue Oct 12 09:01:51 2021 +0200
[ZEPPELIN-5557] Dependency convergence errors
### What is this PR for?
This PR contains the following changes:
- remove asm from Hadoop client as it is provided by
javax-websocket-server-impl in zeppelin-server module
- adds two fast CI jobs to validate enforcer rules when Hadoop2 or Hadoop3
is included.
- the
[checkstyle:check](http://maven.apache.org/plugins/maven-checkstyle-plugin/check-mojo.html)
Maven execution phase was changed from validate to the default verify phase.
- excludes jackson-dataformat-xml from org.gaul:s3proxy (test dependency)
because it is provided by hadoop3.
### What type of PR is it?
- Bug Fix
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-5557
### How should this be tested?
* CI
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Philipp Dallig <philipp.dal...@gmail.com>
Closes #4248 from Reamer/asm and squashes the following commits:
d222941c7 [Philipp Dallig] Remove jackson-dataformat-xml from
org.gaul:s3proxy
00c908c14 [Philipp Dallig] Use default checkstyle:check execution phase
(verify)
33a2f1981 [Philipp Dallig] rename rat.yml to quick.yml and run maven
enforcer with hadoop2 and hadoop3
f5d25ad02 [Philipp Dallig] Exclude asm from hadoop dependency, because it's
provided by javax-websocket-server-impl
---
.github/workflows/quick.yml | 54 ++++++++++++++++++++++++++++++++
.github/workflows/rat.yml | 30 ------------------
pom.xml | 1 -
zeppelin-plugins/notebookrepo/s3/pom.xml | 4 +++
zeppelin-server/pom.xml | 8 +++++
5 files changed, 66 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/quick.yml b/.github/workflows/quick.yml
new file mode 100644
index 0000000..bdbf5fc
--- /dev/null
+++ b/.github/workflows/quick.yml
@@ -0,0 +1,54 @@
+name: quick
+on:
+ push:
+ pull_request:
+ branches:
+ - master
+ - branch-*
+ types: [opened, synchronize]
+
+jobs:
+ license-check:
+ runs-on: ubuntu-20.04
+ env:
+ # Disable keepAlive and pool
+ #
https://github.com/actions/virtual-environments/issues/1499#issuecomment-689467080
+ MAVEN_OPTS: >-
+ -Xms1024M -Xmx2048M -XX:MaxMetaspaceSize=1024m
-XX:-UseGCOverheadLimit
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+ -Dhttp.keepAlive=false
+ -Dmaven.wagon.http.pool=false
+ -Dmaven.wagon.http.retryHandler.count=3
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Set up JDK 8
+ uses: actions/setup-java@v2
+ with:
+ distribution: 'adopt'
+ java-version: 8
+ - name: Check Rat
+ run: ./mvnw apache-rat:check -Prat -B
+ maven-validate:
+ runs-on: ubuntu-20.04
+ strategy:
+ fail-fast: false
+ matrix:
+ hadoop: [hadoop2, hadoop3]
+ env:
+ # Disable keepAlive and pool
+ #
https://github.com/actions/virtual-environments/issues/1499#issuecomment-689467080
+ MAVEN_OPTS: >-
+ -Xms1024M -Xmx2048M -XX:MaxMetaspaceSize=1024m
-XX:-UseGCOverheadLimit
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+ -Dhttp.keepAlive=false
+ -Dmaven.wagon.http.pool=false
+ -Dmaven.wagon.http.retryHandler.count=3
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Set up JDK 8
+ uses: actions/setup-java@v2
+ with:
+ distribution: 'adopt'
+ java-version: 8
+ - name: Run Maven Validate
+ run: ./mvnw validate -DskipRat -P${{ matrix.hadoop }} -Pinclude-hadoop
-B
diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml
deleted file mode 100644
index 7e1f498..0000000
--- a/.github/workflows/rat.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: rat
-on:
- push:
- pull_request:
- branches:
- - master
- - branch-*
- types: [opened, synchronize]
-
-jobs:
- license-check:
- runs-on: ubuntu-20.04
- env:
- # Disable keepAlive and pool
- #
https://github.com/actions/virtual-environments/issues/1499#issuecomment-689467080
- MAVEN_OPTS: >-
- -Xms1024M -Xmx2048M -XX:MaxMetaspaceSize=1024m
-XX:-UseGCOverheadLimit
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
- -Dhttp.keepAlive=false
- -Dmaven.wagon.http.pool=false
- -Dmaven.wagon.http.retryHandler.count=3
- steps:
- - name: Checkout
- uses: actions/checkout@v2
- - name: Set up JDK 8
- uses: actions/setup-java@v2
- with:
- distribution: 'adopt'
- java-version: 8
- - name: Check Rat
- run: ./mvnw apache-rat:check -Prat -B
diff --git a/pom.xml b/pom.xml
index 6498b42..e8a76e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1079,7 +1079,6 @@
<executions>
<execution>
<id>checkstyle-fail-build</id>
- <phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
diff --git a/zeppelin-plugins/notebookrepo/s3/pom.xml
b/zeppelin-plugins/notebookrepo/s3/pom.xml
index a5d0464..5cfe396 100644
--- a/zeppelin-plugins/notebookrepo/s3/pom.xml
+++ b/zeppelin-plugins/notebookrepo/s3/pom.xml
@@ -79,6 +79,10 @@
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</exclusion>
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 58d35b8..2ecf4a8 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -295,6 +295,13 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
+ <exclusions>
+ <!-- Provided by javax-websocket-server-impl -->
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!--test libraries-->
@@ -304,6 +311,7 @@
<classifier>tests</classifier>
<scope>test</scope>
<exclusions>
+ <!-- Provided by javax-websocket-server-impl -->
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
