From 39c3493ee924f8dae2c4c8416912c8a7341cdd7e Mon Sep 17 00:00:00 2001
From: LyonLee <layxcn@gmail.com>
Date: Fri, 27 Nov 2020 15:35:42 +0800
Subject: [PATCH 1/4] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index a6df2ead1..4ef59922a 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -10,12 +10,12 @@ pipeline {
     }
 
     environment {
-        DOCKER_CREDENTIAL_ID = 'dockerhub-id'
-        GITHUB_CREDENTIAL_ID = 'github-id'
-        KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
+        DOCKER_CREDENTIAL_ID = 'layxcn-docker-hub'
+        GITHUB_CREDENTIAL_ID = 'layxcn-github'
+        KUBECONFIG_CREDENTIAL_ID = 'cicd-kubeconfig'
         REGISTRY = 'docker.io'
-        DOCKERHUB_NAMESPACE = 'docker_username'
-        GITHUB_ACCOUNT = 'kubesphere'
+        DOCKERHUB_NAMESPACE = 'layxcn'
+        GITHUB_ACCOUNT = 'layxcn'
         APP_NAME = 'devops-java-sample'
     }
 

From 8ad0ec1a29afbb9e94f990afc6a8d251de0a3115 Mon Sep 17 00:00:00 2001
From: LyonLee <layxcn@gmail.com>
Date: Fri, 27 Nov 2020 15:36:07 +0800
Subject: [PATCH 2/4] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 4ef59922a..95530099f 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -15,7 +15,7 @@ pipeline {
         KUBECONFIG_CREDENTIAL_ID = 'cicd-kubeconfig'
         REGISTRY = 'docker.io'
         DOCKERHUB_NAMESPACE = 'layxcn'
-        GITHUB_ACCOUNT = 'layxcn'
+        GITHUB_ACCOUNT = 'LyonLee'
         APP_NAME = 'devops-java-sample'
     }
 

From d65b4ca8a2a009a794dccb6864349d5d028049cc Mon Sep 17 00:00:00 2001
From: LyonLee <layxcn@gmail.com>
Date: Fri, 27 Nov 2020 16:27:37 +0800
Subject: [PATCH 3/4] Update Jenkinsfile-online

---
 Jenkinsfile-online | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 95530099f..ff4244d27 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -26,14 +26,6 @@ pipeline {
             }
         }
 
-        stage ('unit test') {
-            steps {
-                container ('maven') {
-                    sh 'mvn clean -o -gs `pwd`/configuration/settings.xml test'
-                }
-            }
-        }
-
         stage ('build & push') {
             steps {
                 container ('maven') {

From df2e0acd1827808efc70af46241c6ab3864ca8a8 Mon Sep 17 00:00:00 2001
From: LyonLee <layxcn@gmail.com>
Date: Fri, 27 Nov 2020 16:33:43 +0800
Subject: [PATCH 4/4] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 34b527473..6e24b9b1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+                 <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -106,4 +106,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>