From f8d64feedadef38f06e7e2a4039db7f4e3ddb9d2 Mon Sep 17 00:00:00 2001
From: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Date: Mon, 13 Apr 2026 06:23:19 +0000
Subject: [PATCH] chore: update

---
 .devcontainer/Dockerfile   | 15 ++--------
 .gitea/workflows/test.yaml | 16 +++++------
 account-service/pom.xml    |  8 ++----
 eatery-service/pom.xml     |  8 ++----
 gateway-service/pom.xml    |  8 ++----
 pom.xml                    | 57 ++++----------------------------------
 6 files changed, 23 insertions(+), 89 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index cdc7730..6176ad9 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -12,13 +12,11 @@ RUN sed -i 's|http://archive.ubuntu.com|https://apt.demonkernel.io.vn|g' /etc/ap
 RUN apt-get update --fix-missing && apt-get install --no-install-recommends --no-install-suggests -y \
     curl \
     bash \
-    build-essential \
-    docker-buildx \
     git \
     docker.io \
     nodejs \
-    maven \
-    libz-dev
+    openjdk-25-jdk-headless \
+    maven 
     
 # 5. Cấu hình Git
 RUN git config --global --add safe.directory '*'
@@ -30,15 +28,6 @@ RUN curl -fsSL https://get.pnpm.io/install.sh | bash -
 RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \
     && install -m 0755 kubectl /usr/local/bin/kubectl
 
-# 4. Cài đặt Mandrel 25
-# Lưu ý: Dùng bản linux-amd64 (glibc) tiêu chuẩn cho Ubuntu
-ENV JAVA_HOME=/usr/lib/jvm/mandrel
-ENV GRAALVM_HOME=/usr/lib/jvm/mandrel
-ENV PATH="${JAVA_HOME}/bin:${PATH}"
-
-RUN mkdir -p ${JAVA_HOME} && \
-    curl -L https://github.com/graalvm/mandrel/releases/download/mandrel-25.0.2.0-Final/mandrel-java25-linux-amd64-25.0.2.0-Final.tar.gz | tar -xz -C ${JAVA_HOME} --strip-components=1
-
 # 6. Cài đặt JBang & Quarkus CLI
 ENV JBANG_DIR="/root/.jbang"
 ENV PATH="${JBANG_DIR}/bin:${PATH}"
diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml
index 8b29e5c..e2e7fda 100644
--- a/.gitea/workflows/test.yaml
+++ b/.gitea/workflows/test.yaml
@@ -38,13 +38,11 @@ jobs:
           ./mvnw -B install \
             -Dquarkus.container-image.push=false \
 
-      - name: Jacoco Report to PR
-        uses: madrapps/jacoco-report@v1.7.2
-        if: always()
+      - name: Publish Test Report
+        uses: dorny/test-reporter@v3
+        if: always() 
         with:
-          paths: |
-            ./**/jacoco.xml,
-          token: ${{ secrets.ACCESS_TOKEN }}
-          min-coverage-overall: 40
-          min-coverage-changed-files: 60
-          title: "📊 Báo cáo Độ bao phủ Kiểm thử (Test Coverage)"
+          name: "JUnit Tests Report"
+          path: "**/target/surefire-reports/*.xml"
+          reporter: java-junit
+          fail-on-error: true
diff --git a/account-service/pom.xml b/account-service/pom.xml
index e8188db..6513cce 100644
--- a/account-service/pom.xml
+++ b/account-service/pom.xml
@@ -46,11 +46,6 @@
     </dependencyManagement>
 
     <dependencies>
-    <dependency>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-jacoco</artifactId>
-        <scope>test</scope>
-    </dependency>
         <dependency>
             <groupId>com.drinkool</groupId>
             <artifactId>lib</artifactId>
@@ -140,6 +135,9 @@
 						>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
+                    <forkCount>1</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/eatery-service/pom.xml b/eatery-service/pom.xml
index 6707b2f..ab26a8e 100644
--- a/eatery-service/pom.xml
+++ b/eatery-service/pom.xml
@@ -46,11 +46,6 @@
     </dependencyManagement>
 
     <dependencies>
-    <dependency>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-jacoco</artifactId>
-        <scope>test</scope>
-    </dependency>
         <dependency>
             <groupId>com.drinkool</groupId>
             <artifactId>lib</artifactId>
@@ -126,6 +121,9 @@
 						>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
+                    <forkCount>1</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/gateway-service/pom.xml b/gateway-service/pom.xml
index bcdd45b..ae64cd8 100644
--- a/gateway-service/pom.xml
+++ b/gateway-service/pom.xml
@@ -46,11 +46,6 @@
     </dependencyManagement>
 
     <dependencies>
-    <dependency>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-jacoco</artifactId>
-        <scope>test</scope>
-    </dependency>
         <dependency>
             <groupId>org.bitbucket.b_c</groupId>
             <artifactId>jose4j</artifactId>
@@ -118,6 +113,9 @@
 						>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
+                    <forkCount>1</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/pom.xml b/pom.xml
index 7fe008e..88772b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+	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 https://maven.apache.org/xsd/maven-4.0.0.xsd"
 >
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.drinkool</groupId>
@@ -32,53 +32,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-jacoco</artifactId>
-        <scope>test</scope>
-        <version>${quarkus.platform.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire-plugin.version}</version>
-        <configuration>
-          <systemPropertyVariables>
-            <quarkus.jacoco.data-file>target/jacoco.exec</quarkus.jacoco.data-file>
-            <quarkus.jacoco.reuse-data-file>true</quarkus.jacoco.reuse-data-file>
-            <quarkus.jacoco.report-location>target/jacoco-report</quarkus.jacoco.report-location>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.14</version>
-        <executions>
-          <execution>
-            <id>prepare-agent</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>report</id>
-            <phase>test</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-            <configuration>
-              <formats>
-                <format>XML</format>
-              </formats>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
+</project>