You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by pr...@apache.org on 2017/01/23 07:11:16 UTC

zeppelin git commit: Remove multple artifactId - hadoop-common

Repository: zeppelin
Updated Branches:
  refs/heads/master 062b90a5d -> 584b1d94e


Remove multple artifactId - hadoop-common

### What is this PR for?
Remove multple artifactId - hadoop-common in JDBC

### What type of PR is it?
[Refactor | Minor]

### Todos
* [ ] - N/A

### What is the Jira issue?
* [ZEPPELIN-1989](https://issues.apache.org/jira/browse/ZEPPELIN-1989)

### How should this be tested?
Just a small refactor.
CI should be green.

### Screenshots (if appropriate)
N/A

### Questions:
* Does the licenses files need update? N/A
* Is there breaking changes for older versions? N/A
* Does this needs documentation? N/A

Author: Prabhjyot Singh <pr...@gmail.com>

Closes #1918 from prabhjyotsingh/ZEPPELIN-1989 and squashes the following commits:

dcdbf74 [Prabhjyot Singh] remove multple artifactId - hadoop-common


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/584b1d94
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/584b1d94
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/584b1d94

Branch: refs/heads/master
Commit: 584b1d94e22adc7b915c77d8ca71b0b2ed0ea7c2
Parents: 062b90a
Author: Prabhjyot Singh <pr...@gmail.com>
Authored: Fri Jan 20 21:51:36 2017 +0530
Committer: Prabhjyot Singh <pr...@gmail.com>
Committed: Mon Jan 23 12:40:57 2017 +0530

----------------------------------------------------------------------
 jdbc/pom.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/584b1d94/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 1b72849..e34be89 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -39,7 +39,6 @@
     <hadoop.common.version>2.7.2</hadoop.common.version>
     <h2.version>1.4.190</h2.version>
     <commons.dbcp2.version>2.0.1</commons.dbcp2.version>
-    <hadoop-common.version>2.6.0</hadoop-common.version>
 
     <!--test library versions-->
     <mockrunner.jdbc.version>1.0.8</mockrunner.jdbc.version>
@@ -81,13 +80,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>${hadoop.common.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
       <version>${h2.version}</version>
@@ -122,7 +114,8 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>${hadoop-common.version}</version>
+      <version>${hadoop.common.version}</version>
+      <scope>provided</scope>
       <exclusions>
         <exclusion>
           <groupId>com.sun.jersey</groupId>