From f46b782bd30d0b0b7c1b8eb95d9da5d03e7fefcc Mon Sep 17 00:00:00 2001
From: XGsimple <xg13219018702@gmail.com>
Date: Sat, 3 Dec 2022 21:33:48 +0800
Subject: [PATCH 1/8] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index af04f191..4f2d59c0 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 = 'leifengyang'
-        GITHUB_ACCOUNT = 'leifengyang'
+        DOCKERHUB_NAMESPACE = 'xg810047429'
+        GITHUB_ACCOUNT = 'XGsimple'
         APP_NAME = 'devops-java-sample'
         SONAR_CREDENTIAL_ID = 'sonar-qube'
     }

From 5b67aad15b2f858cb9df6978d200b6cbfc1a757a Mon Sep 17 00:00:00 2001
From: XGsimple <xg13219018702@gmail.com>
Date: Sat, 3 Dec 2022 22:01:40 +0800
Subject: [PATCH 2/8] Update pom.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新maven 阿里云仓库镜像地址
---
 pom.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pom.xml b/pom.xml
index fe09b5ff..53ea43c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,32 @@
     <artifactId>spring-boot-starter-parent</artifactId>
     <version>2.1.13.RELEASE</version>
   </parent>
+         
+      <!--更新maven 阿里云仓库镜像地址-->
+    <repositories>
+        <repository>
+            <id>spring</id>
+            <url>https://maven.aliyun.com/repository/spring</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring</id>
+            <url>https://maven.aliyun.com/repository/spring</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
 
     <dependencies>
         <dependency>

From 389296f49e49ad1aecbf0dea1d70eb9024ff5611 Mon Sep 17 00:00:00 2001
From: XGsimple <xg13219018702@gmail.com>
Date: Sat, 3 Dec 2022 22:30:01 +0800
Subject: [PATCH 3/8] Update settings.xml

---
 configuration/settings.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/configuration/settings.xml b/configuration/settings.xml
index 9838b7c9..b9639d4b 100644
--- a/configuration/settings.xml
+++ b/configuration/settings.xml
@@ -35,9 +35,10 @@
   </profiles>
   <mirrors>
     <mirror>
-      <id>repo.jenkins-ci.org</id>
-      <url>https://repo.jenkins-ci.org/public/</url>
-      <mirrorOf>m.g.o-public</mirrorOf>
+      <id>nexus-aliyun</id> 
+      <mirrorOf>central</mirrorOf> 
+      <name>Nexus aliyun</name> 
+      <url>http://maven.aliyun.com/nexus/content/groups/public</url> 
     </mirror>
   </mirrors>
 </settings>

From bdc568958324a0ca52c80d3eebf2de25ba5c2be9 Mon Sep 17 00:00:00 2001
From: XGsimple <xg13219018702@gmail.com>
Date: Sat, 3 Dec 2022 22:32:19 +0800
Subject: [PATCH 4/8] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 4f2d59c0..2d34d137 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -27,13 +27,6 @@ pipeline {
             }
         }
 
-        stage ('unit test') {
-            steps {
-                container ('maven') {
-                    sh 'mvn clean -gs `pwd`/configuration/settings.xml test'
-                }
-            }
-        }
 
         stage('sonarqube analysis') {
           steps {

From 80f9f2f1bc484bb5335a3ec0b7ad4749065bfe8c Mon Sep 17 00:00:00 2001
From: XGsimple <xg13219018702@gmail.com>
Date: Sat, 3 Dec 2022 22:47:15 +0800
Subject: [PATCH 5/8] Update pom.xml

---
 pom.xml | 85 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 41 insertions(+), 44 deletions(-)

diff --git a/pom.xml b/pom.xml
index 53ea43c2..8833cc1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,33 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>io.kubesphere.devops</groupId>
-  <artifactId>devops-sample</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <name>devops-sample :: HelloWorld Demo</name>
+    <groupId>io.kubesphere.devops</groupId>
+    <artifactId>devops-sample</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>devops-sample :: HelloWorld Demo</name>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <!-- Sonar -->
-    <!-- The destination file for the code coverage report has to be set to the same value
+        <!-- Sonar -->
+        <!-- The destination file for the code coverage report has to be set to the same value
          in the parent pom and in each module pom. Then JaCoCo will add up information in
          the same report, so that, it will give the cross-module code coverage. -->
-    <sonar.jacoco.reportPaths>${PWD}/./target/jacoco.exec</sonar.jacoco.reportPaths>
-    <sonar.groovy.binaries>target/classes</sonar.groovy.binaries>
-  </properties>
+        <sonar.jacoco.reportPaths>${PWD}/./target/jacoco.exec</sonar.jacoco.reportPaths>
+        <sonar.groovy.binaries>target/classes</sonar.groovy.binaries>
+    </properties>
 
-  <!-- Spring Boot 启动父依赖 -->
-  <parent>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.1.13.RELEASE</version>
-  </parent>
-         
-      <!--更新maven 阿里云仓库镜像地址-->
+    <!-- Spring Boot 启动父依赖 -->
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.1.11.RELEASE</version>
+    </parent>
+    <!--更新maven 阿里云仓库镜像地址-->
     <repositories>
         <repository>
             <id>spring</id>
@@ -61,7 +59,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
         </dependency>
     </dependencies>
 
@@ -72,28 +69,28 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.8.2</version>
                 <configuration>
-                <append>true</append>
+                    <append>true</append>
                 </configuration>
                 <executions>
-                <execution>
-                    <id>agent-for-ut</id>
-                    <goals>
-                    <goal>prepare-agent</goal>
-                    </goals>
-                </execution>
-                <execution>
-                    <id>agent-for-it</id>
-                    <goals>
-                    <goal>prepare-agent-integration</goal>
-                    </goals>
-                </execution>
-                <execution>
-                    <id>jacoco-site</id>
-                    <phase>verify</phase>
-                    <goals>
-                    <goal>report</goal>
-                    </goals>
-                </execution>
+                    <execution>
+                        <id>agent-for-ut</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>agent-for-it</id>
+                        <goals>
+                            <goal>prepare-agent-integration</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-site</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

From b954004e0010b7977a78b35c594aae3daf76a461 Mon Sep 17 00:00:00 2001
From: XGsimple <xg13219018702@gmail.com>
Date: Sat, 3 Dec 2022 22:55:15 +0800
Subject: [PATCH 6/8] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8833cc1f..19b7f74b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
             <plugin>
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.6.0.1398</version>
+                <version>3.7.0.1746</version>
             </plugin>
         </plugins>
     </build>

From b64e916e288789610ddd7e4c5ed7b6281fe8c03e Mon Sep 17 00:00:00 2001
From: XGsimple <xg13219018702@gmail.com>
Date: Sat, 3 Dec 2022 23:03:45 +0800
Subject: [PATCH 7/8] Update pom.xml

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 19b7f74b..0f43f90c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,7 @@
     <name>devops-sample :: HelloWorld Demo</name>
 
     <properties>
+        <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 

From e55c393c1b98f69c7f993fc5b324fd42ae9a48cb Mon Sep 17 00:00:00 2001
From: XGsimple <xg13219018702@gmail.com>
Date: Sat, 3 Dec 2022 23:05:46 +0800
Subject: [PATCH 8/8] Update pom.xml

---
 pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0f43f90c..bf36e267 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>