Merge branch 'master' into patch-44

alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java

@@ -61,7 +61,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-
 /**
  * Calculate alarms based on the alarm definition rules and collected data
  */

pom.xml

@@ -101,7 +101,7 @@
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-pmd-plugin.version>3.21.0</maven-pmd-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!--hertzbeat related modules-->
+        <!-- hertzbeat related modules -->
         <hertzbeat.version>2.0-SNAPSHOT</hertzbeat.version>
 
         <springdoc.version>2.3.0</springdoc.version>
@@ -325,14 +325,14 @@
                 <artifactId>iotdb-session</artifactId>
                 <version>${iotdb-session.version}</version>
             </dependency>
-            <!-- h2 database-->
+            <!-- h2 database -->
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
                 <version>${h2.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <!--sureness-->
+            <!-- sureness -->
             <dependency>
                 <groupId>com.usthe.sureness</groupId>
                 <artifactId>spring-boot3-starter-sureness</artifactId>
@@ -343,7 +343,7 @@
                 <artifactId>nekohtml</artifactId>
                 <version>${nekohtml.version}</version>
             </dependency>
-            <!--json path parser-->
+            <!-- json path parser-->
             <dependency>
                 <groupId>com.jayway.jsonpath</groupId>
                 <artifactId>json-path</artifactId>
@@ -378,14 +378,14 @@
                 <artifactId>okhttp</artifactId>
                 <version>${okhttp.version}</version>
             </dependency>
-            <!-- caffeine-->
+            <!-- caffeine -->
             <dependency>
                 <groupId>com.github.ben-manes.caffeine</groupId>
                 <artifactId>caffeine</artifactId>
-                <!-- 3.x版本支持Java11及以上, 因此这边还是使用2.x的版本-->
+                <!-- The 3.x version supports Java 11 and above, so the 2.x version is still used -->
                 <version>${caffeine.version}</version>
             </dependency>
-            <!--  通用集合操作  -->
+            <!--  Generic collection operations  -->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-collections4</artifactId>