The Unified and Autonomous Development Platform
feat: Able to use variables from workspace files for run container step (OD-2620)
Robin Sheneff4d2a658d6
diff --git a/pom.xml b/pom.xmlindex 69b5fd5d03..06ed5cc25a 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.3.0</version></parent><artifactId>server</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>@@ -657,7 +657,7 @@</repositories><properties><commons.version>3.1.1</commons.version>- <agent.version>2.3.2</agent.version>+ <agent.version>2.3.3</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/pom.xml b/server-core/pom.xmlindex 66ca4eb1e0..6a037e2784 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.javaindex c785d5acf1..b945dc65eb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java@@ -119,6 +119,10 @@ public class BuildImageWithKanikoStep extends CommandStep {this.moreOptions = moreOptions;}+ static List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith, true, true, false);+ }+@Overridepublic Interpreter getInterpreter() {return new DefaultInterpreter() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.javaindex b353765a76..fc2361676c 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java@@ -71,6 +71,12 @@ public class CommandStep extends Step {}static List<InputSuggestion> suggestVariables(String matchWith) {+ /*+ * We do not support dynamic variable here as:+ * 1. @file:@ notion will not work for workspace files generated in current step+ * 2. It is very easy to use file content in shell script via shell utilities+ * in regardless the file is generated in current or previous steps+ */return BuildSpec.suggestVariables(matchWith, false, false, false);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.javaindex e869cebed9..7ddd601004 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java@@ -1,20 +1,22 @@package io.onedev.server.buildspec.step;+import static io.onedev.agent.DockerExecutorUtils.buildDockerConfig;+import static io.onedev.k8shelper.RegistryLoginFacade.merge;++import java.util.List;+import java.util.Map;++import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.CommandFacade;import io.onedev.k8shelper.RegistryLoginFacade;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;import io.onedev.server.annotation.Multiline;+import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;-import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.model.support.administration.jobexecutor.DockerAware;--import java.util.List;-import java.util.Map;--import static io.onedev.agent.DockerExecutorUtils.buildDockerConfig;-import static io.onedev.k8shelper.RegistryLoginFacade.merge;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;public abstract class CraneStep extends CommandStep {@@ -70,6 +72,10 @@ public abstract class CraneStep extends CommandStep {super.setRegistryLogins(registryLogins);}+ static List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith, true, true, false);+ }+@Overridepublic Interpreter getInterpreter() {return new DefaultInterpreter() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/GenerateChecksumStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/GenerateChecksumStep.javaindex 96ea2adf74..9089358977 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/GenerateChecksumStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/GenerateChecksumStep.java@@ -1,15 +1,18 @@package io.onedev.server.buildspec.step;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Interpolative;-import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;-import io.onedev.server.buildspec.step.commandinterpreter.ShellInterpreter;+import static io.onedev.server.buildspec.step.StepGroup.UTILITIES;-import javax.validation.constraints.NotEmpty;import java.util.ArrayList;import java.util.List;-import static io.onedev.server.buildspec.step.StepGroup.UTILITIES;+import javax.validation.constraints.NotEmpty;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Interpolative;+import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;+import io.onedev.server.buildspec.step.commandinterpreter.ShellInterpreter;@Editable(order=1110, group = UTILITIES, name="Generate File Checksum", description = "" +"This step can only be executed by a docker aware executor")@@ -45,6 +48,10 @@ public class GenerateChecksumStep extends CommandStep {this.targetFile = targetFile;}+ static List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith, true, true, false);+ }+@Overridepublic boolean isRunInContainer() {return true;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.javaindex 0b0d2d3f7b..434297dc33 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java@@ -142,7 +142,7 @@ public class RunContainerStep extends Step {}static List<InputSuggestion> suggestVariables(String matchWith) {- return BuildSpec.suggestVariables(matchWith, false, false, false);+ return BuildSpec.suggestVariables(matchWith, true, true, false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.javaindex 5703121697..57f202daa4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java@@ -1,21 +1,24 @@package io.onedev.server.buildspec.step;+import static io.onedev.server.buildspec.step.StepGroup.UTILITIES;++import java.util.ArrayList;+import java.util.List;+import java.util.stream.Collectors;++import javax.validation.constraints.NotEmpty;++import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.StringUtils;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;+import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import javax.validation.constraints.NotEmpty;-import java.util.ArrayList;-import java.util.List;-import java.util.stream.Collectors;--import static io.onedev.server.buildspec.step.StepGroup.UTILITIES;-@Editable(order=1100, group = UTILITIES, name="Copy Files with SCP", description = "" +"This step can only be executed by a docker aware executor. It runs under <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>job workspace</a>")public class SCPCommandStep extends CommandStep {@@ -82,6 +85,10 @@ public class SCPCommandStep extends CommandStep {this.options = options;}+ static List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith, true, true, false);+ }+@Editable@Overridepublic boolean isRunInContainer() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.javaindex c30a9db280..99e677292e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java@@ -1,22 +1,25 @@package io.onedev.server.buildspec.step;+import static io.onedev.server.buildspec.step.StepGroup.UTILITIES;++import java.util.ArrayList;+import java.util.List;+import java.util.stream.Collectors;++import javax.validation.constraints.NotEmpty;++import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.StringUtils;import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Code;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;+import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import javax.validation.constraints.NotEmpty;-import java.util.ArrayList;-import java.util.List;-import java.util.stream.Collectors;--import static io.onedev.server.buildspec.step.StepGroup.UTILITIES;-@Editable(order=1090, group = UTILITIES, name="Execute Commands via SSH", description = "" +"This step can only be executed by a docker aware executor")public class SSHCommandStep extends CommandStep {@@ -84,11 +87,15 @@ public class SSHCommandStep extends CommandStep {this.options = options;}+ static List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith, true, true, false);+ }+@Editable(order=300, description="Specify commands to be executed on remote machine. " +"<b class='text-warning'>Note:</b> user environments will not be picked up when execute these " +"commands, set up them explicitly in commands if necessary")@Interpolative- @Code(language=Code.SHELL, variableProvider="suggestVariables")+ @Code(language=Code.SHELL, variableProvider="suggestStaticVariables")@NotEmptypublic String getCommands() {return commands;@@ -98,6 +105,10 @@ public class SSHCommandStep extends CommandStep {this.commands = commands;}+ static List<InputSuggestion> suggestStaticVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith, true, false, false);+ }+@Editable@Overridepublic boolean isRunInContainer() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java b/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.javaindex b81ab34eb1..5fea255606 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java@@ -45,7 +45,7 @@ public class VolumeMount implements Serializable {@SuppressWarnings("unused")private static List<InputSuggestion> suggestVariables(String matchWith) {- return BuildSpec.suggestVariables(matchWith, false, false, false);+ return BuildSpec.suggestVariables(matchWith, true, true, false);}}diff --git a/server-ee b/server-eeindex 63fd68c042..c61b935709 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 63fd68c0421e5118c88c44e31f1637a9af49d250+Subproject commit c61b935709e58a4b17d83143afee2319c052d7fcdiff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 2c33552a5f..66c924f4fc 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex dee7ec0ec1..eb27d2c924 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex 25231ce68e..6521a69576 100644--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-bazel/pom.xml b/server-plugin/server-plugin-buildspec-bazel/pom.xmlindex 07b7ea2cd0..13602afd1f 100644--- a/server-plugin/server-plugin-buildspec-bazel/pom.xml+++ b/server-plugin/server-plugin-buildspec-bazel/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.bazel.BazelModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-cmake/pom.xml b/server-plugin/server-plugin-buildspec-cmake/pom.xmlindex f57f157984..3836637ad4 100644--- a/server-plugin/server-plugin-buildspec-cmake/pom.xml+++ b/server-plugin/server-plugin-buildspec-cmake/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-dotnet/pom.xml b/server-plugin/server-plugin-buildspec-dotnet/pom.xmlindex 87fc407182..cca4dd9a51 100644--- a/server-plugin/server-plugin-buildspec-dotnet/pom.xml+++ b/server-plugin/server-plugin-buildspec-dotnet/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-golang/pom.xml b/server-plugin/server-plugin-buildspec-golang/pom.xmlindex 9607b3fc98..2c763d0f69 100644--- a/server-plugin/server-plugin-buildspec-golang/pom.xml+++ b/server-plugin/server-plugin-buildspec-golang/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex 5029530534..186ee170cb 100644--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex 6e8fe17d06..55560d7993 100644--- a/server-plugin/server-plugin-buildspec-maven/pom.xml+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex 14d0dfd5d3..a9cd3d0e99 100644--- a/server-plugin/server-plugin-buildspec-node/pom.xml+++ b/server-plugin/server-plugin-buildspec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-python/pom.xml b/server-plugin/server-plugin-buildspec-python/pom.xmlindex 72257cf89b..6a916fdb4e 100644--- a/server-plugin/server-plugin-buildspec-python/pom.xml+++ b/server-plugin/server-plugin-buildspec-python/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-buildspec-rust/pom.xml b/server-plugin/server-plugin-buildspec-rust/pom.xmlindex e356a676d6..8a00096df8 100644--- a/server-plugin/server-plugin-buildspec-rust/pom.xml+++ b/server-plugin/server-plugin-buildspec-rust/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex 644ce865a6..fc006d9bfd 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xmlindex 234fe88748..c37b02851c 100644--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xmlindex 482d043cfa..0bec2990ae 100644--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xmlindex e590fc01e6..13bd8b7320 100644--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex 9e64ac6429..412b433830 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -517,7 +517,7 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Tereturn null;});} else if (facade instanceof RunContainerFacade) {- RunContainerFacade runContainerFacade = (RunContainerFacade) facade;+ RunContainerFacade runContainerFacade = ((RunContainerFacade) facade).replacePlaceholders(hostBuildHome);List<String> arguments = new ArrayList<>();if (runContainerFacade.getArgs() != null)arguments.addAll(Arrays.asList(StringUtils.parseQuoteTokens(runContainerFacade.getArgs())));diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xmlindex 56805df5f2..f2058bc58e 100644--- a/server-plugin/server-plugin-executor-servershell/pom.xml+++ b/server-plugin/server-plugin-executor-servershell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xmlindex b3cbfb1941..600921447e 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xmlindex 159f96057d..0d09c28fa0 100644--- a/server-plugin/server-plugin-import-gitea/pom.xml+++ b/server-plugin/server-plugin-import-gitea/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitea.GiteaModule</moduleClass>diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xmlindex cccfebd730..ed6ff6e707 100644--- a/server-plugin/server-plugin-import-github/pom.xml+++ b/server-plugin/server-plugin-import-github/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.github.GitHubModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xmlindex eec49d2246..c2c113b710 100644--- a/server-plugin/server-plugin-import-gitlab/pom.xml+++ b/server-plugin/server-plugin-import-gitlab/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabModule</moduleClass>diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xmlindex 4983cf07ab..dcd337884f 100644--- a/server-plugin/server-plugin-import-jiracloud/pom.xml+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraModule</moduleClass>diff --git a/server-plugin/server-plugin-import-url/pom.xml b/server-plugin/server-plugin-import-url/pom.xmlindex 2fe0118651..266d400635 100644--- a/server-plugin/server-plugin-import-url/pom.xml+++ b/server-plugin/server-plugin-import-url/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.url.UrlModule</moduleClass>diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xmlindex e336143a6c..7f2d789e57 100644--- a/server-plugin/server-plugin-import-youtrack/pom.xml+++ b/server-plugin/server-plugin-import-youtrack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackModule</moduleClass>diff --git a/server-plugin/server-plugin-mail-gmail/pom.xml b/server-plugin/server-plugin-mail-gmail/pom.xmlindex b7226d23f3..30bfa42aea 100644--- a/server-plugin/server-plugin-mail-gmail/pom.xml+++ b/server-plugin/server-plugin-mail-gmail/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.mail.gmail.GmailModule</moduleClass>diff --git a/server-plugin/server-plugin-mail-office365/pom.xml b/server-plugin/server-plugin-mail-office365/pom.xmlindex eb15a560e2..a29d2b4ff7 100644--- a/server-plugin/server-plugin-mail-office365/pom.xml+++ b/server-plugin/server-plugin-mail-office365/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.mail.office365.Office365Module</moduleClass>diff --git a/server-plugin/server-plugin-mail-smtpimap/pom.xml b/server-plugin/server-plugin-mail-smtpimap/pom.xmlindex 740ead24b2..b712bb36e8 100644--- a/server-plugin/server-plugin-mail-smtpimap/pom.xml+++ b/server-plugin/server-plugin-mail-smtpimap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.mail.smtpimap.SmtpImapModule</moduleClass>diff --git a/server-plugin/server-plugin-notification-discord/pom.xml b/server-plugin/server-plugin-notification-discord/pom.xmlindex fff6993637..a6fb11ff81 100644--- a/server-plugin/server-plugin-notification-discord/pom.xml+++ b/server-plugin/server-plugin-notification-discord/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>diff --git a/server-plugin/server-plugin-notification-ntfy/pom.xml b/server-plugin/server-plugin-notification-ntfy/pom.xmlindex a95d68f4c2..8a70386abd 100644--- a/server-plugin/server-plugin-notification-ntfy/pom.xml+++ b/server-plugin/server-plugin-notification-ntfy/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.notification.ntfy.NtfyModule</moduleClass>diff --git a/server-plugin/server-plugin-notification-slack/pom.xml b/server-plugin/server-plugin-notification-slack/pom.xmlindex 82617122e6..246594c463 100644--- a/server-plugin/server-plugin-notification-slack/pom.xml+++ b/server-plugin/server-plugin-notification-slack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>diff --git a/server-plugin/server-plugin-pack-container/pom.xml b/server-plugin/server-plugin-pack-container/pom.xmlindex 99e9987cb4..de57b17e19 100644--- a/server-plugin/server-plugin-pack-container/pom.xml+++ b/server-plugin/server-plugin-pack-container/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-gem/pom.xml b/server-plugin/server-plugin-pack-gem/pom.xmlindex d2cb3c5a56..15364868cc 100644--- a/server-plugin/server-plugin-pack-gem/pom.xml+++ b/server-plugin/server-plugin-pack-gem/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-helm/pom.xml b/server-plugin/server-plugin-pack-helm/pom.xmlindex fafef7ac7b..6518ad8ed6 100644--- a/server-plugin/server-plugin-pack-helm/pom.xml+++ b/server-plugin/server-plugin-pack-helm/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-maven/pom.xml b/server-plugin/server-plugin-pack-maven/pom.xmlindex 53b7ae0773..bd69830a9b 100644--- a/server-plugin/server-plugin-pack-maven/pom.xml+++ b/server-plugin/server-plugin-pack-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-npm/pom.xml b/server-plugin/server-plugin-pack-npm/pom.xmlindex 73939518d3..9d29064e70 100644--- a/server-plugin/server-plugin-pack-npm/pom.xml+++ b/server-plugin/server-plugin-pack-npm/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-nuget/pom.xml b/server-plugin/server-plugin-pack-nuget/pom.xmlindex 06be20910b..7be8a320f4 100644--- a/server-plugin/server-plugin-pack-nuget/pom.xml+++ b/server-plugin/server-plugin-pack-nuget/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-pack-pypi/pom.xml b/server-plugin/server-plugin-pack-pypi/pom.xmlindex 03ed1708b2..3961c9c035 100644--- a/server-plugin/server-plugin-pack-pypi/pom.xml+++ b/server-plugin/server-plugin-pack-pypi/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex 6e378a3570..c4ad4eec85 100644--- a/server-plugin/server-plugin-report-checkstyle/pom.xml+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clippy/pom.xml b/server-plugin/server-plugin-report-clippy/pom.xmlindex 3e5d1ce69d..01db4ead6a 100644--- a/server-plugin/server-plugin-report-clippy/pom.xml+++ b/server-plugin/server-plugin-report-clippy/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex 7eb3b2ae0a..ceb39ec361 100644--- a/server-plugin/server-plugin-report-clover/pom.xml+++ b/server-plugin/server-plugin-report-clover/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-cobertura/pom.xml b/server-plugin/server-plugin-report-cobertura/pom.xmlindex a788508e3d..89fc406df3 100644--- a/server-plugin/server-plugin-report-cobertura/pom.xml+++ b/server-plugin/server-plugin-report-cobertura/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xmlindex 252d0076a4..3cb509a5a2 100644--- a/server-plugin/server-plugin-report-coverage/pom.xml+++ b/server-plugin/server-plugin-report-coverage/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.coverage.CoverageModule</moduleClass>diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xmlindex 373be26911..cdfaf4b7a7 100644--- a/server-plugin/server-plugin-report-cpd/pom.xml+++ b/server-plugin/server-plugin-report-cpd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-cppcheck/pom.xml b/server-plugin/server-plugin-report-cppcheck/pom.xmlindex 70e576c807..41ab3df1bf 100644--- a/server-plugin/server-plugin-report-cppcheck/pom.xml+++ b/server-plugin/server-plugin-report-cppcheck/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-gtest/pom.xml b/server-plugin/server-plugin-report-gtest/pom.xmlindex 500bd6c92c..d356ff9f5b 100644--- a/server-plugin/server-plugin-report-gtest/pom.xml+++ b/server-plugin/server-plugin-report-gtest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-html/pom.xml b/server-plugin/server-plugin-report-html/pom.xmlindex cd7c37a8be..fc9c54d247 100644--- a/server-plugin/server-plugin-report-html/pom.xml+++ b/server-plugin/server-plugin-report-html/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.html.HtmlModule</moduleClass>diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xmlindex 1ae176ed0b..e6393a2827 100644--- a/server-plugin/server-plugin-report-jacoco/pom.xml+++ b/server-plugin/server-plugin-report-jacoco/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex 9d5fc1166c..7508098cc9 100644--- a/server-plugin/server-plugin-report-jest/pom.xml+++ b/server-plugin/server-plugin-report-jest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xmlindex 101d8cdaeb..8142e95fb0 100644--- a/server-plugin/server-plugin-report-junit/pom.xml+++ b/server-plugin/server-plugin-report-junit/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex 9c2dcf8b56..3f1508bc96 100644--- a/server-plugin/server-plugin-report-markdown/pom.xml+++ b/server-plugin/server-plugin-report-markdown/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownModule</moduleClass>diff --git a/server-plugin/server-plugin-report-mypy/pom.xml b/server-plugin/server-plugin-report-mypy/pom.xmlindex a72d2227a7..b3d1262599 100644--- a/server-plugin/server-plugin-report-mypy/pom.xml+++ b/server-plugin/server-plugin-report-mypy/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xmlindex 620a4e8f0c..c48527501c 100644--- a/server-plugin/server-plugin-report-pmd/pom.xml+++ b/server-plugin/server-plugin-report-pmd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xmlindex 4cdd048ebb..602d42fac1 100644--- a/server-plugin/server-plugin-report-problem/pom.xml+++ b/server-plugin/server-plugin-report-problem/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.problem.ProblemModule</moduleClass>diff --git a/server-plugin/server-plugin-report-pylint/pom.xml b/server-plugin/server-plugin-report-pylint/pom.xmlindex 22329fc988..9d87e372bd 100644--- a/server-plugin/server-plugin-report-pylint/pom.xml+++ b/server-plugin/server-plugin-report-pylint/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-roslynator/pom.xml b/server-plugin/server-plugin-report-roslynator/pom.xmlindex ea9d808a48..3f3a48904f 100644--- a/server-plugin/server-plugin-report-roslynator/pom.xml+++ b/server-plugin/server-plugin-report-roslynator/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-ruff/pom.xml b/server-plugin/server-plugin-report-ruff/pom.xmlindex cb9a9f9aa7..bcb59b847f 100644--- a/server-plugin/server-plugin-report-ruff/pom.xml+++ b/server-plugin/server-plugin-report-ruff/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xmlindex f10437ec24..1defba4586 100644--- a/server-plugin/server-plugin-report-spotbugs/pom.xml+++ b/server-plugin/server-plugin-report-spotbugs/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-trx/pom.xml b/server-plugin/server-plugin-report-trx/pom.xmlindex 354e47608c..cab569d9fb 100644--- a/server-plugin/server-plugin-report-trx/pom.xml+++ b/server-plugin/server-plugin-report-trx/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xmlindex 32fe5b704e..c7b3841a01 100644--- a/server-plugin/server-plugin-report-unittest/pom.xml+++ b/server-plugin/server-plugin-report-unittest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.unittest.UnitTestModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xmlindex 6325877b06..051e3f7ceb 100644--- a/server-plugin/server-plugin-sso-discord/pom.xml+++ b/server-plugin/server-plugin-sso-discord/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex 7537d57278..9c94d4aa16 100644--- a/server-plugin/server-plugin-sso-openid/pom.xml+++ b/server-plugin/server-plugin-sso-openid/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 59109c12f0..af4490cad9 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>13.1.2</version>+ <version>13.1.3</version></parent><dependencies><dependency>