From d6e334c05ed9a1531f405de3a4f3b8132af74a9d Mon Sep 17 00:00:00 2001
From: xiaoandedaqingdiao <32285854+AssumeJson@users.noreply.github.com>
Date: Thu, 5 Nov 2020 18:03:08 +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 a6df2ead1..591ca5282 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 = 'xiaoandedaqingdiao'
+        GITHUB_ACCOUNT = 'AssumeJson'
         APP_NAME = 'devops-java-sample'
+        SONAR_CREDENTIAL_ID = 'sonar-qube'
     }
 
     stages {

From 9aa45a7f4da011b263e6528e33f6b277aa0797d5 Mon Sep 17 00:00:00 2001
From: xiaoandedaqingdiao <32285854+AssumeJson@users.noreply.github.com>
Date: Thu, 5 Nov 2020 18:06:08 +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 591ca5282..4b84e66f4 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 328d06b1ef62d422dc2465b4689d7108de0e62b8 Mon Sep 17 00:00:00 2001
From: xiaoandedaqingdiao <32285854+AssumeJson@users.noreply.github.com>
Date: Fri, 13 Nov 2020 13:17:30 +0800
Subject: [PATCH 3/3] Update Jenkinsfile-online

---
 Jenkinsfile-online | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 4b84e66f4..ebb0c9cfb 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -17,7 +17,7 @@ pipeline {
         DOCKERHUB_NAMESPACE = 'xiaoandedaqingdiao'
         GITHUB_ACCOUNT = 'AssumeJson'
         APP_NAME = 'devops-java-sample'
-        SONAR_CREDENTIAL_ID = 'sonar-qube'
+        SONAR_CREDENTIAL_ID = 'sonar-token'
     }
 
     stages {