From 484fdc2344e0f78219add0ced23d531e0cc0302b Mon Sep 17 00:00:00 2001
From: KoonQi <koonqi1996@gmail.com>
Date: Wed, 6 Sep 2023 00:30:39 +0800
Subject: [PATCH] editted build.yml and pom.xml

---
 .github/workflows/build.yml | 85 +++++++++++++++++++------------------
 pom.xml                     | 16 +++++--
 2 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d1533e62f..35f2c1232 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,59 +3,60 @@ name: Build and Test
 on:
   push:
     branches:
-      - '*'
+      - "*"
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v2
 
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
-      with:
-        java-version: '17'
-        distribution: 'adopt'
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: "17"
+          distribution: "adopt"
 
-    - name: Build with Maven
-      run: mvn clean package
+      - name: Build with Maven
+        run: mvn clean package
 
-    - name: Run tests with Maven
-      run: mvn test
+      - name: Run tests with Maven
+        run: mvn test
 
-    # Store build artifacts for history
-    - name: Archive Build Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: build-artifacts
-        path: target/
+      # Store build artifacts for history
+      - name: Archive Build Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: build-artifacts
+          path: target/
 
-    # Static Code Analysis with Checkstyle (Replace with your preferred tool)
-    - name: Static Code Analysis
-      run: |
-        # Install and run Checkstyle (replace with your tool)
-        # Example: mvn checkstyle:check
-        echo "Run your static code analysis tool here"
+      # Static Code Analysis with Checkstyle
+      - name: Static Code Analysis with Checkstyle
+        run: |
+          # Install and run Checkstyle
+          mvn org.apache.maven.plugins:maven-checkstyle-plugin:3.1.1:checkstyle
 
-    # Store static code analysis reports
-    - name: Archive Static Code Analysis Reports
-      uses: actions/upload-artifact@v2
-      with:
-        name: static-code-analysis-reports
-        path: path/to/static/code/analysis/reports
+          # Run Checkstyle
+          mvn checkstyle:check
 
-    # Code Coverage (Replace with your preferred tool)
-    - name: Code Coverage
-      run: |
-        # Run your code coverage tool here
-        # Example: mvn jacoco:report
-        echo "Run your code coverage tool here"
+      # Store static code analysis reports
+      - name: Archive Static Code Analysis Reports
+        uses: actions/upload-artifact@v2
+        with:
+          name: static-code-analysis-reports
+          path: .github/workflows/reports/checkstyle/
 
-    # Store code coverage reports
-    - name: Archive Code Coverage Reports
-      uses: actions/upload-artifact@v2
-      with:
-        name: code-coverage-reports
-        path: path/to/code/coverage/reports
+      # Code Coverage
+      - name: Code Coverage
+        run: |
+          # Run JaCoCo report generation
+            mvn jacoco:report
+
+      # Store code coverage reports
+      - name: Archive Code Coverage Reports
+        uses: actions/upload-artifact@v2
+        with:
+          name: code-coverage-reports
+          path: .github/workflows/reports/jacoco/
diff --git a/pom.xml b/pom.xml
index ce92ea579..f1c226cae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.samples</groupId>
   <artifactId>spring-petclinic</artifactId>
@@ -33,6 +35,10 @@
     <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
     <spring-format.version>0.0.39</spring-format.version>
 
+    <!-- ... other properties ... -->
+    <testcontainers.version>1.16.3</testcontainers.version>
+
+
   </properties>
 
   <dependencies>
@@ -166,7 +172,8 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <message>This build requires at least Java ${java.version}, update your JVM, and run the build again</message>
+                  <message>This build requires at least Java ${java.version}, update your JVM, and
+                    run the build again</message>
                   <version>${java.version}</version>
                 </requireJavaVersion>
               </rules>
@@ -370,7 +377,8 @@
             <configuration>
               <inputPath>${basedir}/src/main/scss/</inputPath>
               <outputPath>${basedir}/src/main/resources/static/resources/css/</outputPath>
-              <includePath>${project.build.directory}/webjars/META-INF/resources/webjars/bootstrap/${webjars-bootstrap.version}/scss/</includePath>
+              <includePath>
+                ${project.build.directory}/webjars/META-INF/resources/webjars/bootstrap/${webjars-bootstrap.version}/scss/</includePath>
             </configuration>
           </plugin>
         </plugins>
@@ -444,4 +452,4 @@
     </profile>
   </profiles>
 
-</project>
+</project>
\ No newline at end of file