Merge branch 'dev' into 'master'

调整maven构建镜像

See merge request LucasLu/springboot-k8s-example!1

jenkins/Jenkinsfile

@@ -14,7 +14,7 @@ properties(projectProperties)
 def label = "mypod-${UUID.randomUUID().toString()}"
 
 podTemplate(label: label, cloud: 'kubernetes', containers: [
-            containerTemplate(name: 'maven', image: 'harbor.dev.k2paas.com/build/maven:3-jdk-8-alpine', command: 'cat', ttyEnabled: true),
+            containerTemplate(name: 'maven', image: 'harbor.k2software.com.cn/build/maven:3.6.0-jdk-8', command: 'cat', ttyEnabled: true),
             containerTemplate(name: 'docker', image: 'harbor.dev.k2paas.com/build/docker:latest', command: 'cat', ttyEnabled: true),
             containerTemplate(name: 'kubectl', image: 'harbor.dev.k2paas.com/build/k8s-kubectl:v1.14.0', command: 'cat', ttyEnabled: true)
             ],