[hadoop-submarine] branch master updated: [SUBMARINE-177] Replace mysql-driver in the submarine-service with de…

[zt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ztang 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 6bab25e  [SUBMARINE-177] Replace mysql-driver in the submarine-service with de…
6bab25e is described below

commit 6bab25e45b207332f3dc3aaba03ebba4e04a9d5e
Author: LinhaoZhu <zh...@163.com>
AuthorDate: Thu Sep 26 10:49:40 2019 +0800

    [SUBMARINE-177] Replace mysql-driver in the submarine-service with de…
    
    ### What is this PR for?
    Set the scope of the mysql dependent package to provided. Add Derby's driver as an alternative.
    
    ### What type of PR is it?
    [Bug Fix ]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * [SUBMARINE-177](https://issues.apache.org/jira/browse/SUBMARINE-177)
    
    ### How should this be tested?
    * [CI Pass](https://travis-ci.org/LinhaoZhu/hadoop-submarine/builds/589751612)
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: LinhaoZhu <zh...@163.com>
    
    Closes #15 from LinhaoZhu/SUBMARINE-177 and squashes the following commits:
    
    b5e5ffe [LinhaoZhu] [SUBMARINE-177] Replace mysql-driver in the submarine-service with derby-driver
---
 pom.xml                                      | 1 +
 submarine-workbench/submarine-server/pom.xml | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index fc1f92c..e3cc90f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,7 @@
     <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.4.2.0</derby.version>
   </properties>
 
   <modules>
diff --git a/submarine-workbench/submarine-server/pom.xml b/submarine-workbench/submarine-server/pom.xml
index 1bbc97f..020118b 100644
--- a/submarine-workbench/submarine-server/pom.xml
+++ b/submarine-workbench/submarine-server/pom.xml
@@ -137,6 +137,13 @@
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
       <version>${mysql-connector-java.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>${derby.version}</version>
     </dependency>
 
     <!-- Test libraries -->