From 0b2f0b0c205e09549acc870e34b767f1aeeb51ff Mon Sep 17 00:00:00 2001 From: Robin Shen Date: Tue, 1 Mar 2022 16:07:15 +0800 Subject: [PATCH] Fix issue #601 - Make OneDev Agent docker image compatible with docker swarm --- pom.xml | 4 +- server-core/pom.xml | 2 +- .../impl/DefaultAgentManager.java | 40 +++++++++++++------ .../impl/DefaultAgentTokenManager.java | 4 +- .../onedev/server/migration/DataMigrator.java | 3 ++ .../java/io/onedev/server/model/Agent.java | 8 ++-- .../io/onedev/server/model/AgentToken.java | 19 +++++---- .../server/rest/AgentTokenResource.java | 7 ++-- .../buildsetting/agent/AgentOverviewPage.html | 2 +- server-plugin/pom.xml | 2 +- server-plugin/server-plugin-archetype/pom.xml | 2 +- .../server-plugin-authenticator-ldap/pom.xml | 2 +- .../server-plugin-buildspec-gradle/pom.xml | 2 +- .../server-plugin-buildspec-maven/pom.xml | 2 +- .../server-plugin-buildspec-node/pom.xml | 2 +- .../server-plugin-executor-kubernetes/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../server-plugin-import-gitea/pom.xml | 2 +- .../server-plugin-import-github/pom.xml | 2 +- .../server-plugin-import-gitlab/pom.xml | 2 +- .../server-plugin-import-jiracloud/pom.xml | 2 +- .../server-plugin-import-youtrack/pom.xml | 2 +- .../server-plugin-report-checkstyle/pom.xml | 2 +- .../server-plugin-report-clover/pom.xml | 2 +- .../server-plugin-report-coverage/pom.xml | 2 +- .../server-plugin-report-cpd/pom.xml | 2 +- .../server-plugin-report-jacoco/pom.xml | 2 +- .../server-plugin-report-jest/pom.xml | 2 +- .../server-plugin-report-junit/pom.xml | 2 +- .../server-plugin-report-markdown/pom.xml | 2 +- .../server-plugin-report-pmd/pom.xml | 2 +- .../server-plugin-report-problem/pom.xml | 2 +- .../server-plugin-report-spotbugs/pom.xml | 2 +- .../server-plugin-report-unittest/pom.xml | 2 +- .../server-plugin-sso-openid/pom.xml | 2 +- server-product/pom.xml | 2 +- 40 files changed, 86 insertions(+), 65 deletions(-) diff --git a/pom.xml b/pom.xml index 186f51f94e..27690ae35b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 1.0.5 server - 6.3.11 + 6.3.12 pom ${project.groupId}.${project.artifactId}-${project.version} @@ -559,7 +559,7 @@ 2.0.23 - 1.2.8 + 1.2.9 1.7.30 1.2.0 4.7.2 diff --git a/server-core/pom.xml b/server-core/pom.xml index 7af3030918..3b27de6e0c 100644 --- a/server-core/pom.xml +++ b/server-core/pom.xml @@ -7,7 +7,7 @@ io.onedev server - 6.3.11 + 6.3.12 diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java index b238cb1c6f..b23dd764ee 100644 --- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java +++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java @@ -143,10 +143,8 @@ public class DefaultAgentManager extends BaseEntityManager implements Age if (token == null) { throw new ExplicitException("Invalid agent token"); } else { - Agent agent = token.getAgent(); + Agent agent = findByName(data.getName()); if (agent == null) { - if (findByName(data.getName()) != null) - throw new ExplicitException("Name '" + data.getName() + "' already used by another agent"); agent = new Agent(); agent.setToken(token); agent.setOsName(data.getOsInfo().getOsName()); @@ -166,11 +164,9 @@ public class DefaultAgentManager extends BaseEntityManager implements Age attributeManager.save(attribute); agent.getAttributes().add(attribute); } - } else if (!agentSessions.containsKey(agent.getId())) { - Agent agentWithSameName = findByName(data.getName()); - if (agentWithSameName != null && !agentWithSameName.equals(agent)) - throw new ExplicitException("Name '" + data.getName() + "' already used by another agent"); - agent.setName(data.getName()); + } else if (agentSessions.containsKey(agent.getId())) { + throw new ExplicitException("Name '" + data.getName() + "' already used by another agent"); + } else { agent.setOsName(data.getOsInfo().getOsName()); agent.setOsVersion(data.getOsInfo().getOsVersion()); agent.setOsArch(data.getOsInfo().getOsArch()); @@ -179,8 +175,6 @@ public class DefaultAgentManager extends BaseEntityManager implements Age agent.setMemory(data.getMemory()); save(agent); attributeManager.syncAttributes(agent, data.getAttributes()); - } else { - throw new ExplicitException("Token already used by another agent"); } Session prevSession = agentSessions.put(agent.getId(), session); @@ -226,7 +220,7 @@ public class DefaultAgentManager extends BaseEntityManager implements Age query.setParameter("agent", agent); query.executeUpdate(); - super.delete(agent); + dao.remove(agent); dao.remove(agent.getToken()); Session prevSession = agentSessions.remove(agent.getId()); @@ -327,8 +321,28 @@ public class DefaultAgentManager extends BaseEntityManager implements Age @Transactional @Override public void delete(Collection agents) { - for (Agent agent: agents) - delete(agent); + Collection tokens = new HashSet<>(); + for (Agent agent: agents) + tokens.add(agent.getToken()); + + for (AgentToken token: tokens) { + for (Agent agent: token.getAgents()) { + Query query = getSession().createQuery("update Build set agent=null where agent=:agent"); + query.setParameter("agent", agent); + query.executeUpdate(); + + dao.remove(agent); + + Session prevSession = agentSessions.remove(agent.getId()); + if (prevSession != null) { + try { + prevSession.disconnect(); + } catch (IOException e) { + } + } + } + dao.remove(token); + } } @Transactional diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentTokenManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentTokenManager.java index e7da6bdceb..280b392898 100644 --- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentTokenManager.java +++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentTokenManager.java @@ -35,14 +35,14 @@ public class DefaultAgentTokenManager extends BaseEntityManager impl @Sessional @Override public List queryUnused() { - return getSession().createQuery("select token from AgentToken token left join token.agent agent where agent = null").list(); + return getSession().createQuery("select token from AgentToken token left join token.agents agent where agent = null").list(); } @SuppressWarnings("unchecked") @Transactional @Override public void deleteUnused() { - for (AgentToken token: (List)getSession().createQuery("select token from AgentToken token left join token.agent agent where agent = null").list()) { + for (AgentToken token: (List)getSession().createQuery("select token from AgentToken token left join token.agents agent where agent = null").list()) { delete(token); } } diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java index 944bc3cbaf..fa28a127e9 100644 --- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java +++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java @@ -3722,4 +3722,7 @@ public class DataMigrator { } } + private void migrate79(File dataDir, Stack versions) { + } + } diff --git a/server-core/src/main/java/io/onedev/server/model/Agent.java b/server-core/src/main/java/io/onedev/server/model/Agent.java index dee7f6b8ab..bc73404b71 100644 --- a/server-core/src/main/java/io/onedev/server/model/Agent.java +++ b/server-core/src/main/java/io/onedev/server/model/Agent.java @@ -5,8 +5,8 @@ import static io.onedev.server.model.Agent.PROP_IP_ADDRESS; import static io.onedev.server.model.Agent.PROP_LAST_USED_DATE; import static io.onedev.server.model.Agent.PROP_MEMORY; import static io.onedev.server.model.Agent.PROP_NAME; -import static io.onedev.server.model.Agent.PROP_OS_NAME; import static io.onedev.server.model.Agent.PROP_OS_ARCH; +import static io.onedev.server.model.Agent.PROP_OS_NAME; import static io.onedev.server.model.Agent.PROP_OS_VERSION; import static io.onedev.server.model.Agent.PROP_PAUSED; @@ -24,8 +24,8 @@ import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Index; import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; import javax.persistence.OneToMany; -import javax.persistence.OneToOne; import javax.persistence.Table; import org.hibernate.annotations.Cache; @@ -104,8 +104,8 @@ public class Agent extends AbstractEntity { NAME_CPU, PROP_CPU, NAME_MEMORY, PROP_MEMORY); - @OneToOne(fetch=FetchType.LAZY) - @JoinColumn(nullable=false, unique=true) + @ManyToOne(fetch=FetchType.LAZY) + @JoinColumn(nullable=false) private AgentToken token; @OneToMany(mappedBy="agent", cascade=CascadeType.REMOVE) diff --git a/server-core/src/main/java/io/onedev/server/model/AgentToken.java b/server-core/src/main/java/io/onedev/server/model/AgentToken.java index a88c72f460..583aa4daed 100644 --- a/server-core/src/main/java/io/onedev/server/model/AgentToken.java +++ b/server-core/src/main/java/io/onedev/server/model/AgentToken.java @@ -2,12 +2,12 @@ package io.onedev.server.model; import static io.onedev.server.model.AgentToken.PROP_VALUE; -import javax.annotation.Nullable; +import java.util.Collection; + import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.FetchType; import javax.persistence.Index; -import javax.persistence.OneToOne; +import javax.persistence.OneToMany; import javax.persistence.Table; import org.hibernate.annotations.Cache; @@ -22,15 +22,18 @@ public class AgentToken extends AbstractEntity { public static final String PROP_VALUE = "value"; - @OneToOne(mappedBy="token", fetch=FetchType.LAZY) - private Agent agent; + @OneToMany(mappedBy="token") + private Collection agents; @Column(nullable=false, unique=true) private String value; - @Nullable - public Agent getAgent() { - return agent; + public Collection getAgents() { + return agents; + } + + public void setAgents(Collection agents) { + this.agents = agents; } public String getValue() { diff --git a/server-core/src/main/java/io/onedev/server/rest/AgentTokenResource.java b/server-core/src/main/java/io/onedev/server/rest/AgentTokenResource.java index f456977125..3a7df77913 100644 --- a/server-core/src/main/java/io/onedev/server/rest/AgentTokenResource.java +++ b/server-core/src/main/java/io/onedev/server/rest/AgentTokenResource.java @@ -1,5 +1,6 @@ package io.onedev.server.rest; +import java.util.Collection; import java.util.List; import java.util.UUID; @@ -52,12 +53,12 @@ public class AgentTokenResource { } @Api(order=100) - @Path("/{tokenId}/agent") + @Path("/{tokenId}/agents") @GET - public Agent getAgent(@PathParam("tokenId") Long agentTokenId) { + public Collection getAgent(@PathParam("tokenId") Long agentTokenId) { if (!SecurityUtils.isAdministrator()) throw new UnauthorizedException(); - return tokenManager.load(agentTokenId).getAgent(); + return tokenManager.load(agentTokenId).getAgents(); } @Api(order=200) diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.html index b52bdde8b7..6a5b97db33 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.html +++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.html @@ -1,5 +1,5 @@ -
+
Restart Remove diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml index 7b2cc46ee3..d1122735d9 100644 --- a/server-plugin/pom.xml +++ b/server-plugin/pom.xml @@ -6,7 +6,7 @@ io.onedev server - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xml index ad7f1576b7..d30d1ae85f 100644 --- a/server-plugin/server-plugin-archetype/pom.xml +++ b/server-plugin/server-plugin-archetype/pom.xml @@ -6,7 +6,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xml index 3043965d4c..1d271fe7ab 100644 --- a/server-plugin/server-plugin-authenticator-ldap/pom.xml +++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.authenticator.ldap.LdapModule diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xml index 670666fd8f..5bd2f9b656 100644 --- a/server-plugin/server-plugin-buildspec-gradle/pom.xml +++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.buildspec.gradle.GradleModule diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xml index 9d17f4fdf6..322fe98c25 100644 --- a/server-plugin/server-plugin-buildspec-maven/pom.xml +++ b/server-plugin/server-plugin-buildspec-maven/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.buildspec.maven.MavenModule diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xml index 798da6a6f9..4ed3146447 100644 --- a/server-plugin/server-plugin-buildspec-node/pom.xml +++ b/server-plugin/server-plugin-buildspec-node/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.buildspec.node.NodePluginModule diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xml index 6696444c35..5183d4b17d 100644 --- a/server-plugin/server-plugin-executor-kubernetes/pom.xml +++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml @@ -6,7 +6,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.executor.kubernetes.KubernetesModule diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xml index de50982ac0..53594cca3f 100644 --- a/server-plugin/server-plugin-executor-remotedocker/pom.xml +++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xml index 08a0618651..7a3f5dff5c 100644 --- a/server-plugin/server-plugin-executor-remoteshell/pom.xml +++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xml index cb47c0eb10..541862e6e7 100644 --- a/server-plugin/server-plugin-executor-serverdocker/pom.xml +++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.executor.serverdocker.ServerDockerModule diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xml index cd138fd849..53aa444e19 100644 --- a/server-plugin/server-plugin-executor-servershell/pom.xml +++ b/server-plugin/server-plugin-executor-servershell/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.executor.servershell.ServerShellModule diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml index 9c2fbefff1..52917eb35c 100644 --- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml +++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.imports.bitbucketcloud.BitbucketPluginModule diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xml index f2a4a85a19..fe12d88a65 100644 --- a/server-plugin/server-plugin-import-gitea/pom.xml +++ b/server-plugin/server-plugin-import-gitea/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.imports.gitea.GiteaPluginModule diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xml index 44f415a479..b8f5069a3f 100644 --- a/server-plugin/server-plugin-import-github/pom.xml +++ b/server-plugin/server-plugin-import-github/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.imports.github.GitHubPluginModule diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xml index 62e375bdb5..7a63472123 100644 --- a/server-plugin/server-plugin-import-gitlab/pom.xml +++ b/server-plugin/server-plugin-import-gitlab/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.imports.gitlab.GitLabPluginModule diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xml index d8258fc07e..6c57b53d8f 100644 --- a/server-plugin/server-plugin-import-jiracloud/pom.xml +++ b/server-plugin/server-plugin-import-jiracloud/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.imports.jiracloud.JiraPluginModule diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xml index 7febbaeaf8..5e97fb638f 100644 --- a/server-plugin/server-plugin-import-youtrack/pom.xml +++ b/server-plugin/server-plugin-import-youtrack/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.imports.youtrack.YouTrackPluginModule diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xml index bd3f04c03f..d68324d739 100644 --- a/server-plugin/server-plugin-report-checkstyle/pom.xml +++ b/server-plugin/server-plugin-report-checkstyle/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xml index e3fe5d3542..8d3d59945d 100644 --- a/server-plugin/server-plugin-report-clover/pom.xml +++ b/server-plugin/server-plugin-report-clover/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xml index 2afa7c6556..fde792b0a1 100644 --- a/server-plugin/server-plugin-report-coverage/pom.xml +++ b/server-plugin/server-plugin-report-coverage/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.report.coverage.CoverageReportModule diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xml index 5705dbd22f..2e573d2884 100644 --- a/server-plugin/server-plugin-report-cpd/pom.xml +++ b/server-plugin/server-plugin-report-cpd/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xml index d46dc08590..fb6316aeda 100644 --- a/server-plugin/server-plugin-report-jacoco/pom.xml +++ b/server-plugin/server-plugin-report-jacoco/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xml index 153aaa8d00..b942cc97c8 100644 --- a/server-plugin/server-plugin-report-jest/pom.xml +++ b/server-plugin/server-plugin-report-jest/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xml index b33f1e6e8c..c0f82837d8 100644 --- a/server-plugin/server-plugin-report-junit/pom.xml +++ b/server-plugin/server-plugin-report-junit/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xml index 573db5c3e7..078923fd6e 100644 --- a/server-plugin/server-plugin-report-markdown/pom.xml +++ b/server-plugin/server-plugin-report-markdown/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.report.markdown.MarkdownReportModule diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xml index bf4303174d..c1474d7304 100644 --- a/server-plugin/server-plugin-report-pmd/pom.xml +++ b/server-plugin/server-plugin-report-pmd/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xml index 91e970ca10..f42eb5a80c 100644 --- a/server-plugin/server-plugin-report-problem/pom.xml +++ b/server-plugin/server-plugin-report-problem/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.report.problem.ProblemReportModule diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xml index bc20c725bf..28050bc43f 100644 --- a/server-plugin/server-plugin-report-spotbugs/pom.xml +++ b/server-plugin/server-plugin-report-spotbugs/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xml index 930a733d4b..8cbe89e9b6 100644 --- a/server-plugin/server-plugin-report-unittest/pom.xml +++ b/server-plugin/server-plugin-report-unittest/pom.xml @@ -5,7 +5,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 io.onedev.server.plugin.report.unittest.UnitTestReportModule diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xml index 71160f5ae0..72c7dae075 100644 --- a/server-plugin/server-plugin-sso-openid/pom.xml +++ b/server-plugin/server-plugin-sso-openid/pom.xml @@ -6,7 +6,7 @@ io.onedev server-plugin - 6.3.11 + 6.3.12 diff --git a/server-product/pom.xml b/server-product/pom.xml index 1161923b5f..225c6851de 100644 --- a/server-product/pom.xml +++ b/server-product/pom.xml @@ -7,7 +7,7 @@ io.onedev server - 6.3.11 + 6.3.12