From ead8d72b55bbc9593ee56e875f00aa4dd1dac0c6 Mon Sep 17 00:00:00 2001
From: Bruce Shan <shancf@126.com>
Date: Sat, 31 Oct 2020 17:00:05 +0800
Subject: [PATCH 1/3] Update Jenkinsfile-online

---
 Jenkinsfile-online | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index a6df2ead..e2e4341c 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -14,9 +14,10 @@ pipeline {
         GITHUB_CREDENTIAL_ID = 'github-id'
         KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
-        DOCKERHUB_NAMESPACE = 'docker_username'
-        GITHUB_ACCOUNT = 'kubesphere'
+        DOCKERHUB_NAMESPACE = 'shancf'
+        GITHUB_ACCOUNT = 'shancf'
         APP_NAME = 'devops-java-sample'
+        SONAR_CREDENTIAL_ID = 'sonar-qube'
     }
 
     stages {

From bb3ee048ff87b9e30efe31ad17619710c0f2e7d3 Mon Sep 17 00:00:00 2001
From: Bruce Shan <shancf@126.com>
Date: Sat, 31 Oct 2020 17:03:55 +0800
Subject: [PATCH 2/3] Update Jenkinsfile-online

---
 Jenkinsfile-online | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index e2e4341c..a11fb4f7 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -30,7 +30,7 @@ pipeline {
         stage ('unit test') {
             steps {
                 container ('maven') {
-                    sh 'mvn clean -o -gs `pwd`/configuration/settings.xml test'
+                    sh 'mvn clean -gs `pwd`/configuration/settings.xml test'
                 }
             }
         }
@@ -38,7 +38,7 @@ pipeline {
         stage ('build & push') {
             steps {
                 container ('maven') {
-                    sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package'
+                    sh 'mvn  -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package'
                     sh 'docker build -f Dockerfile-online -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'
                     withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "$DOCKER_CREDENTIAL_ID" ,)]) {
                         sh 'echo "$DOCKER_PASSWORD" | docker login $REGISTRY -u "$DOCKER_USERNAME" --password-stdin'

From fc4d4ecc6a1e96f8911f6337416258c99ac5060f Mon Sep 17 00:00:00 2001
From: Bruce Shan <shancf@126.com>
Date: Thu, 5 Nov 2020 10:41:39 +0800
Subject: [PATCH 3/3] Update pom.xml

---
 pom.xml | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 69717e7e..8d0830e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,30 +24,10 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.4.1.BUILD-SNAPSHOT</version>
+    <version>2.1.13.RELEASE</version>
   </parent>
 
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <url>http://repo.spring.io/snapshot</url>
-            <snapshots><enabled>true</enabled></snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <url>http://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <url>http://repo.spring.io/snapshot</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <url>http://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
+     
 
     <dependencies>
         <dependency>
@@ -106,4 +86,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>