From 07af6b082d0a92723283b40625ae71f1a1b1e2f8 Mon Sep 17 00:00:00 2001
From: "434986225@qq.com" <33111094+junesly@users.noreply.github.com>
Date: Thu, 6 Aug 2020 14:24:00 +0800
Subject: [PATCH 1/2] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index dec0cebff..dcf1d66d9 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -14,10 +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 = 'junerly'
+        GITHUB_ACCOUNT = 'junesly'
         APP_NAME = 'devops-java-sample'
-        SONAR_CREDENTIAL_ID = 'sonar-token'
+        SONAR_CREDENTIAL_ID = 'sonar-qube'
     }
 
     stages {

From 017bfd3961b4c222e778760f2ec73b7b86798fef Mon Sep 17 00:00:00 2001
From: "434986225@qq.com" <33111094+junesly@users.noreply.github.com>
Date: Thu, 6 Aug 2020 14:26:02 +0800
Subject: [PATCH 2/2] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index dcf1d66d9..27ee47cfd 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'
                 }
             }
         }
@@ -40,7 +40,7 @@ pipeline {
             container ('maven') {
               withCredentials([string(credentialsId: "$SONAR_CREDENTIAL_ID", variable: 'SONAR_TOKEN')]) {
                 withSonarQubeEnv('sonar') {
-                 sh "mvn sonar:sonar -o -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.login=$SONAR_TOKEN"
+                 sh "mvn sonar:sonar -gs `pwd`/configuration/settings.xml -Dsonar.branch=$BRANCH_NAME -Dsonar.login=$SONAR_TOKEN"
                 }
               }
               timeout(time: 1, unit: 'HOURS') {
@@ -53,7 +53,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'