Merge remote-tracking branch 'origin/master'

pom.xml

@@ -46,7 +46,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
       <scope>test</scope>
     </dependency>
 
@@ -68,6 +67,11 @@
           <artifactId>mybatis-spring-boot-starter</artifactId>
           <version>1.3.1</version>
       </dependency>
+      
+      <dependency>
+      	<groupId>org.springframework.boot</groupId>
+      	<artifactId>spring-boot-starter-test</artifactId>
+      </dependency>
 
 
 
@@ -79,9 +83,11 @@
 
     <!-- oracle -->
     <dependency>
-      <groupId>com.oracle</groupId>
-      <artifactId>ojdbc7</artifactId>
-      <version>12.2.0.1.0</version>
+      <groupId>org.oracle</groupId>
+      <artifactId>oracle</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/ojdbc6-11.2.0.1.0.jar</systemPath>
     </dependency>
 
     <!-- 引入json处理包 -->