upgrade jar version

disjob-admin/pom.xml

@@ -43,7 +43,7 @@
     <pagehelper-spring-boot-starter.version>1.4.7</pagehelper-spring-boot-starter.version>
     <fastjson.version>1.2.83</fastjson.version>
     <oshi-core.version>6.5.0</oshi-core.version>
-    <commons-io.version>2.15.1</commons-io.version>
+    <commons-io.version>2.16.0</commons-io.version>
     <poi-ooxml.version>5.2.5</poi-ooxml.version>
     <velocity-engine-core.version>2.3</velocity-engine-core.version>
     <springdoc-openapi-ui.version>1.8.0</springdoc-openapi-ui.version>

disjob-core/src/main/java/cn/ponfee/disjob/core/base/Server.java

@@ -43,6 +43,8 @@ public abstract class Server implements Serializable {
 
     protected Server(String host, int port) {
         Assert.isTrue(!host.contains(Str.COLON), "Host cannot contains symbol ':'");
+        // -1 for test case
+        Assert.isTrue(-1 <= port && port <= 65535, "Port must be range [-1, 65535].");
         this.host = host;
         this.port = port;
     }

disjob-core/src/main/java/cn/ponfee/disjob/core/base/Supervisor.java

@@ -51,7 +51,6 @@ public class Supervisor extends Server {
     public Supervisor(String host, int port) {
         super(host, port);
 
-        Assert.isTrue(!host.contains(COLON), "Host cannot contains symbol ':'");
         this.serializedValue = host + COLON + port;
     }
 
@@ -127,7 +126,7 @@ public Supervisor deserialize(JsonParser p, DeserializationContext ctx) throws I
         }
     }
 
-    // -------------------------------------------------------------------------------class
+    // -------------------------------------------------------------------------------current Supervisor
 
     /**
      * Supervisor.class.getDeclaredClasses()[0]

disjob-core/src/main/java/cn/ponfee/disjob/core/base/SupervisorRpcService.java

@@ -74,8 +74,13 @@ public interface SupervisorRpcService {
     @PostMapping("/publish")
     void publish(EventParam param);
 
-    // ---------------------------------------------------------------------------savepoint
-
+    /**
+     * Savepoint the task execution snapshot data
+     *
+     * @param taskId          the taskId
+     * @param executeSnapshot the execution snapshot data
+     * @throws Exception if occur exception
+     */
     @PostMapping("/task/savepoint")
     void savepoint(long taskId, String executeSnapshot) throws Exception;
 

disjob-core/src/main/java/cn/ponfee/disjob/core/base/Worker.java

@@ -81,7 +81,6 @@ public Worker(String group, String workerId, String host, int port) {
 
         Assert.isTrue(!group.contains(COLON), "Group cannot contains symbol ':'");
         Assert.isTrue(!workerId.contains(COLON), "Worker id cannot contains symbol ':'");
-        Assert.isTrue(!host.contains(COLON), "Host cannot contains symbol ':'");
         this.group = Strings.requireNonBlank(group.trim());
         this.workerId = workerId;
 
@@ -205,7 +204,7 @@ public Worker deserialize(JsonParser p, DeserializationContext ctx) throws IOExc
         }
     }
 
-    // -------------------------------------------------------------------------------class
+    // -------------------------------------------------------------------------------current Worker
 
     public abstract static class Current extends Worker {
         private static final long serialVersionUID = -480329874106279202L;

disjob-dispatch/disjob-dispatch-redis/src/main/java/cn/ponfee/disjob/dispatch/redis/RedisTaskDispatcher.java

@@ -66,7 +66,8 @@ protected final boolean doDispatch(ExecuteTaskParam param) {
         Long ret = redisTemplate.execute((RedisCallback<Long>) conn -> conn.rPush(key.getBytes(), param.serialize()));
 
         // renew redis key ttl
-        workerRenewMap.computeIfAbsent(key, k -> new RedisKeyRenewal(redisTemplate, key)).renewIfNecessary();
+        workerRenewMap.computeIfAbsent(key, k -> new RedisKeyRenewal(redisTemplate, key))
+                      .renewIfNecessary();
 
         return (ret != null && ret > 0);
     }

disjob-registry/disjob-registry-nacos/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>com.alibaba.nacos</groupId>
       <artifactId>nacos-client</artifactId>
-      <version>2.3.1</version>
+      <version>2.3.2</version>
     </dependency>
 
     <dependency>

disjob-supervisor/src/test/java/cn/ponfee/disjob/supervisor/SpringBootTestCollector.java

@@ -50,7 +50,8 @@ public class SpringBootTestCollector {
     }
 
     public static void collect(ApplicationContext applicationContext, Class<?> testClasses) {
-        TEST_CLASSES_MAP.computeIfAbsent(applicationContext, k -> ConcurrentHashMap.newKeySet()).add(testClasses);
+        TEST_CLASSES_MAP.computeIfAbsent(applicationContext, k -> ConcurrentHashMap.newKeySet())
+                        .add(testClasses);
     }
 
 }

disjob-supervisor/src/test/resources/application.yml

@@ -1,4 +1,5 @@
-server.port: 0
+# -1: 单元测试时关闭HTTP端点；0: 自动寻找一个空闲的端口；${random.int[1,65535]}: 随机端口但可能会有端口冲突；
+server.port: -1
 
 # database configuration
 disjob.datasource:

pom.xml

@@ -76,7 +76,7 @@
     <mapstruct.version>1.5.5.Final</mapstruct.version>
     <guava.version>33.1.0-jre</guava.version>
     <commons-collections4.version>4.4</commons-collections4.version>
-    <commons-io.version>2.15.1</commons-io.version>
+    <commons-io.version>2.16.0</commons-io.version>
     <mybatis-spring-boot-starter.version>2.3.2</mybatis-spring-boot-starter.version>
     <jna-platform.version>5.14.0</jna-platform.version>
     <curator-recipes.version>5.6.0</curator-recipes.version>
@@ -98,8 +98,8 @@
     <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
 
     <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
-    <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
-    <maven-gpg-plugin.version>3.2.1</maven-gpg-plugin.version>
+    <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
+    <maven-gpg-plugin.version>3.2.2</maven-gpg-plugin.version>
   </properties>
 
   <dependencyManagement>