From 2251384edcc0cb2116d4f93a4e0221d1b1cdd58d Mon Sep 17 00:00:00 2001
From: "chen.ma" <machen@apache.org>
Date: Wed, 5 Jun 2024 12:24:40 +0800
Subject: [PATCH 1/6] Upgrade the lombok version

---
 agent/pom.xml | 2 +-
 pom.xml       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/agent/pom.xml b/agent/pom.xml
index 0d899eab..51369a1e 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -23,7 +23,7 @@
         <junit.version>4.13.1</junit.version>
         <powermock.version>2.0.7</powermock.version>
         <mockito-core.version>3.5.13</mockito-core.version>
-        <lombok.version>1.18.20</lombok.version>
+        <lombok.version>1.18.30</lombok.version>
 
         <!-- core lib dependency -->
         <bytebuddy.version>1.12.13</bytebuddy.version>
diff --git a/pom.xml b/pom.xml
index d63fbf73..b19ebf78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
         <revision>2.0.0-SNAPSHOT</revision>
         <mockito.version>3.12.4</mockito.version>
         <java.version>1.8</java.version>
+        <lombok.version>1.18.30</lombok.version>
         <skip.maven.gpg.plugin>true</skip.maven.gpg.plugin>
         <skip.spotless.apply>false</skip.spotless.apply>
         <skip.checkstyle.check>true</skip.checkstyle.check>
@@ -82,6 +83,11 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
             <dependency>
                 <groupId>cn.hippo4j</groupId>
                 <artifactId>hippo4j-dependencies</artifactId>

From 0853eb6896548bcf4d8a172abc34f8820b0b2dda Mon Sep 17 00:00:00 2001
From: "chen.ma" <machen@apache.org>
Date: Wed, 5 Jun 2024 12:40:29 +0800
Subject: [PATCH 2/6] Upgrade the maven version

---
 agent/pom.xml | 2 +-
 pom.xml       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/agent/pom.xml b/agent/pom.xml
index 51369a1e..eb04ef77 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -48,7 +48,7 @@
         <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
         <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
         <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
-        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
         <maven-resource-plugin.version>3.1.0</maven-resource-plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <versions-maven-plugin.version>2.5</versions-maven-plugin.version>
diff --git a/pom.xml b/pom.xml
index b19ebf78..7083f587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
         <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
+        <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
         <maven.javadoc.plugin.version>3.0.0</maven.javadoc.plugin.version>
         <maven.source.plugin.version>3.0.1</maven.source.plugin.version>
         <maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
@@ -120,7 +120,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven.compiler.plugin.version}</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>

From f04fc5038ad2a52ae81767110879e8ed20c8dbec Mon Sep 17 00:00:00 2001
From: "chen.ma" <machen@apache.org>
Date: Wed, 5 Jun 2024 13:03:23 +0800
Subject: [PATCH 3/6] Fix unit test error

---
 agent/pom.xml | 10 +++++++++-
 pom.xml       | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/agent/pom.xml b/agent/pom.xml
index eb04ef77..fb096a5a 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -48,7 +48,8 @@
         <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
         <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
         <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
-        <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
         <maven-resource-plugin.version>3.1.0</maven-resource-plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <versions-maven-plugin.version>2.5</versions-maven-plugin.version>
@@ -266,6 +267,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7083f587..1f07463f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,8 @@
         <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
         <maven.javadoc.plugin.version>3.0.0</maven.javadoc.plugin.version>
         <maven.source.plugin.version>3.0.1</maven.source.plugin.version>
         <maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
@@ -301,6 +302,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <trimStackTrace>false</trimStackTrace>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

From 9f3013a86acd959bbfa475d85b82dcfd520eb4c3 Mon Sep 17 00:00:00 2001
From: "chen.ma" <machen@apache.org>
Date: Wed, 5 Jun 2024 13:14:08 +0800
Subject: [PATCH 4/6] Fix unit test error

---
 agent/pom.xml | 4 ++--
 pom.xml       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/agent/pom.xml b/agent/pom.xml
index fb096a5a..8eddbd8f 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -48,8 +48,8 @@
         <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
         <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
         <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
-        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
         <maven-resource-plugin.version>3.1.0</maven-resource-plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <versions-maven-plugin.version>2.5</versions-maven-plugin.version>
diff --git a/pom.xml b/pom.xml
index 1f07463f..2701d7ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,8 +67,8 @@
         <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
         <maven.javadoc.plugin.version>3.0.0</maven.javadoc.plugin.version>
         <maven.source.plugin.version>3.0.1</maven.source.plugin.version>
         <maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>

From 31ec33b6d690c493215fde3ed0bf8a2cf37d6bfc Mon Sep 17 00:00:00 2001
From: "chen.ma" <machen@apache.org>
Date: Wed, 5 Jun 2024 13:20:53 +0800
Subject: [PATCH 5/6] Fix unit test error

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff473387..03104228 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
             version: 17
           }
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build with Maven
         run: echo y | mvn clean install -Dskip.gpg=true -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true
 
@@ -71,15 +71,15 @@ jobs:
     name: Test coverage report
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache Maven Repos
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: hippo4j-maven-third-party-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             hippo4j-maven-third-party-
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 8

From e737629770e1089bda9ba615a7aaaf58ff51ca71 Mon Sep 17 00:00:00 2001
From: "chen.ma" <machen@apache.org>
Date: Wed, 5 Jun 2024 13:27:13 +0800
Subject: [PATCH 6/6] Fix unit test error

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

diff --git a/pom.xml b/pom.xml
index 2701d7ae..5f0776d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
         <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
         <maven.javadoc.plugin.version>3.0.0</maven.javadoc.plugin.version>
         <maven.source.plugin.version>3.0.1</maven.source.plugin.version>