From a5020eb059e1fea76e31caa1aca199de708a1294 Mon Sep 17 00:00:00 2001
From: vrchary <vrchary@163.com>
Date: Tue, 22 Sep 2020 16:05:19 +0800
Subject: [PATCH 1/4] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index a6df2ead..92fe2fe0 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -14,8 +14,8 @@ pipeline {
         GITHUB_CREDENTIAL_ID = 'github-id'
         KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
-        DOCKERHUB_NAMESPACE = 'docker_username'
-        GITHUB_ACCOUNT = 'kubesphere'
+        DOCKERHUB_NAMESPACE = 'vrchary'
+        GITHUB_ACCOUNT = 'vrchary@163.com'
         APP_NAME = 'devops-java-sample'
     }
 

From d9b0e3bd1f6a711ffe17e33fbb5c8c66e7750cf4 Mon Sep 17 00:00:00 2001
From: vrchary <vrchary@163.com>
Date: Tue, 22 Sep 2020 16:12:31 +0800
Subject: [PATCH 2/4] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 92fe2fe0..da5dca9b 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -29,7 +29,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'
                 }
             }
         }
@@ -37,7 +37,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 d12169f72ceda455883769219da01849a75fad26 Mon Sep 17 00:00:00 2001
From: vrchary <vrchary@163.com>
Date: Wed, 30 Sep 2020 17:28:45 +0800
Subject: [PATCH 3/4] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index da5dca9b..83545049 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -15,7 +15,7 @@ pipeline {
         KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
         DOCKERHUB_NAMESPACE = 'vrchary'
-        GITHUB_ACCOUNT = 'vrchary@163.com'
+        GITHUB_ACCOUNT = 'vrchary'
         APP_NAME = 'devops-java-sample'
     }
 

From dca1e52bf64bba9c6d5550c4aa585c22b4375f57 Mon Sep 17 00:00:00 2001
From: vrchary <vrchary@163.com>
Date: Sat, 3 Oct 2020 21:21:21 +0800
Subject: [PATCH 4/4] Update pom.xml

---
 pom.xml | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index 69717e7e..fe09b5ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,31 +24,9 @@
   <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>
             <groupId>org.springframework.boot</groupId>
@@ -106,4 +84,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>