Skip to content

The Unified and Autonomous Development Platform

chore: Various improvements and bug fixes

Robin Shen6ca51aa5bded
diff --git a/pom.xml b/pom.xml
index d063129525..e24188fe79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -681,8 +681,8 @@
</repository>
</repositories>
<properties>
- <commons.version>3.3.6</commons.version>
- <agent.version>3.0.2</agent.version>
+ <commons.version>3.3.7</commons.version>
+ <agent.version>3.0.6</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/util/KubernetesUtils.java b/server-core/src/main/java/io/onedev/server/util/KubernetesUtils.java
index f4391f0f38..9e620f4ad1 100644
--- a/server-core/src/main/java/io/onedev/server/util/KubernetesUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/KubernetesUtils.java
@@ -1,6 +1,7 @@
package io.onedev.server.util;
import static io.onedev.k8shelper.KubernetesHelper.ENV_SERVER_URL;
+import static io.onedev.k8shelper.KubernetesHelper.unescapeStartCR;
import static io.onedev.k8shelper.Test.TEST_PATH;
import static io.onedev.server.util.CollectionUtils.newLinkedHashMap;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -220,17 +221,17 @@ public final class KubernetesUtils {
thread.interrupt();
}
} else if (line.contains(" ")) {
- String timestamp = StringUtils.substringBefore(line, " ");
+ var timestamp = StringUtils.substringBefore(line, " ");
try {
Instant instant = Instant.from(DateTimeFormatter.ISO_INSTANT.parse(timestamp));
if (lastInstantRef.get() == null || lastInstantRef.get().isBefore(instant))
lastInstantRef.set(instant);
- taskLogger.log(StringUtils.substringAfter(line, " "), sessionId);
+ taskLogger.log(unescapeStartCR(StringUtils.substringAfter(line, " ")), sessionId);
} catch (DateTimeParseException e) {
- taskLogger.log(line, sessionId);
+ taskLogger.log(unescapeStartCR(line), sessionId);
}
} else {
- taskLogger.log(line, sessionId);
+ taskLogger.log(unescapeStartCR(line), sessionId);
}
}