This is an automated email from the ASF dual-hosted git repository.
zhouquan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 2ba8fd7 SUBMARINE-262. Two different version of commons-io in pom.xml
2ba8fd7 is described below
commit 2ba8fd783935974befc6c1ee143d4e936943079c
Author: xunix huang <qiwei_hu...@qq.com>
AuthorDate: Mon Oct 28 17:51:31 2019 +0800
SUBMARINE-262. Two different version of commons-io in pom.xml
### What is this PR for?
resolve the problem of the duplicated version of `commons.io`
### What type of PR is it?
[Bug Fix]
### What is the Jira issue?
* https://issues.apache.org/jira/browse/SUBMARINE-262
### How should this be tested?
* https://travis-ci.org/hhhizzz/hadoop-submarine/builds/603829334
### Questions:
* Does the licenses files need an update? No
* Are there breaking changes for older versions? No
* Does this needs documentation? No
Author: xunix huang <qiwei_hu...@qq.com>
Closes #65 from hhhizzz/master and squashes the following commits:
5aaf892 [xunix huang] SUBMARINE-262. Two different version of commons-io in
pom.xml ### What is this PR for? resolve the problem of duplicated version of
`commons.io`
---
pom.xml | 3 +--
submarine-server/server-submitter/submitter-yarnservice/pom.xml | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7b8c8e2..deee2ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
<httpclient.version>4.5.2</httpclient.version>
<commons-lang.version>2.5</commons-lang.version>
<commons-lang3.version>3.4</commons-lang3.version>
- <commons.io.version>2.5</commons.io.version>
+ <commons-io.version>2.5</commons-io.version>
<junit.version>4.12</junit.version>
<jsr305.version>1.3.9</jsr305.version>
<mockito.version>2.23.4</mockito.version>
@@ -106,7 +106,6 @@
<zip4j.version>1.3.2</zip4j.version>
<commons-collections.version>3.2.2</commons-collections.version>
<nimbus-jose-jwt.version>4.41.1</nimbus-jose-jwt.version>
- <commons-io.version>2.4</commons-io.version>
<mybatis-generator.version>1.3.7</mybatis-generator.version>
<derby.version>10.15.1.3</derby.version>
<zeppelin.version>0.9.0-SNAPSHOT</zeppelin.version>
diff --git a/submarine-server/server-submitter/submitter-yarnservice/pom.xml
b/submarine-server/server-submitter/submitter-yarnservice/pom.xml
index 4617dbe..88b8625 100644
--- a/submarine-server/server-submitter/submitter-yarnservice/pom.xml
+++ b/submarine-server/server-submitter/submitter-yarnservice/pom.xml
@@ -86,7 +86,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ <version>${commons-io.version}</version>
</dependency>
<!-- Dependencies for Hadoop commons -->
