Merge branch 'develop'

# Conflicts:
#	Dockerfile
#	settings.gradle

build.gradle

@@ -12,6 +12,7 @@ buildscript {
         maven { url 'http://repo.spring.io/plugins-release' }
         mavenCentral()
     }
+    
     dependencies {
         classpath "io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5' //sonarqube
@@ -44,7 +45,6 @@ jar {
     archiveName = "miria-project-test.jar"
     manifest { attributes 'Main-Class': 'cn.com.duiba.miria.project.test.Application' }
 }
-
 configurations {
     all*.exclude group: 'log4j', module: 'log4j'
     all*.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
@@ -134,6 +134,7 @@ uploadArchives {
             }
         }
     }
+    
 }
 task listJars(description: 'Display all compile jars.') << {
     configurations.compile.each { File file -> println file.name }

settings.gradle

 rootProject.name = 'miria-project-test'
 
 
+
+
+
+

test.txt

+git checkout -b dev
+git checkout -b dev