diff --git a/pom.xml b/pom.xml index c37ce8da3..3e8fb4614 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ 1.2.17 1.2 3.0.2 + 32.0.0-jre @@ -149,6 +150,11 @@ guava-retrying ${guava-retrying.version} + + com.google.guava + guava + ${guava.version} + org.jboss.logging jboss-logging diff --git a/snail-job-client/snail-job-client-common/pom.xml b/snail-job-client/snail-job-client-common/pom.xml index 0df44b44e..76d4a030e 100644 --- a/snail-job-client/snail-job-client-common/pom.xml +++ b/snail-job-client/snail-job-client-common/pom.xml @@ -56,8 +56,21 @@ com.github.rholder guava-retrying + + + guava + com.google.guava + + + jsr305 + com.google.code.findbugs + + + + + com.google.guava + guava - com.aizuda snail-job-common-log diff --git a/snail-job-client/snail-job-client-job-core/pom.xml b/snail-job-client/snail-job-client-job-core/pom.xml index 7e507ee4b..520344c20 100644 --- a/snail-job-client/snail-job-client-job-core/pom.xml +++ b/snail-job-client/snail-job-client-job-core/pom.xml @@ -18,7 +18,6 @@ 17 17 UTF-8 - 32.0.0-jre @@ -50,11 +49,6 @@ com.google.guava guava - ${guava.version} - - - org.springframework.boot - spring-boot-starter-validation diff --git a/snail-job-client/snail-job-client-retry-core/pom.xml b/snail-job-client/snail-job-client-retry-core/pom.xml index bf48385a8..957cc47ce 100644 --- a/snail-job-client/snail-job-client-retry-core/pom.xml +++ b/snail-job-client/snail-job-client-retry-core/pom.xml @@ -24,6 +24,10 @@ spring-boot-starter-web provided + + com.google.guava + guava + org.springframework.boot spring-boot-starter-aop @@ -58,10 +62,6 @@ provided true - - io.netty - netty-all - com.aizuda snail-job-common-server-api diff --git a/snail-job-common/snail-job-common-client-api/pom.xml b/snail-job-common/snail-job-common-client-api/pom.xml index f66d48b25..6d1a65909 100644 --- a/snail-job-common/snail-job-common-client-api/pom.xml +++ b/snail-job-common/snail-job-common-client-api/pom.xml @@ -21,11 +21,6 @@ - - org.springframework.boot - spring-boot-starter-validation - provided - org.projectlombok diff --git a/snail-job-common/snail-job-common-core/pom.xml b/snail-job-common/snail-job-common-core/pom.xml index 897396165..14f1fd271 100644 --- a/snail-job-common/snail-job-common-core/pom.xml +++ b/snail-job-common/snail-job-common-core/pom.xml @@ -31,11 +31,6 @@ lombok true - - commons-configuration - commons-configuration - 1.10 - cn.hutool hutool-http diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/DingDingUtils.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/DingDingUtils.java index 6742f4b26..7aa2128ae 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/DingDingUtils.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/DingDingUtils.java @@ -54,6 +54,7 @@ public class DingDingUtils { return text; } StringBuilder sb = new StringBuilder(text); + sb.append(StrUtil.CRLF); ats.stream().filter(StrUtil::isNotBlank) .forEach(at -> sb.append(MessageFormat.format(atLabel, at))); return sb.toString(); diff --git a/snail-job-common/snail-job-common-server-api/pom.xml b/snail-job-common/snail-job-common-server-api/pom.xml index 4d61c6072..e456ef963 100644 --- a/snail-job-common/snail-job-common-server-api/pom.xml +++ b/snail-job-common/snail-job-common-server-api/pom.xml @@ -30,12 +30,6 @@ com.aizuda snail-job-common-core - - org.springframework.boot - spring-boot-starter-validation - provided - -