The Unified and Autonomous Development Platform
Bug fixes for agent management
Robin Shen1d72f905a682
diff --git a/pom.xml b/pom.xmlindex e58445f1b2..a8d4e4df22 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.0.5</version></parent><artifactId>server</artifactId>- <version>4.10.0</version>+ <version>4.10.3</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>@@ -100,12 +100,17 @@<dependencies><dependency><groupId>io.onedev</groupId>- <artifactId>commons-launcher-loader</artifactId>+ <artifactId>commons-bootstrap</artifactId><version>${commons.version}</version></dependency><dependency><groupId>io.onedev</groupId>- <artifactId>commons-launcher-loader</artifactId>+ <artifactId>commons-loader</artifactId>+ <version>${commons.version}</version>+ </dependency>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>commons-loader</artifactId><type>test-jar</type><version>${commons.version}</version></dependency>@@ -559,7 +564,7 @@</repositories><properties><commons.version>2.0.13</commons.version>- <agent.version>1.0.4</agent.version>+ <agent.version>1.0.6</agent.version><slf4j.version>1.7.30</slf4j.version><logback.version>1.2.0</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 7ebb17c236..2d1992f542 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.10.0</version>+ <version>4.10.3</version></parent><build><plugins>@@ -20,11 +20,15 @@<dependencies><dependency><groupId>io.onedev</groupId>- <artifactId>commons-launcher-loader</artifactId>+ <artifactId>commons-bootstrap</artifactId></dependency><dependency><groupId>io.onedev</groupId>- <artifactId>commons-launcher-loader</artifactId>+ <artifactId>commons-loader</artifactId>+ </dependency>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>commons-loader</artifactId><type>test-jar</type><scope>test</scope></dependency>diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 0a04522390..a3f85ad653 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -83,10 +83,10 @@ import com.thoughtworks.xstream.core.JVM;import com.thoughtworks.xstream.mapper.MapperWrapper;import com.vladsch.flexmark.Extension;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.loader.AbstractPlugin;-import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.loader.AbstractPlugin;+import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.loader.ImplementationProvider;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;@@ -659,7 +659,7 @@ public class CoreModule extends AbstractPluginModule {@Overridepublic Collection<Class<? extends Exception>> getExpectedExceptionClasses() {return Sets.newHashSet(ConstraintViolationException.class, EntityNotFoundException.class,- ObjectNotFoundException.class, io.onedev.server.git.exception.ObjectNotFoundException.class,+ ObjectNotFoundException.class, io.onedev.server.exception.ObjectNotFoundException.class,StaleStateException.class, UnauthorizedException.class,ExplicitException.class, ValidationException.class, PageExpiredException.class,StalePageException.class);diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex 33b14aaf87..ddd35597cc 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -26,11 +26,11 @@ import org.slf4j.LoggerFactory;import com.google.inject.Provider;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.loader.AbstractPlugin;-import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.commons.launcher.loader.ListenerRegistry;-import io.onedev.commons.launcher.loader.ManagedSerializedForm;+import io.onedev.commons.loader.AbstractPlugin;+import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.loader.ListenerRegistry;+import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-core/src/main/java/io/onedev/server/ServerSocket.java b/server-core/src/main/java/io/onedev/server/ServerSocket.javaindex dd52f53cc2..c749e63232 100644--- a/server-core/src/main/java/io/onedev/server/ServerSocket.java+++ b/server-core/src/main/java/io/onedev/server/ServerSocket.java@@ -25,6 +25,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.buildspec.job.JobContext;import io.onedev.server.buildspec.job.JobManager;import io.onedev.server.entitymanager.AgentManager;+import io.onedev.server.exception.NotReadyException;@WebSocketpublic class ServerSocket {@@ -37,17 +38,20 @@ public class ServerSocket {@OnWebSocketClosepublic void onClose(int statusCode, String reason) {- if (agentId != null)- getAgentManager().agentDisconnected(agentId);-- StringBuilder builder = new StringBuilder("Websocket closed (");- if (session != null)- builder.append("remote address: " + session.getRemoteAddress().toString() + ", ");- builder.append("status code: " + statusCode);- if (reason != null)- builder.append(", reason: " + reason);- builder.append(")");- logger.trace(builder.toString());+ try {+ if (agentId != null)+ getAgentManager().agentDisconnected(agentId);++ StringBuilder builder = new StringBuilder("Websocket closed (");+ if (session != null)+ builder.append("remote address: " + session.getRemoteAddress().toString() + ", ");+ builder.append("status code: " + statusCode);+ if (reason != null)+ builder.append(", reason: " + reason);+ builder.append(")");+ logger.debug(builder.toString());+ } catch (NotReadyException e) {+ }}@OnWebSocketErrordiff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 37166ee3ae..6f334a27f5 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -48,8 +48,8 @@ import com.google.common.base.Preconditions;import com.google.common.base.Throwables;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.Listen;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobSuggestion.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobSuggestion.javaindex da82769ac6..0799ca99e6 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobSuggestion.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobSuggestion.java@@ -4,7 +4,7 @@ import java.util.Collection;import org.eclipse.jgit.lib.ObjectId;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.server.model.Project;@ExtensionPointdiff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/LogInstruction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/LogInstruction.javaindex d69c27db50..793b881bfe 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/LogInstruction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/LogInstruction.java@@ -13,7 +13,7 @@ import org.antlr.v4.runtime.Recognizer;import org.antlr.v4.runtime.tree.TerminalNode;import io.onedev.commons.codeassist.FenceAware;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.commons.utils.StringUtils;import io.onedev.server.buildspec.job.log.instruction.LogInstructionParser.InstructionContext;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/SetBuildVersion.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/SetBuildVersion.javaindex 1f9a2dd0aa..f562bb8629 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/SetBuildVersion.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/SetBuildVersion.java@@ -8,7 +8,7 @@ import javax.inject.Singleton;import org.apache.commons.lang3.StringUtils;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.server.event.build.BuildUpdated;import io.onedev.server.model.Build;import io.onedev.server.persistence.annotation.Transactional;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.javaindex 6efe66a218..8ba4c12cf8 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java@@ -12,7 +12,7 @@ import java.util.concurrent.Callable;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;diff --git a/server-core/src/main/java/io/onedev/server/code/CodeProblemContribution.java b/server-core/src/main/java/io/onedev/server/code/CodeProblemContribution.javaindex 0cf0092449..9b110b78a5 100644--- a/server-core/src/main/java/io/onedev/server/code/CodeProblemContribution.java+++ b/server-core/src/main/java/io/onedev/server/code/CodeProblemContribution.java@@ -4,7 +4,7 @@ import java.util.List;import javax.annotation.Nullable;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.server.model.Build;@ExtensionPointdiff --git a/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.java b/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.javaindex 273332549b..88eaa0e63d 100644--- a/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.java+++ b/server-core/src/main/java/io/onedev/server/code/LineCoverageContribution.java@@ -4,7 +4,7 @@ import java.util.Map;import javax.annotation.Nullable;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.server.model.Build;@ExtensionPointdiff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentAttributeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentAttributeManager.javaindex c0c5278d11..67aac9e4e0 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentAttributeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentAttributeManager.java@@ -17,7 +17,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.entitymanager.AgentAttributeManager;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.model.Agent;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.javaindex 7ce2e4c6bc..1987bcbcaa 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@@ -33,8 +33,8 @@ import io.onedev.agent.Message;import io.onedev.agent.MessageType;import io.onedev.agent.WebsocketUtils;import io.onedev.agent.job.LogRequest;-import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.Listen;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.entitymanager.AgentAttributeManager;import io.onedev.server.entitymanager.AgentManager;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 41e9a0c749..ca8c326d9f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.FileUtils;import io.onedev.server.entitymanager.BuildDependenceManager;import io.onedev.server.entitymanager.BuildManager;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.javaindex 09fbb5219d..c4c1470fbe 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.entitymanager.BuildMetricManager;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.javaindex d205dbf4ab..70533964c6 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java@@ -17,7 +17,7 @@ import org.hibernate.query.Query;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.event.entity.EntityRemoved;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex 0f89e563de..a547d92250 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -36,8 +36,8 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.Listen;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.event.codecomment.CodeCommentCreated;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.javaindex 6c97416f06..75c0c33cea 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java@@ -3,7 +3,7 @@ package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.event.codecomment.CodeCommentReplied;import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex 2baffb1eed..c2a4df26e0 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Optional;-import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.Listen;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.javaindex 8004b16395..a519829527 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java@@ -7,7 +7,7 @@ import javax.inject.Singleton;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.server.entitymanager.IssueCommentManager;import io.onedev.server.event.issue.IssueCommented;import io.onedev.server.model.IssueComment;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex ec598c41d9..cd4b94054a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -35,8 +35,8 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.Listen;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.server.entitymanager.IssueCommentManager;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.IssueManager;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex d15c63d28c..0c98988557 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -42,8 +42,8 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;-import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.Listen;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.javaindex 55290a8929..42004015b8 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java@@ -5,7 +5,7 @@ import java.util.Date;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.javaindex d9f2388352..90ea48c67f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java@@ -7,7 +7,7 @@ import javax.inject.Singleton;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.server.entitymanager.PullRequestCommentManager;import io.onedev.server.event.pullrequest.PullRequestCommented;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 106a971e14..81178460c4 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -54,8 +54,8 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.Listen;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.LockUtils;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.javaindex 5ee9543ca1..11edc9b6d8 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java@@ -9,7 +9,7 @@ import org.eclipse.jgit.lib.ObjectId;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.server.entitymanager.PullRequestCommentManager;import io.onedev.server.entitymanager.PullRequestUpdateManager;import io.onedev.server.event.pullrequest.PullRequestUpdated;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.javaindex c1d11cd303..2c62b5e109 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java@@ -21,7 +21,7 @@ import org.hibernate.ReplicationMode;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.javaindex d51858df15..3741360605 100644--- a/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java+++ b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java@@ -8,7 +8,7 @@ import javax.inject.Singleton;import org.jsoup.Jsoup;import org.jsoup.nodes.Document;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;diff --git a/server-core/src/main/java/io/onedev/server/git/exception/BlobEditException.java b/server-core/src/main/java/io/onedev/server/exception/BlobEditException.javasimilarity index 81%rename from server-core/src/main/java/io/onedev/server/git/exception/BlobEditException.javarename to server-core/src/main/java/io/onedev/server/exception/BlobEditException.javaindex 394a8ab5bf..c62d40a0e3 100644--- a/server-core/src/main/java/io/onedev/server/git/exception/BlobEditException.java+++ b/server-core/src/main/java/io/onedev/server/exception/BlobEditException.java@@ -1,4 +1,4 @@-package io.onedev.server.git.exception;+package io.onedev.server.exception;public class BlobEditException extends GitException {diff --git a/server-core/src/main/java/io/onedev/server/git/exception/GitException.java b/server-core/src/main/java/io/onedev/server/exception/GitException.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/git/exception/GitException.javarename to server-core/src/main/java/io/onedev/server/exception/GitException.javaindex 89c6040eb4..3b20703a49 100644--- a/server-core/src/main/java/io/onedev/server/git/exception/GitException.java+++ b/server-core/src/main/java/io/onedev/server/exception/GitException.java@@ -1,4 +1,4 @@-package io.onedev.server.git.exception;+package io.onedev.server.exception;import io.onedev.commons.utils.ExplicitException;diff --git a/server-core/src/main/java/io/onedev/server/git/exception/NotFileException.java b/server-core/src/main/java/io/onedev/server/exception/NotFileException.javasimilarity index 81%rename from server-core/src/main/java/io/onedev/server/git/exception/NotFileException.javarename to server-core/src/main/java/io/onedev/server/exception/NotFileException.javaindex b70fd84ec7..0782c43cd5 100644--- a/server-core/src/main/java/io/onedev/server/git/exception/NotFileException.java+++ b/server-core/src/main/java/io/onedev/server/exception/NotFileException.java@@ -1,4 +1,4 @@-package io.onedev.server.git.exception;+package io.onedev.server.exception;public class NotFileException extends GitException {diff --git a/server-core/src/main/java/io/onedev/server/exception/NotReadyException.java b/server-core/src/main/java/io/onedev/server/exception/NotReadyException.javanew file mode 100644index 0000000000..df1cea7892--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/exception/NotReadyException.java@@ -0,0 +1,13 @@+package io.onedev.server.exception;++import io.onedev.commons.utils.ExplicitException;++public class NotReadyException extends ExplicitException {++ private static final long serialVersionUID = 1L;++ public NotReadyException() {+ super("System is not ready");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/git/exception/NotTreeException.java b/server-core/src/main/java/io/onedev/server/exception/NotTreeException.javasimilarity index 81%rename from server-core/src/main/java/io/onedev/server/git/exception/NotTreeException.javarename to server-core/src/main/java/io/onedev/server/exception/NotTreeException.javaindex 5aedf57e6c..a2ca5e914b 100644--- a/server-core/src/main/java/io/onedev/server/git/exception/NotTreeException.java+++ b/server-core/src/main/java/io/onedev/server/exception/NotTreeException.java@@ -1,4 +1,4 @@-package io.onedev.server.git.exception;+package io.onedev.server.exception;public class NotTreeException extends GitException {diff --git a/server-core/src/main/java/io/onedev/server/git/exception/ObjectAlreadyExistsException.java b/server-core/src/main/java/io/onedev/server/exception/ObjectAlreadyExistsException.javasimilarity index 83%rename from server-core/src/main/java/io/onedev/server/git/exception/ObjectAlreadyExistsException.javarename to server-core/src/main/java/io/onedev/server/exception/ObjectAlreadyExistsException.javaindex 9ad4b1ead9..e0fa8e2819 100644--- a/server-core/src/main/java/io/onedev/server/git/exception/ObjectAlreadyExistsException.java+++ b/server-core/src/main/java/io/onedev/server/exception/ObjectAlreadyExistsException.java@@ -1,4 +1,4 @@-package io.onedev.server.git.exception;+package io.onedev.server.exception;public class ObjectAlreadyExistsException extends GitException {diff --git a/server-core/src/main/java/io/onedev/server/git/exception/ObjectNotFoundException.java b/server-core/src/main/java/io/onedev/server/exception/ObjectNotFoundException.javasimilarity index 82%rename from server-core/src/main/java/io/onedev/server/git/exception/ObjectNotFoundException.javarename to server-core/src/main/java/io/onedev/server/exception/ObjectNotFoundException.javaindex 9abc670bac..b4225ac0eb 100644--- a/server-core/src/main/java/io/onedev/server/git/exception/ObjectNotFoundException.java+++ b/server-core/src/main/java/io/onedev/server/exception/ObjectNotFoundException.java@@ -1,4 +1,4 @@-package io.onedev.server.git.exception;+package io.onedev.server.exception;public class ObjectNotFoundException extends GitException {diff --git a/server-core/src/main/java/io/onedev/server/git/exception/ObsoleteCommitException.java b/server-core/src/main/java/io/onedev/server/exception/ObsoleteCommitException.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/git/exception/ObsoleteCommitException.javarename to server-core/src/main/java/io/onedev/server/exception/ObsoleteCommitException.javaindex 7a705e0eb8..7adbdc4965 100644--- a/server-core/src/main/java/io/onedev/server/git/exception/ObsoleteCommitException.java+++ b/server-core/src/main/java/io/onedev/server/exception/ObsoleteCommitException.java@@ -1,4 +1,4 @@-package io.onedev.server.git.exception;+package io.onedev.server.exception;import javax.annotation.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/git/exception/RefUpdateException.java b/server-core/src/main/java/io/onedev/server/exception/RefUpdateException.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/git/exception/RefUpdateException.javarename to server-core/src/main/java/io/onedev/server/exception/RefUpdateException.javaindex 332d1a62df..198268ba76 100644--- a/server-core/src/main/java/io/onedev/server/git/exception/RefUpdateException.java+++ b/server-core/src/main/java/io/onedev/server/exception/RefUpdateException.java@@ -1,4 +1,4 @@-package io.onedev.server.git.exception;+package io.onedev.server.exception;import org.eclipse.jgit.lib.RefUpdate;diff --git a/server-core/src/main/java/io/onedev/server/util/ScriptException.java b/server-core/src/main/java/io/onedev/server/exception/ScriptException.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/util/ScriptException.javarename to server-core/src/main/java/io/onedev/server/exception/ScriptException.javaindex cf192718f1..dcca699e1d 100644--- a/server-core/src/main/java/io/onedev/server/util/ScriptException.java+++ b/server-core/src/main/java/io/onedev/server/exception/ScriptException.java@@ -1,4 +1,4 @@-package io.onedev.server.util;+package io.onedev.server.exception;import io.onedev.commons.utils.ExplicitException;diff --git a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java b/server-core/src/main/java/io/onedev/server/git/BlobEdits.javaindex 1c243c27c5..1c2bcc2ec6 100644--- a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java+++ b/server-core/src/main/java/io/onedev/server/git/BlobEdits.java@@ -31,11 +31,11 @@ import org.eclipse.jgit.treewalk.TreeWalk;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;-import io.onedev.server.git.exception.BlobEditException;-import io.onedev.server.git.exception.NotTreeException;-import io.onedev.server.git.exception.ObjectAlreadyExistsException;-import io.onedev.server.git.exception.ObjectNotFoundException;-import io.onedev.server.git.exception.ObsoleteCommitException;+import io.onedev.server.exception.BlobEditException;+import io.onedev.server.exception.NotTreeException;+import io.onedev.server.exception.ObjectAlreadyExistsException;+import io.onedev.server.exception.ObjectNotFoundException;+import io.onedev.server.exception.ObsoleteCommitException;public class BlobEdits implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex a2c9f52d42..751c414429 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -36,11 +36,12 @@ import io.onedev.commons.utils.command.ExecutionResult;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.exception.GitException;+import io.onedev.server.exception.NotReadyException;import io.onedev.server.git.command.AdvertiseReceiveRefsCommand;import io.onedev.server.git.command.AdvertiseUploadRefsCommand;import io.onedev.server.git.command.ReceivePackCommand;import io.onedev.server.git.command.UploadPackCommand;-import io.onedev.server.git.exception.GitException;import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;import io.onedev.server.security.CodePullAuthorizationSource;@@ -307,15 +308,18 @@ public class GitFilter implements Filter {if (oneDev.isReady())processRefs(httpRequest, httpResponse);else- throw new GitException("Server is not ready");+ throw new NotReadyException();} else if (GitSmartHttpTools.isReceivePack(httpRequest) || GitSmartHttpTools.isUploadPack(httpRequest)) {if (oneDev.isReady())processPacks(httpRequest, httpResponse);else- throw new GitException("Server is not ready");+ throw new NotReadyException();} else {chain.doFilter(request, response);}+ } catch (NotReadyException e) {+ logger.debug("Unable to serve git request as system is not ready yet");+ GitSmartHttpTools.sendError(httpRequest, httpResponse, HttpServletResponse.SC_SERVICE_UNAVAILABLE, e.getMessage());} catch (GitException|InterruptedException|ExecutionException e) {logger.error("Error serving git request", e);GitSmartHttpTools.sendError(httpRequest, httpResponse, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage());diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.javaindex e144cae264..f04c85a758 100644--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java@@ -52,10 +52,10 @@ import com.google.common.base.Strings;import com.google.common.collect.Iterables;import io.onedev.commons.utils.PathUtils;+import io.onedev.server.exception.ObsoleteCommitException;+import io.onedev.server.exception.RefUpdateException;import io.onedev.server.git.command.FetchCommand;import io.onedev.server.git.command.IsAncestorCommand;-import io.onedev.server.git.exception.ObsoleteCommitException;-import io.onedev.server.git.exception.RefUpdateException;public class GitUtils {diff --git a/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java b/server-core/src/main/java/io/onedev/server/git/command/GitCommand.javaindex 3b2695a7a7..95337658ef 100644--- a/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java@@ -9,7 +9,7 @@ import javax.annotation.Nullable;import org.eclipse.jgit.util.QuotedString;import io.onedev.agent.Agent;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.command.Commandline;import io.onedev.server.git.config.GitConfig;diff --git a/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPostReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPostReceiveCallback.javaindex d1a6194f60..dc8e01e43a 100644--- a/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPostReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/hookcallback/GitPostReceiveCallback.java@@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.StringUtils;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.RefUpdated;diff --git a/server-core/src/main/java/io/onedev/server/imports/IssueImporterContribution.java b/server-core/src/main/java/io/onedev/server/imports/IssueImporterContribution.javaindex 209420722e..adc178abcd 100644--- a/server-core/src/main/java/io/onedev/server/imports/IssueImporterContribution.java+++ b/server-core/src/main/java/io/onedev/server/imports/IssueImporterContribution.java@@ -3,7 +3,7 @@ package io.onedev.server.imports;import java.io.Serializable;import java.util.Collection;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;@ExtensionPointpublic interface IssueImporterContribution {diff --git a/server-core/src/main/java/io/onedev/server/imports/ProjectImporterContribution.java b/server-core/src/main/java/io/onedev/server/imports/ProjectImporterContribution.javaindex 94d9a78f2f..a13ba0e915 100644--- a/server-core/src/main/java/io/onedev/server/imports/ProjectImporterContribution.java+++ b/server-core/src/main/java/io/onedev/server/imports/ProjectImporterContribution.java@@ -3,7 +3,7 @@ package io.onedev.server.imports;import java.io.Serializable;import java.util.Collection;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;@ExtensionPointpublic interface ProjectImporterContribution {diff --git a/server-core/src/main/java/io/onedev/server/infomanager/AbstractEnvironmentManager.java b/server-core/src/main/java/io/onedev/server/infomanager/AbstractEnvironmentManager.javaindex c50fb80007..b3b3a6ecee 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/AbstractEnvironmentManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/AbstractEnvironmentManager.java@@ -15,7 +15,7 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.FileUtils;import io.onedev.server.event.system.SystemStopping;import jetbrains.exodus.ArrayByteIterable;diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.javaindex 0940712d3b..e663db71aa 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java@@ -42,7 +42,7 @@ import com.google.common.base.Preconditions;import com.google.common.base.Splitter;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.PathUtils;import io.onedev.commons.utils.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.javaindex b9ee8488c8..0528a6fc60 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java@@ -13,7 +13,7 @@ import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.FileUtils;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestUpdateManager;diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultUserInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultUserInfoManager.javaindex c90c41e098..792ce0412e 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultUserInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultUserInfoManager.java@@ -10,7 +10,7 @@ import org.joda.time.DateTime;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.event.codecomment.CodeCommentEvent;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.issue.IssueEvent;diff --git a/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java b/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.javaindex 2a8bd9e28f..7ec132be93 100644--- a/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java+++ b/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java@@ -15,7 +15,7 @@ import org.eclipse.jetty.websocket.api.Session;import org.hibernate.query.Query;import io.onedev.agent.AgentData;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.TaskLogger;diff --git a/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java b/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.javaindex 7154f6c988..50d9b014ff 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java@@ -14,7 +14,7 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.server.persistence.DefaultPersistManager;import io.onedev.server.persistence.HibernateProperties;import io.onedev.server.persistence.IdManager;diff --git a/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.javaindex 1fe28cd349..7c4441a58a 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java@@ -11,8 +11,7 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.bootstrap.BootstrapUtils;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.server.persistence.DefaultPersistManager;@@ -67,7 +66,7 @@ public class BackupDatabase extends DefaultPersistManager {File tempDir = FileUtils.createTempDir("backup");try {exportData(tempDir);- BootstrapUtils.zip(tempDir, backupFile);+ FileUtils.zip(tempDir, backupFile, null);} catch (Exception e) {throw ExceptionUtils.unchecked(e);} finally {diff --git a/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java b/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.javaindex 23c83a2c08..f476f2af44 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java@@ -9,7 +9,7 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.server.persistence.DefaultPersistManager;import io.onedev.server.persistence.HibernateProperties;import io.onedev.server.persistence.IdManager;diff --git a/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.javaindex 443db8ed96..d039ba6783 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java@@ -10,7 +10,7 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.server.persistence.DefaultPersistManager;import io.onedev.server.persistence.HibernateProperties;import io.onedev.server.persistence.IdManager;diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 4003f4777a..58ff49da0d 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -26,10 +26,9 @@ import com.google.common.base.Throwables;import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.bootstrap.BootstrapUtils;-import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ManagedSerializedForm;+import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.loader.Listen;+import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;@@ -325,7 +324,7 @@ public class DefaultDataManager implements DataManager, Serializable {persistManager.exportData(tempDir);File backupFile = new File(backupDir,DateTimeFormat.forPattern(Upgrade.BACKUP_DATETIME_FORMAT).print(new DateTime()) + ".zip");- BootstrapUtils.zip(tempDir, backupFile);+ FileUtils.zip(tempDir, backupFile, null);} catch (Exception e) {notifyBackupError(e);throw ExceptionUtils.unchecked(e);diff --git a/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java b/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.javaindex c40c94e829..8dd17704fd 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java@@ -10,7 +10,7 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.DefaultPersistManager;diff --git a/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.javaindex 2e5f38bc27..49b4fcd0d8 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java@@ -11,9 +11,8 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.bootstrap.BootstrapUtils;-import io.onedev.commons.launcher.bootstrap.Command;+import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Command;import io.onedev.commons.utils.FileUtils;import io.onedev.server.persistence.DefaultPersistManager;import io.onedev.server.persistence.HibernateProperties;@@ -65,7 +64,7 @@ public class RestoreDatabase extends DefaultPersistManager {if (backupFile.isFile()) {File dataDir = FileUtils.createTempDir("restore");try {- BootstrapUtils.unzip(backupFile, dataDir);+ FileUtils.unzip(backupFile, dataDir);doRestore(metadata, dataDir);} finally {FileUtils.deleteDir(dataDir);diff --git a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.javaindex b4589bc3df..e7e6c6f02a 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java@@ -20,8 +20,8 @@ import org.joda.time.format.DateTimeFormat;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.command.Commandline;@@ -82,8 +82,13 @@ public class Upgrade extends DefaultPersistManager {bootstrapClass = "com.turbodev.launcher.bootstrap.Bootstrap";} else if (version.startsWith("2.0.")) {bootstrapClass = "io.onedev.launcher.bootstrap.Bootstrap";- } else {+ } else if (version.startsWith("3.") || version.startsWith("4.0.") || version.startsWith("4.1.")+ || version.startsWith("4.2.") || version.startsWith("4.3.") || version.startsWith("4.4.")+ || version.startsWith("4.5.") || version.startsWith("4.6.") || version.startsWith("4.7.")+ || version.startsWith("4.8.") || version.startsWith("4.9.")) {bootstrapClass = "io.onedev.commons.launcher.bootstrap.Bootstrap";+ } else {+ bootstrapClass = "io.onedev.commons.bootstrap.Bootstrap";}if (version.startsWith("1.") || version.startsWith("2.")) {diff --git a/server-core/src/main/java/io/onedev/server/markdown/MarkdownProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/MarkdownProcessor.javaindex 9ac3405e88..3d6a7156d7 100644--- a/server-core/src/main/java/io/onedev/server/markdown/MarkdownProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/MarkdownProcessor.java@@ -4,7 +4,7 @@ import javax.annotation.Nullable;import org.jsoup.nodes.Document;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.server.model.Project;@ExtensionPointdiff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex e6a935fc84..62d96f25af 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@@ -28,8 +28,8 @@ import org.dom4j.Node;import com.google.common.base.Preconditions;-import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java b/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.javaindex 05f5a0f236..03c208af27 100644--- a/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java+++ b/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java@@ -47,7 +47,7 @@ import com.thoughtworks.xstream.io.xml.Dom4JReader;import com.thoughtworks.xstream.io.xml.Dom4JWriter;import com.thoughtworks.xstream.mapper.CannotResolveClassException;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java b/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.javaindex 2c4da14e07..6e17179765 100644--- a/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java+++ b/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java@@ -36,7 +36,7 @@ import org.yaml.snakeyaml.resolver.Resolver;import org.yaml.snakeyaml.serializer.Serializer;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.launcher.loader.ImplementationRegistry;+import io.onedev.commons.loader.ImplementationRegistry;import io.onedev.commons.utils.ClassUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex f63c7c6d48..85157d9288 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -70,7 +70,7 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LinearRange;@@ -89,6 +89,8 @@ import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.RefUpdated;+import io.onedev.server.exception.NotFileException;+import io.onedev.server.exception.ObjectNotFoundException;import io.onedev.server.git.BlameBlock;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;@@ -98,8 +100,6 @@ import io.onedev.server.git.RefInfo;import io.onedev.server.git.Submodule;import io.onedev.server.git.command.BlameCommand;import io.onedev.server.git.command.ListChangedFilesCommand;-import io.onedev.server.git.exception.NotFileException;-import io.onedev.server.git.exception.ObjectNotFoundException;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build.Status;import io.onedev.server.model.support.BranchProtection;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex 6a0b030be2..23c93dca64 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -8,7 +8,7 @@ import org.hibernate.validator.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.JobContext;import io.onedev.server.entitymanager.BuildManager;diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.javaindex 27888afde2..3de9b7edaa 100644--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java@@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.entitymanager.UserManager;diff --git a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.javaindex c76a000bd1..3a3ac941af 100644--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java@@ -6,7 +6,7 @@ import javax.inject.Singleton;import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.entitymanager.UserManager;diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.javaindex e072b88bbc..4d09356133 100644--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java@@ -17,7 +17,7 @@ import org.unbescape.html.HtmlEscape;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.event.RefUpdated;diff --git a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.javaindex 4b7470a5a8..a3319d0da6 100644--- a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java@@ -58,8 +58,8 @@ import com.google.common.collect.Lists;import com.sun.mail.imap.IMAPFolder;import edu.emory.mathcs.backport.java.util.Arrays;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javaindex 55d57e51db..e673ff0b50 100644--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java@@ -13,7 +13,7 @@ import javax.inject.Singleton;import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.entitymanager.IssueWatchManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javaindex 4ab9bf3074..1c553d8232 100644--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java@@ -15,7 +15,7 @@ import org.apache.commons.text.WordUtils;import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.entitymanager.PullRequestWatchManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;diff --git a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.javaindex e69a45313b..79cc21ee26 100644--- a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java@@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.support.WebHook;import io.onedev.server.persistence.annotation.Sessional;diff --git a/server-core/src/main/java/io/onedev/server/persistence/IdGenerator.java b/server-core/src/main/java/io/onedev/server/persistence/IdGenerator.javaindex b1ad916fd6..fa81e9a6c2 100644--- a/server-core/src/main/java/io/onedev/server/persistence/IdGenerator.java+++ b/server-core/src/main/java/io/onedev/server/persistence/IdGenerator.java@@ -11,7 +11,7 @@ import org.hibernate.id.IdentifierGenerator;import org.hibernate.service.ServiceRegistry;import org.hibernate.type.Type;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;public class IdGenerator implements IdentifierGenerator, Configurable {diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java b/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.javaindex 07924d652d..ca29f61600 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java@@ -11,8 +11,8 @@ import org.hibernate.Criteria;import org.hibernate.Session;import org.hibernate.criterion.Projections;-import io.onedev.commons.launcher.loader.ListenerRegistry;-import io.onedev.commons.launcher.loader.ManagedSerializedForm;+import io.onedev.commons.loader.ListenerRegistry;+import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.model.AbstractEntity;diff --git a/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java b/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.javaindex 07fe783f19..5ac605048a 100644--- a/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java@@ -41,13 +41,13 @@ import com.google.common.base.Preconditions;import com.google.common.base.Splitter;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.exception.ObjectNotFoundException;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobContent;import io.onedev.server.git.BlobEdits;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.RevListCommand;-import io.onedev.server.git.exception.ObjectNotFoundException;import io.onedev.server.model.Project;import io.onedev.server.rest.annotation.Api;import io.onedev.server.rest.jersey.InvalidParamException;diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/GitObjectNotFoundExceptionMapper.java b/server-core/src/main/java/io/onedev/server/rest/jersey/GitObjectNotFoundExceptionMapper.javaindex 75e1996ddc..03972352ba 100644--- a/server-core/src/main/java/io/onedev/server/rest/jersey/GitObjectNotFoundExceptionMapper.java+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/GitObjectNotFoundExceptionMapper.java@@ -5,7 +5,7 @@ import javax.ws.rs.core.Response.ResponseBuilder;import javax.ws.rs.ext.ExceptionMapper;import javax.ws.rs.ext.Provider;-import io.onedev.server.git.exception.ObjectNotFoundException;+import io.onedev.server.exception.ObjectNotFoundException;@Providerpublic class GitObjectNotFoundExceptionMapper implements ExceptionMapper<ObjectNotFoundException> {diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java b/server-core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.javaindex 9f6a44f362..dfd66a553a 100644--- a/server-core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java@@ -11,7 +11,7 @@ import org.glassfish.jersey.server.ServerProperties;import org.jvnet.hk2.guice.bridge.api.GuiceBridge;import org.jvnet.hk2.guice.bridge.api.GuiceIntoHK2Bridge;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;public class JerseyApplication extends ResourceConfig {diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java b/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.javaindex 84b688c7c1..79b4bc332f 100644--- a/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java@@ -8,7 +8,7 @@ import javax.ws.rs.ext.Provider;import org.apache.shiro.authz.UnauthenticatedException;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;@Providerpublic class UnauthenticatedExceptionMapper implements ExceptionMapper<UnauthenticatedException> {diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java b/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.javaindex c1fb9d8a72..f3edb9ca4c 100644--- a/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java@@ -9,7 +9,7 @@ import javax.ws.rs.ext.Provider;import org.apache.shiro.SecurityUtils;import org.apache.shiro.authz.UnauthorizedException;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;@Providerpublic class UnauthorizedExceptionMapper implements ExceptionMapper<UnauthorizedException> {diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/ValidationConfigurationContextResolver.java b/server-core/src/main/java/io/onedev/server/rest/jersey/ValidationConfigurationContextResolver.javaindex 7c8650e891..dd80453612 100644--- a/server-core/src/main/java/io/onedev/server/rest/jersey/ValidationConfigurationContextResolver.java+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/ValidationConfigurationContextResolver.java@@ -9,7 +9,7 @@ import javax.ws.rs.ext.Provider;import org.glassfish.jersey.server.validation.ValidationConfig;import org.glassfish.jersey.server.validation.internal.InjectingConstraintValidatorFactory;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;@Providerpublic class ValidationConfigurationContextResolver implements ContextResolver<ValidationConfig> {diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.javaindex 36aba08182..012043f591 100644--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java@@ -69,8 +69,8 @@ import com.google.common.base.Preconditions;import io.onedev.commons.jsymbol.Symbol;import io.onedev.commons.jsymbol.SymbolExtractor;import io.onedev.commons.jsymbol.SymbolExtractorRegistry;-import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.Listen;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.javaindex 56d95e2bb7..e1f9b705e5 100644--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java@@ -43,7 +43,7 @@ import com.google.common.base.Preconditions;import io.onedev.commons.jsymbol.Symbol;import io.onedev.commons.jsymbol.SymbolExtractorRegistry;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStopping;diff --git a/server-core/src/main/java/io/onedev/server/security/FilterChainConfigurator.java b/server-core/src/main/java/io/onedev/server/security/FilterChainConfigurator.javaindex 02fe201f53..7cfcd555fb 100644--- a/server-core/src/main/java/io/onedev/server/security/FilterChainConfigurator.java+++ b/server-core/src/main/java/io/onedev/server/security/FilterChainConfigurator.java@@ -2,7 +2,7 @@ package io.onedev.server.security;import org.apache.shiro.web.filter.mgt.FilterChainManager;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;@ExtensionPointpublic interface FilterChainConfigurator {diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex 493756a611..3872261cea 100644--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.UserManager;diff --git a/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java b/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.javaindex 722e361c7f..ab869b0783 100644--- a/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java+++ b/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java@@ -12,7 +12,7 @@ import org.apache.sshd.server.auth.pubkey.CachingPublicKeyAuthenticator;import org.apache.sshd.server.command.Command;import org.apache.sshd.server.shell.UnknownCommand;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.util.ServerConfig;diff --git a/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.javaindex d5d390fef3..f4392c3cdc 100644--- a/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java+++ b/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java@@ -11,7 +11,7 @@ import org.quartz.ScheduleBuilder;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.FileUtils;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;diff --git a/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.javaindex b8f526cef8..3512a6a66d 100644--- a/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java+++ b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java@@ -9,8 +9,8 @@ import javax.inject.Singleton;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.FileUtils;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarting;diff --git a/server-core/src/main/java/io/onedev/server/tasklog/DefaultLogManager.java b/server-core/src/main/java/io/onedev/server/tasklog/DefaultLogManager.javaindex dbef437ec9..9117919fe7 100644--- a/server-core/src/main/java/io/onedev/server/tasklog/DefaultLogManager.java+++ b/server-core/src/main/java/io/onedev/server/tasklog/DefaultLogManager.java@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Splitter;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.TaskLogger;diff --git a/server-core/src/main/java/io/onedev/server/util/ExceptionUtils.java b/server-core/src/main/java/io/onedev/server/util/ExceptionUtils.javaindex 29ac38dd04..1d1a06ee1d 100644--- a/server-core/src/main/java/io/onedev/server/util/ExceptionUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/ExceptionUtils.java@@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory;import com.google.common.net.HttpHeaders;import io.onedev.server.OneDev;+import io.onedev.server.exception.NotReadyException;import io.onedev.server.model.User;import io.onedev.server.web.ExpectedExceptionContribution;@@ -38,8 +39,14 @@ public class ExceptionUtils extends io.onedev.commons.utils.ExceptionUtils {} else if (find(exception, UnknownAccountException.class) != null) {response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unknown user name.");} else {- logger.warn("Error serving request", exception);- response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, exception.getMessage());+ NotReadyException notReadyException = ExceptionUtils.find(exception, NotReadyException.class);+ if (notReadyException != null) {+ logger.debug("Unable to serve request as system is not ready yet");+ response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, notReadyException.getMessage());+ } else {+ logger.warn("Error serving request", exception);+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, exception.getMessage());+ }}} catch (IOException e) {throw new RuntimeException(e);diff --git a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.javaindex 95c7aae442..dd254b0580 100644--- a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java@@ -16,6 +16,7 @@ import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.exception.ScriptException;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.util.script.ScriptContribution;import io.onedev.server.util.script.identity.ScriptIdentity;diff --git a/server-core/src/main/java/io/onedev/server/util/ObjectReference.java b/server-core/src/main/java/io/onedev/server/util/ObjectReference.javaindex b1a0b86423..2128853056 100644--- a/server-core/src/main/java/io/onedev/server/util/ObjectReference.java+++ b/server-core/src/main/java/io/onedev/server/util/ObjectReference.java@@ -2,6 +2,8 @@ package io.onedev.server.util;import java.io.Closeable;+import io.onedev.server.exception.NotReadyException;+public abstract class ObjectReference<T> implements Closeable {private int count;@@ -30,7 +32,7 @@ public abstract class ObjectReference<T> implements Closeable {public synchronized T get() {if (object == null)- throw new RuntimeException("Object not initialized yet");+ throw new NotReadyException();elsereturn object;}diff --git a/server-core/src/main/java/io/onedev/server/util/RevisionAndPath.java b/server-core/src/main/java/io/onedev/server/util/RevisionAndPath.javaindex 0fd575f493..505742c998 100644--- a/server-core/src/main/java/io/onedev/server/util/RevisionAndPath.java+++ b/server-core/src/main/java/io/onedev/server/util/RevisionAndPath.java@@ -5,7 +5,7 @@ import java.util.List;import javax.annotation.Nullable;-import io.onedev.server.git.exception.ObjectNotFoundException;+import io.onedev.server.exception.ObjectNotFoundException;import io.onedev.server.model.Project;public class RevisionAndPath implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java b/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.javaindex 1064a8875d..ccc5bcdd12 100644--- a/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java@@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.jsontype.TypeSerializer;import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;import com.fasterxml.jackson.databind.util.StdDateFormat;-import io.onedev.commons.launcher.loader.ImplementationRegistry;+import io.onedev.commons.loader.ImplementationRegistry;@Singletonpublic class ObjectMapperProvider implements Provider<ObjectMapper> {diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ForeignKeyDeserializer.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ForeignKeyDeserializer.javaindex 4c221df244..b0c5ae5fc1 100644--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ForeignKeyDeserializer.java+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ForeignKeyDeserializer.java@@ -7,7 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.DeserializationContext;import com.fasterxml.jackson.databind.deser.std.StdDeserializer;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.model.AbstractEntity;import io.onedev.server.persistence.dao.Dao;diff --git a/server-core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java b/server-core/src/main/java/io/onedev/server/util/jetty/AssetServlet.javaindex 8b69d5a1f2..a5f8434ff3 100644--- a/server-core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java+++ b/server-core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java@@ -20,7 +20,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;import org.eclipse.jetty.servlet.ServletMapping;import org.eclipse.jetty.util.resource.Resource;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;/*** Asset servlet to serve static web assets with some default parameters.diff --git a/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java b/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.javaindex d89ed4e29f..e3aec06d88 100644--- a/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java+++ b/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java@@ -21,7 +21,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;import com.google.inject.servlet.GuiceFilter;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExceptionUtils;@Singletondiff --git a/server-core/src/main/java/io/onedev/server/util/jetty/ServerConfigurator.java b/server-core/src/main/java/io/onedev/server/util/jetty/ServerConfigurator.javaindex 5b2a449d88..aff779a469 100644--- a/server-core/src/main/java/io/onedev/server/util/jetty/ServerConfigurator.java+++ b/server-core/src/main/java/io/onedev/server/util/jetty/ServerConfigurator.java@@ -2,7 +2,7 @@ package io.onedev.server.util.jetty;import org.eclipse.jetty.server.Server;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;@ExtensionPointpublic interface ServerConfigurator {diff --git a/server-core/src/main/java/io/onedev/server/util/jetty/ServletConfigurator.java b/server-core/src/main/java/io/onedev/server/util/jetty/ServletConfigurator.javaindex 23eb971c00..6344720ac4 100644--- a/server-core/src/main/java/io/onedev/server/util/jetty/ServletConfigurator.java+++ b/server-core/src/main/java/io/onedev/server/util/jetty/ServletConfigurator.java@@ -2,7 +2,7 @@ package io.onedev.server.util.jetty;import org.eclipse.jetty.servlet.ServletContextHandler;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;@ExtensionPointpublic interface ServletConfigurator {diff --git a/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.java b/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.javaindex 87d7a1996f..5d2d8a2900 100644--- a/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.java+++ b/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.java@@ -4,7 +4,7 @@ import javax.annotation.Nullable;import org.eclipse.jgit.revwalk.RevCommit;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.javaindex bd46a01939..3ff498a13f 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java@@ -5,7 +5,7 @@ import java.io.File;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;import io.onedev.server.util.validation.annotation.Directory;diff --git a/server-core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.java b/server-core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.javaindex 96849970dc..758e6bc466 100644--- a/server-core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.java+++ b/server-core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.java@@ -17,7 +17,7 @@ import org.apache.shiro.util.ThreadContext;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.security.SecurityUtils;diff --git a/server-core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.java b/server-core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.javaindex b5756e1f0c..25ab4dae0a 100644--- a/server-core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.java+++ b/server-core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.java@@ -14,7 +14,7 @@ import java.util.concurrent.TimeoutException;import javax.inject.Singleton;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.concurrent.PrioritizedCallable;diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java b/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.javaindex 9f484d9233..69121ed8ad 100644--- a/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java+++ b/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java@@ -10,7 +10,7 @@ import com.thoughtworks.xstream.converters.UnmarshallingContext;import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;import com.thoughtworks.xstream.mapper.Mapper;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.model.AbstractEntity;import io.onedev.server.persistence.dao.Dao;diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultUploadItemManager.java b/server-core/src/main/java/io/onedev/server/web/DefaultUploadItemManager.javaindex 00163696ba..86c7096d9c 100644--- a/server-core/src/main/java/io/onedev/server/web/DefaultUploadItemManager.java+++ b/server-core/src/main/java/io/onedev/server/web/DefaultUploadItemManager.java@@ -14,7 +14,7 @@ import org.apache.commons.fileupload.FileItem;import org.quartz.ScheduleBuilder;import org.quartz.SimpleScheduleBuilder;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.persistence.annotation.Sessional;diff --git a/server-core/src/main/java/io/onedev/server/web/ExpectedExceptionContribution.java b/server-core/src/main/java/io/onedev/server/web/ExpectedExceptionContribution.javaindex 10a14d27df..a3c7da1e10 100644--- a/server-core/src/main/java/io/onedev/server/web/ExpectedExceptionContribution.java+++ b/server-core/src/main/java/io/onedev/server/web/ExpectedExceptionContribution.java@@ -2,7 +2,7 @@ package io.onedev.server.web;import java.util.Collection;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;@ExtensionPointpublic interface ExpectedExceptionContribution {diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex a1ff3a134c..e308311344 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -174,7 +174,6 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new BaseResourceMapper("downloads/server-log", new ServerLogResourceReference()));add(new BaseResourceMapper("downloads/agent-log/${agent}", new AgentLogResourceReference()));add(new BaseResourceMapper("downloads/agent.zip", new AgentResourceReference()));- add(new BaseResourceMapper("downloads/agent.tar.gz", new AgentResourceReference()));add(new BaseResourceMapper("downloads/agent-lib", new AgentLibResourceReference()));add(new BaseResourceMapper("downloads/projects/${project}/builds/${build}/log",new BuildLogResourceReference()));diff --git a/server-core/src/main/java/io/onedev/server/web/ResourcePackScopeContribution.java b/server-core/src/main/java/io/onedev/server/web/ResourcePackScopeContribution.javaindex f06d2f3fae..241017ea13 100644--- a/server-core/src/main/java/io/onedev/server/web/ResourcePackScopeContribution.java+++ b/server-core/src/main/java/io/onedev/server/web/ResourcePackScopeContribution.java@@ -2,7 +2,7 @@ package io.onedev.server.web;import java.util.Collection;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;@ExtensionPointpublic interface ResourcePackScopeContribution {diff --git a/server-core/src/main/java/io/onedev/server/web/WebApplication.java b/server-core/src/main/java/io/onedev/server/web/WebApplication.javaindex de20ba37c9..d206650b5e 100644--- a/server-core/src/main/java/io/onedev/server/web/WebApplication.java+++ b/server-core/src/main/java/io/onedev/server/web/WebApplication.java@@ -56,8 +56,8 @@ import org.apache.wicket.util.file.IResourceFinder;import org.apache.wicket.util.resource.IResourceStream;import org.apache.wicket.util.time.Duration;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/web/WebApplicationConfigurator.java b/server-core/src/main/java/io/onedev/server/web/WebApplicationConfigurator.javaindex 8ff1931e94..ef5e30d830 100644--- a/server-core/src/main/java/io/onedev/server/web/WebApplicationConfigurator.java+++ b/server-core/src/main/java/io/onedev/server/web/WebApplicationConfigurator.java@@ -2,7 +2,7 @@ package io.onedev.server.web;import org.apache.wicket.protocol.http.WebApplication;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;@ExtensionPointpublic interface WebApplicationConfigurator {diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/freebsd.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/freebsd.svgnew file mode 100644index 0000000000..ff3520238a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/freebsd.svg@@ -0,0 +1 @@+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1630280278458" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1655" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M671.38947 192.4c22.2-22.2 231-154 278.4-106.4 47.4 47.4-84.2 256.2-106.4 278.4-22.2 22.2-78.8 1.8-126.2-45.8-47.6-47.4-68.2-104-45.8-126.2zM283.78947 136.2C211.18947 95 107.98947 49.2 75.18947 82.2c-33.2 33.2 14.2 138.8 55.8 211.4 37-64.4 89.6-118.6 152.8-157.4zM877.38947 348c6.6 22.6 5.4 41.4-5.4 52.2-40.6 40.6-175-54-218.6-140.2-36-64.6-22.2-106.8 29.8-97.4 11.4-7.2 24.6-15.2 39.2-23.2-59.6-31-127.2-48.6-199-48.6-238.2 0-431.2 193-431.2 431.2 0 238 193 431.2 431.2 431.2S954.58947 760.2 954.58947 522c0-76.8-20.2-149-55.4-211.6-7.8 14-15.2 26.6-21.8 37.6z" fill="" p-id="1656"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.javaindex 38a4cd045d..7c404425c6 100644--- a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java+++ b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java@@ -16,7 +16,7 @@ import org.eclipse.jgit.lib.PersonIdent;import com.google.common.base.Splitter;import com.google.common.collect.Iterables;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.StringUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.javaindex dd8bc3097d..f5427a3bfa 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java@@ -24,7 +24,7 @@ import com.google.common.base.Splitter;import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.codeassist.InputStatus;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.commons.utils.LinearRange;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.RangeUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java b/server-core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.javaindex 7a0f2d0572..b5adc55c59 100644--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java@@ -7,7 +7,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.hibernate.criterion.Order;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.model.AbstractEntity;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java b/server-core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.javaindex 4341f5a3b2..5b91979116 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java@@ -5,7 +5,7 @@ import javax.annotation.Nullable;import org.apache.tika.mime.MediaType;import org.apache.wicket.markup.html.panel.Panel;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.server.git.BlobChange;import io.onedev.server.web.component.diff.revision.DiffViewMode;diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.javaindex 53ffc3d10a..3312124a8e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java@@ -48,9 +48,9 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.PathUtils;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.exception.GitException;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.BlobIdentFilter;-import io.onedev.server.git.exception.GitException;import io.onedev.server.model.Project;import io.onedev.server.util.FilenameUtils;import io.onedev.server.util.UrlUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex cd1d0b2665..d885f18259 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -50,7 +50,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.base.Preconditions;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.markdown.MarkdownManager;diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex c1bea24cba..c8def1bc4e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -22,7 +22,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.hibernate.StaleStateException;import org.unbescape.javascript.JavaScriptEscape;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.javaindex 5837b8020c..4032deb54e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java@@ -29,7 +29,7 @@ import org.quartz.ScheduleBuilder;import org.quartz.SimpleScheduleBuilder;import org.unbescape.html.HtmlEscape;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.commons.utils.WordUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.javaindex 275a949fea..f8e3288bee 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex 05e1286fe6..0992b3a465 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -31,7 +31,7 @@ import org.apache.wicket.util.visit.IVisitor;import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidator;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.Path;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/EditSupport.javaindex c3488cf7e8..2ec8657b3a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/EditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditSupport.java@@ -2,7 +2,7 @@ package io.onedev.server.web.editable;import java.io.Serializable;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;@ExtensionPointpublic interface EditSupport extends Serializable {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableModule.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableModule.javaindex 32062c6da8..9740ff2912 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableModule.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableModule.java@@ -1,6 +1,6 @@package io.onedev.server.web.editable;-import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.loader.AbstractPluginModule;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.javaindex 9bc48ab704..d21d0ecb44 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java@@ -13,7 +13,7 @@ import org.hibernate.proxy.HibernateProxyHelper;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.util.ComponentContext;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.javaindex 320ae112a0..d288d58ac9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java@@ -17,7 +17,7 @@ import org.apache.wicket.util.visit.IVisitor;import org.apache.wicket.validation.INullAcceptingValidator;import org.apache.wicket.validation.IValidatable;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.util.ComponentContext;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.javaindex 896d9725c7..a4f97e3686 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java@@ -23,8 +23,8 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.base.Preconditions;-import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.commons.launcher.loader.ImplementationRegistry;+import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.loader.ImplementationRegistry;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.util.Path;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.htmlindex 8c921e2dff..743b3293be 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html@@ -1,18 +1,18 @@<wicket:panel><div class="p-5"><h6 class="text-center mb-4">Download & Install Agent</h6>- <ol>+ <ul><li>Make sure <code>Server URL</code> in <a wicket:id="systemSetting" class="link-primary" target="_blank">system setting</a> is specified correctly</li>- <li>On remote machine where you want to install agent:</li>- <ul>+ <li>On remote machine (Windows/Mac/Linux/FreeBSD) where you want to install agent:</li>+ <ol><li>Make sure <a href="https://openjdk.java.net" target="_blank">JDK 1.8 or higher</a> is installed</li><li>Make sure docker engine is installed and docker command line is available in system path</li><li>Make sure git version 2.11.1 or higher is installed and available in system path</li>- <li>Download agent package for <a wicket:id="zip" class="link-primary">Windows</a> or <a wicket:id="targz" class="link-primary">Linux/Mac</a>. A new agent token will be included in the package</li>+ <li>Download <a wicket:id="agent" class="link-primary">agent package</a>. A new agent token will be included in the package</li><li>Extract the package into a folder</li>- <li>From extracted folder, run <code>bin/agent.sh console</code> (Linux/Mac) or <code>bin\agent.bat console</code> (Windows)</li>- </ul>+ <li>From extracted folder, run <code>bin\agent.bat console</code> on Windows or <code>bin/agent.sh console</code> on other OS</li>+ </ol><li>Check <a wicket:id="installationGuide" class="link-primary" target="_blank">agent installation guide</a> for more details, such as running as service etc.</li>- </ol>+ </ul></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.javaindex 2c07b03ec0..1d380e433d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.java@@ -18,8 +18,7 @@ class AgentDownloadPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new ExternalLink("zip", "/downloads/agent.zip"));- add(new ExternalLink("targz", "/downloads/agent.tar.gz"));+ add(new ExternalLink("agent", "/downloads/agent.zip"));add(new BookmarkablePageLink<Void>("systemSetting", SystemSettingPage.class));add(new ExternalLink("installationGuide", OneDev.getInstance().getDocRoot() + "/agent-installation-guide.md"));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.javaindex 6a12871fb6..8a020bd670 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java@@ -40,7 +40,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.AgentManager;@@ -805,7 +805,7 @@ class AgentListPanel extends Panel {Agent agent = rowModel.getObject();Link<Void> link = new BookmarkablePageLink<Void>("link",AgentOverviewPage.class, AgentOverviewPage.paramsOf(agent));- link.add(new SpriteImage("icon", agent.getOs().name().toLowerCase()));+ link.add(new SpriteImage("icon", agent.getOs().getIcon()));link.add(new Label("label", agent.getName()));fragment.add(link);cellItem.add(fragment);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.javaindex 61abadcd64..1a2621acab 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java@@ -83,7 +83,8 @@ public class AgentOverviewPage extends AgentDetailPage {});- add(new SpriteImage("icon", getAgent().getOs().name().toLowerCase()));+ add(new SpriteImage("icon", getAgent().getOs().getIcon()));+add(new Label("name", getAgent().getName()));add(new Label("ipAddress", getAgent().getIpAddress()));add(new Label("osVersion", getAgent().getOsVersion()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.javaindex 69366fce98..966c17547e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java@@ -11,7 +11,6 @@ import org.apache.wicket.markup.html.link.ResourceLink;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;-import io.onedev.commons.launcher.bootstrap.BootstrapUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;@@ -61,7 +60,7 @@ public class DatabaseBackupPage extends AdministrationPage {try {PersistManager persistManager = OneDev.getInstance(PersistManager.class);persistManager.exportData(tempDir);- BootstrapUtils.zip(tempDir, attributes.getResponse().getOutputStream());+ FileUtils.zip(tempDir, attributes.getResponse().getOutputStream());} finally {FileUtils.deleteDir(tempDir);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.javaindex 94c9231fa3..ddf57dc9ed 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.SystemSetting;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.javaindex 3089632676..ba8cc52ea0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.java@@ -13,7 +13,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex e38b28c94b..46fe592991 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -45,7 +45,7 @@ import org.unbescape.javascript.JavaScriptEscape;import com.google.common.base.Splitter;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.javaindex d0ea228bfb..1e2c0974a2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;import com.google.common.collect.Sets;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.launcher.loader.ImplementationRegistry;+import io.onedev.commons.loader.ImplementationRegistry;import io.onedev.server.OneDev;import io.onedev.server.model.AbstractEntity;import io.onedev.server.rest.annotation.Api;diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/AdministrationSettingContribution.java b/server-core/src/main/java/io/onedev/server/web/page/layout/AdministrationSettingContribution.javaindex 2a2df7f540..b834b8d8c2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/AdministrationSettingContribution.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/AdministrationSettingContribution.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.layout;import java.util.List;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;@ExtensionPointpublic interface AdministrationSettingContribution {diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex a2d7425358..de586c1a4c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -32,8 +32,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.commons.launcher.loader.Plugin;+import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.loader.Plugin;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex a30327d89b..07a3767fc6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -54,7 +54,7 @@ import com.google.common.base.Objects;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;@@ -63,14 +63,14 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestUpdateManager;import io.onedev.server.event.RefUpdated;+import io.onedev.server.exception.BlobEditException;+import io.onedev.server.exception.NotTreeException;+import io.onedev.server.exception.ObjectAlreadyExistsException;+import io.onedev.server.exception.ObsoleteCommitException;import io.onedev.server.git.BlobContent;import io.onedev.server.git.BlobEdits;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;-import io.onedev.server.git.exception.BlobEditException;-import io.onedev.server.git.exception.NotTreeException;-import io.onedev.server.git.exception.ObjectAlreadyExistsException;-import io.onedev.server.git.exception.ObsoleteCommitException;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.javaindex a33a9ab4d1..fba419712e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java@@ -4,7 +4,7 @@ import java.io.Serializable;import javax.annotation.Nullable;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.server.web.PrioritizedComponentRenderer;@ExtensionPointdiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex 65bd856233..0c456af098 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -38,14 +38,14 @@ import com.google.common.base.Objects;import com.google.common.base.Preconditions;import io.onedev.server.event.RefUpdated;+import io.onedev.server.exception.NotTreeException;+import io.onedev.server.exception.ObjectAlreadyExistsException;+import io.onedev.server.exception.ObsoleteCommitException;import io.onedev.server.git.BlobChange;import io.onedev.server.git.BlobContent;import io.onedev.server.git.BlobEdits;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;-import io.onedev.server.git.exception.NotTreeException;-import io.onedev.server.git.exception.ObjectAlreadyExistsException;-import io.onedev.server.git.exception.ObsoleteCommitException;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.javaindex 7ee738f226..d491ace332 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java@@ -42,7 +42,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import com.google.common.base.Throwables;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.BuildSpecAware;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.javaindex 7376db0c7f..ca6f664e82 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java@@ -5,7 +5,7 @@ import org.apache.wicket.Page;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.Model;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabHead;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTabContribution.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTabContribution.javaindex 791981bd68..42fa44d6fa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTabContribution.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTabContribution.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.builds.detail;import java.util.List;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.server.model.Build;@ExtensionPointdiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestSummaryContribution.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestSummaryContribution.javaindex 3525ca133a..cd6f96bc78 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestSummaryContribution.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestSummaryContribution.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.pullrequests.detail;import java.util.List;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;import io.onedev.server.model.PullRequest;@ExtensionPointdiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingContribution.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingContribution.javaindex 2f81e6a4b5..434561f473 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingContribution.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingContribution.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.project.setting;import java.util.List;-import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.loader.ExtensionPoint;@ExtensionPointpublic interface ProjectSettingContribution {diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.javaindex e4a1d5e33c..4040143897 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java@@ -15,7 +15,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.javaindex a1afb17c48..f5db9b7b79 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java@@ -10,7 +10,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.javaindex 09d2dba793..0ccd8d4871 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java@@ -15,7 +15,7 @@ import org.apache.wicket.request.resource.AbstractResource;import com.google.common.collect.Lists;import io.onedev.agent.Agent;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.javaindex 9f01468c34..1dbcbc71d4 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java@@ -5,26 +5,18 @@ import java.io.FileOutputStream;import java.io.IOException;import java.io.InputStream;import java.io.OutputStream;-import java.io.UnsupportedEncodingException;-import java.net.URLEncoder;import java.nio.charset.StandardCharsets;-import java.util.ArrayList;import java.util.Collection;import java.util.Properties;import java.util.UUID;import org.apache.commons.compress.utils.IOUtils;-import org.apache.commons.lang3.StringUtils;import org.apache.shiro.authz.UnauthorizedException;import org.apache.tika.mime.MimeTypes;-import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.resource.AbstractResource;-import com.google.common.collect.Lists;-import io.onedev.agent.Agent;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.bootstrap.BootstrapUtils;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;import io.onedev.server.OneDev;@@ -46,20 +38,13 @@ public class AgentResource extends AbstractResource {if (!new File(Bootstrap.installDir, "agent").exists())throw new ExplicitException("No agent package to download");- String path = RequestCycle.get().getRequest().getUrl().getPath();- boolean zipFormat = path.endsWith(".zip");-ResourceResponse response = new ResourceResponse();response.setContentType(MimeTypes.OCTET_STREAM);response.disableCaching();- try {- String fileName = StringUtils.substringAfterLast(path, "/");- response.setFileName(URLEncoder.encode(fileName, StandardCharsets.UTF_8.name()));- } catch (UnsupportedEncodingException e) {- throw new RuntimeException(e);- }+ response.setFileName("agent.zip");+response.setWriteCallback(new WriteCallback() {@Override@@ -68,42 +53,41 @@ public class AgentResource extends AbstractResource {try {String agentVersion = OneDev.getInstance(AgentManager.class).getAgentVersion();+ File agentDir = new File(tempDir, "agent");String wrapperConfContent = FileUtils.readFileToString(new File(Bootstrap.installDir, "agent/wrapper.conf"), StandardCharsets.UTF_8);wrapperConfContent = wrapperConfContent.replace("agentVersion", agentVersion);- FileUtils.writeStringToFile(new File(tempDir, "agent/conf/wrapper.conf"),+ FileUtils.writeStringToFile(new File(agentDir, "agent/conf/wrapper.conf"),wrapperConfContent, StandardCharsets.UTF_8);FileUtils.copyFile(new File(Bootstrap.installDir, "agent/wrapper-license.conf"),- new File(tempDir, "agent/conf/wrapper-license.conf"));+ new File(agentDir, "agent/conf/wrapper-license.conf"));FileUtils.copyFile(new File(Bootstrap.installDir, "agent/App.sh.in"),- new File(tempDir, "agent/bin/agent.sh"));+ new File(agentDir, "agent/bin/agent.sh"));FileUtils.copyFile(new File(Bootstrap.installDir, "agent/AppCommand.bat.in"),- new File(tempDir, "agent/bin/agent.bat"));-- new File(tempDir, "agent/bin/agent.sh").setExecutable(true);+ new File(agentDir, "agent/bin/agent.bat"));Properties props = new Properties();props.setProperty("serverUrl", OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl());AgentToken token = new AgentToken();- token.setNote("Token for downlaoded agent");+ token.setNote("Token for downloaded agent");token.setValue(UUID.randomUUID().toString());OneDev.getInstance(AgentTokenManager.class).save(token);props.setProperty("agentToken", token.getValue());- try (OutputStream os = new FileOutputStream(new File(tempDir, "agent/conf/agent.properties"))) {+ try (OutputStream os = new FileOutputStream(new File(agentDir, "agent/conf/agent.properties"))) {props.store(os, "");}try (InputStream is = Agent.class.getClassLoader().getResourceAsStream("agent/conf/logback.xml");- OutputStream os = new FileOutputStream(new File(tempDir, "agent/conf/logback.xml"));) {+ OutputStream os = new FileOutputStream(new File(agentDir, "agent/conf/logback.xml"));) {IOUtils.copy(is, os);}- FileUtils.touchFile(new File(tempDir, "agent/conf/attributes.properties"));- FileUtils.touchFile(new File(tempDir, "agent/logs/console.log"));- FileUtils.touchFile(new File(tempDir, "agent/status/do_not_remove.txt"));+ FileUtils.touchFile(new File(agentDir, "agent/conf/attributes.properties"));+ FileUtils.touchFile(new File(agentDir, "agent/logs/console.log"));+ FileUtils.touchFile(new File(agentDir, "agent/status/do_not_remove.txt"));Collection<String> agentLibs = OneDev.getInstance(AgentManager.class).getAgentLibs();@@ -111,26 +95,22 @@ public class AgentResource extends AbstractResource {if (file.getName().startsWith("libwrapper-")|| file.getName().startsWith("wrapper-")|| file.getName().equals("wrapper.jar")) {- FileUtils.copyFileToDirectory(file, new File(tempDir, "agent/boot"));- if (file.getName().startsWith("wrapper-") && !file.getName().startsWith("wrapper-windows-"))- new File(tempDir, "agent/boot/" + file.getName()).setExecutable(true);+ FileUtils.copyFileToDirectory(file, new File(agentDir, "agent/boot"));}}for (File file: Bootstrap.getBootDir().listFiles()) {if (agentLibs.contains(file.getName()))- FileUtils.copyFileToDirectory(file, new File(tempDir, "agent/lib/" + agentVersion));+ FileUtils.copyFileToDirectory(file, new File(agentDir, "agent/lib/" + agentVersion));}for (File file: Bootstrap.getLibDir().listFiles()) {if (agentLibs.contains(file.getName()))- FileUtils.copyFileToDirectory(file, new File(tempDir, "agent/lib/" + agentVersion));+ FileUtils.copyFileToDirectory(file, new File(agentDir, "agent/lib/" + agentVersion));}- OutputStream os = attributes.getResponse().getOutputStream();- if (zipFormat)- BootstrapUtils.zip(tempDir, os);- else- FileUtils.tar(tempDir, Lists.newArrayList("**"), new ArrayList<>(), os, true);+ File zipFile = new File(tempDir, "agent.zip");+ FileUtils.zip(agentDir, zipFile, "agent/boot/wrapper-*, agent/bin/*.sh");+ IOUtils.copy(zipFile, attributes.getResponse().getOutputStream());} finally {FileUtils.deleteDir(tempDir);}diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.javaindex ec62a00499..896db57940 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.java@@ -14,7 +14,7 @@ import org.apache.wicket.request.resource.AbstractResource;import com.google.common.base.Joiner;import io.onedev.agent.job.LogRequest;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.server.security.SecurityUtils;public class ServerLogResource extends AbstractResource {diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.javaindex 976a025928..dc21fa7651 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java@@ -3,7 +3,7 @@ package io.onedev.server.web.websocket;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.event.build.BuildEvent;import io.onedev.server.model.Build;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.javaindex a137a9e5e7..953640df58 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java@@ -3,7 +3,7 @@ package io.onedev.server.web.websocket;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.event.codecomment.CodeCommentEvent;import io.onedev.server.model.CodeComment;diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.javaindex dd0ecbdf0d..06b08b5b99 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java@@ -3,7 +3,7 @@ package io.onedev.server.web.websocket;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.search.code.CommitIndexed;@Singletondiff --git a/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java b/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.javaindex cc9f0f7e21..7b951dc5e0 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.StringUtils;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.javaindex 63ecb98e3b..47a55847c9 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java@@ -3,7 +3,7 @@ package io.onedev.server.web.websocket;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.event.issue.IssueEvent;import io.onedev.server.model.Issue;import io.onedev.server.model.support.issue.BoardSpec;diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.javaindex e621b7704b..eb779da8cd 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java@@ -3,7 +3,7 @@ package io.onedev.server.web.websocket;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.loader.Listen;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.model.PullRequest;diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.javaindex 349dac7bf9..9fc8785a5b 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java@@ -27,7 +27,7 @@ import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.OneDev;import io.onedev.server.persistence.SessionManager;diff --git a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.javaindex 278d5d7583..e65d3b2026 100644--- a/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java+++ b/server-core/src/test/java/io/onedev/server/git/AbstractGitTest.java@@ -19,8 +19,8 @@ import org.mockito.Mockito;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.commons.launcher.loader.AppLoaderMocker;+import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.loader.AppLoaderMocker;import io.onedev.commons.utils.FileUtils;import io.onedev.server.git.command.GitCommand;import io.onedev.server.git.config.GitConfig;diff --git a/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.java b/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.javaindex 55e32d420a..7b70c42ec7 100644--- a/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.java+++ b/server-core/src/test/java/io/onedev/server/git/BlobEditsTest.java@@ -22,10 +22,10 @@ import org.junit.Test;import com.google.common.collect.Maps;import com.google.common.collect.Sets;-import io.onedev.server.git.exception.NotTreeException;-import io.onedev.server.git.exception.ObjectAlreadyExistsException;-import io.onedev.server.git.exception.ObjectNotFoundException;-import io.onedev.server.git.exception.ObsoleteCommitException;+import io.onedev.server.exception.NotTreeException;+import io.onedev.server.exception.ObjectAlreadyExistsException;+import io.onedev.server.exception.ObjectNotFoundException;+import io.onedev.server.exception.ObsoleteCommitException;public class BlobEditsTest extends AbstractGitTest {diff --git a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.javaindex 5f8b1d6387..1119699812 100644--- a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java@@ -21,7 +21,6 @@ import org.junit.Test;import com.google.common.collect.Sets;import com.google.common.io.Resources;-import io.onedev.commons.launcher.bootstrap.BootstrapUtils;import io.onedev.commons.utils.FileUtils;public class GitUtilsTest extends AbstractGitTest {@@ -328,7 +327,7 @@ public class GitUtilsTest extends AbstractGitTest {tempDir = FileUtils.createTempDir();try (InputStream is = Resources.getResource(GitUtilsTest.class, "git-conflict-link-link.zip").openStream()) {- BootstrapUtils.unzip(is, tempDir);+ FileUtils.unzip(is, tempDir);try (Git git = Git.open(tempDir)) {ObjectId mergeCommitId;@@ -363,7 +362,7 @@ public class GitUtilsTest extends AbstractGitTest {tempDir = FileUtils.createTempDir();try (InputStream is = Resources.getResource(GitUtilsTest.class, "git-conflict-link-file.zip").openStream()) {- BootstrapUtils.unzip(is, tempDir);+ FileUtils.unzip(is, tempDir);try (Git git = Git.open(tempDir)) {ObjectId mergeCommitId;@@ -412,7 +411,7 @@ public class GitUtilsTest extends AbstractGitTest {tempDir = FileUtils.createTempDir();try (InputStream is = Resources.getResource(GitUtilsTest.class, "git-conflict-link-dir.zip").openStream()) {- BootstrapUtils.unzip(is, tempDir);+ FileUtils.unzip(is, tempDir);try (Git git = Git.open(tempDir)) {ObjectId mergeCommitId;diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 77c036023f..17c4a90bc1 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.10.0</version>+ <version>4.10.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex e1faf3db9a..40ece157f3 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>4.10.0</version>+ <version>4.10.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 6f5eb166de..e1ca0fd197 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapModule.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapModule.javaindex ec9b789a28..45179ccf57 100644--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapModule.java+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapModule.java@@ -4,8 +4,8 @@ import java.util.Collection;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.loader.ImplementationProvider;import io.onedev.server.model.support.administration.authenticator.Authenticator;/**diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex 057057094f..b0b1f5f4b6 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleModule.java b/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleModule.javaindex f6eeed1f7a..75605d62a2 100644--- a/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleModule.java+++ b/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleModule.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.buildspec.gradle;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.server.buildspec.job.JobSuggestion;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.util.script.ScriptContribution;diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex c08c812eb4..570874460a 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.javaindex 085fd9d528..256402d7c4 100644--- a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java+++ b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.buildspec.maven;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.server.buildspec.job.JobSuggestion;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.util.script.ScriptContribution;diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex 9d88297c9d..de58150f9f 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.javaindex 68d0a5a375..cf5d78094a 100644--- a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java+++ b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.buildspec.node;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.server.buildspec.job.JobSuggestion;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.util.script.ScriptContribution;diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex 32e1486413..3a13b81016 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.javaindex 2af687fa55..358cdc107c 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java@@ -6,8 +6,8 @@ import org.glassfish.jersey.server.ResourceConfig;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.loader.ImplementationProvider;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xmlindex 12cc1f5899..6c70edf5dc 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>4.10.0</version>+ <version>4.10.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerModule.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerModule.javaindex 543e304578..fe79dc4f96 100644--- a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerModule.java+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerModule.java@@ -4,8 +4,8 @@ import java.util.Collection;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.loader.ImplementationProvider;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;/**diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xmlindex 74cdad1404..e61fea80c5 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>4.10.0</version>+ <version>4.10.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 969fd7425f..7505e13c4e 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@@ -33,8 +33,8 @@ import com.google.common.base.Splitter;import com.google.common.base.Throwables;import io.onedev.agent.DockerUtils;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.PathUtils;diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.javaindex 3266aae74b..d57e6f78e3 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java@@ -4,8 +4,8 @@ import java.util.Collection;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.loader.ImplementationProvider;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xmlindex d6680d1019..a557a89da7 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketPluginModule.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketPluginModule.javaindex cc46d19406..82b42ed1bb 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketPluginModule.java+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketPluginModule.java@@ -5,7 +5,7 @@ import java.util.Collection;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.server.imports.ProjectImporter;import io.onedev.server.imports.ProjectImporterContribution;diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xmlindex e93f8eeaea..399938dfeb 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitea.GiteaPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaPluginModule.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaPluginModule.javaindex fe14872f07..4e87a4224a 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaPluginModule.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaPluginModule.java@@ -5,7 +5,7 @@ import java.util.Collection;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.server.imports.IssueImporter;import io.onedev.server.imports.IssueImporterContribution;import io.onedev.server.imports.ProjectImporter;diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xmlindex 9d2e851825..ca5ee3761f 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.github.GitHubPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubPluginModule.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubPluginModule.javaindex 0f5692c49d..6f187c92eb 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubPluginModule.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubPluginModule.java@@ -5,7 +5,7 @@ import java.util.Collection;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.server.imports.IssueImporter;import io.onedev.server.imports.IssueImporterContribution;import io.onedev.server.imports.ProjectImporter;diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xmlindex 4dc90d64a9..7742cf34fb 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabPluginModule.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabPluginModule.javaindex f6a6d90af9..28cb4dfdc3 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabPluginModule.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabPluginModule.java@@ -5,7 +5,7 @@ import java.util.Collection;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.server.imports.IssueImporter;import io.onedev.server.imports.IssueImporterContribution;import io.onedev.server.imports.ProjectImporter;diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xmlindex 752b5e7be5..18a376e0c6 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraPluginModule.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraPluginModule.javaindex 8dc5965f3e..386e3c8540 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraPluginModule.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraPluginModule.java@@ -5,7 +5,7 @@ import java.util.Collection;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.server.imports.IssueImporter;import io.onedev.server.imports.IssueImporterContribution;import io.onedev.server.imports.ProjectImporter;diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xmlindex 31c12652c9..aafa1cf10c 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackPluginModule.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackPluginModule.javaindex af95dd6490..c7482489dc 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackPluginModule.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackPluginModule.java@@ -5,7 +5,7 @@ import java.util.Collection;import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.server.imports.IssueImporter;import io.onedev.server.imports.IssueImporterContribution;import io.onedev.server.imports.ProjectImporter;diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex f9a75884ee..ea98357cb0 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.checkstyle.CheckstylePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstylePluginModule.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstylePluginModule.javaindex 0f61128797..171232bab8 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstylePluginModule.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstylePluginModule.java@@ -15,8 +15,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.loader.ImplementationProvider;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;import io.onedev.server.buildspec.step.PublishReportStep;diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex 882c31cd9b..3919d65e52 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.clover.CloverPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverPluginModule.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverPluginModule.javaindex a747972044..a2a58fbba9 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverPluginModule.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverPluginModule.java@@ -17,8 +17,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.loader.ImplementationProvider;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;import io.onedev.server.buildspec.step.PublishReportStep;diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex 613b9fcec8..f14d79fffb 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.jest.JestTestReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.javaindex 1c8b54bc52..e5f8191454 100644--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java@@ -11,8 +11,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.loader.ImplementationProvider;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;import io.onedev.server.buildspec.step.PublishReportStep;diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex c28bd28315..56a6f69d44 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>4.10.0</version>+ <version>4.10.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportModule.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportModule.javaindex b4c1e4696a..46ed980169 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportModule.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportModule.java@@ -10,8 +10,8 @@ import org.apache.wicket.protocol.http.WebApplication;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.loader.ImplementationProvider;import io.onedev.commons.utils.LockUtils;import io.onedev.server.buildspec.step.PublishReportStep;import io.onedev.server.model.Build;diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex 57f1691f79..6373e60155 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>4.10.0</version>+ <version>4.10.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdModule.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdModule.javaindex 506b7c2c1e..518670eb59 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdModule.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdModule.java@@ -4,8 +4,8 @@ import java.util.Collection;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.loader.AbstractPluginModule;-import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.loader.ImplementationProvider;import io.onedev.server.model.support.administration.sso.SsoConnector;/**diff --git a/server-product/jsw/agent/App.sh.in b/server-product/jsw/agent/App.sh.inindex 765050df36..24ab04f82f 100644--- a/server-product/jsw/agent/App.sh.in+++ b/server-product/jsw/agent/App.sh.in@@ -36,22 +36,22 @@# of code otherwise the service won't be displayed in the Service# Configuration GUI.### BEGIN INIT INFO-# Provides: @app.name@+# Provides: onedevagent# Required-Start: $remote_fs $syslog# Should-Start: $network $time# Should-Stop: $network $time# Required-Stop: $remote_fs $syslog# Default-Start: 2 3 4 5# Default-Stop: 0 1 6-# Short-Description: @app.long.name@-# Description: @app.description@+# Short-Description: OneDev Agent+# Description: OneDev Agent### END INIT INFO# Application name and long name: If these variables are not set (or left to# the default tokens), APP_NAME will default to the name of the script, then# APP_LONG_NAME will default to the value of APP_NAME.-APP_NAME="@app.name@"-APP_LONG_NAME="@app.long.name@"+APP_NAME="onedevagent"+APP_LONG_NAME="OneDev Agent"# If uncommented (and set to false), APP_NAME and APP_LONG_NAME will no longer# be passed to the wrapper. See documentation for details.@@ -188,7 +188,7 @@ MACOSX_KEEP_RUNNING="false"# The following two lines are used by the chkconfig command. Change as is# appropriate for your application. They should remain commented.# chkconfig: 2345 20 80-# description: @app.long.name@+# description: OneDev Agent# Set run level to use when installing the application to start and stop on# system startup and shutdown. It is important that the application alwaysdiff --git a/server-product/jsw/wrapper-license.conf b/server-product/jsw/wrapper-license.confindex 10aecb6e3f..fe6297a353 100644--- a/server-product/jsw/wrapper-license.conf+++ b/server-product/jsw/wrapper-license.conf@@ -1,12 +1,13 @@#encoding=UTF-8wrapper.license.type=DEV-wrapper.license.id=202011090000032+wrapper.license.id=202108300000010wrapper.license.licensee=OneDevwrapper.license.group=service wrappingwrapper.license.dev_application=Service Wrappingwrapper.license.features=64bit-wrapper.license.key.0=5fa8-07f0-6085-83f0-wrapper.license.key.1=1ded-2c24-6b8e-324e-wrapper.license.key.2=3676-6bfc-dc6d-0667-wrapper.license.key.3=bbc8-7f00-5178-2737-wrapper.license.key.4=f359-433c-57ff-833e\ No newline at end of file+wrapper.license.upgrade_term.begin_date=2020-11-09+wrapper.license.upgrade_term.end_date=2022-04-26+wrapper.license.key.1=b528-07db-e82f-69d9+wrapper.license.key.2=76ab-ca7b-8f3e-b66f+wrapper.license.key.3=7a35-1c28-454a-f91e+wrapper.license.key.4=1753-a1df-4ee0-b711\ No newline at end of filediff --git a/server-product/jsw/wrapper.conf b/server-product/jsw/wrapper.confindex 8b1659409b..bc1d95db16 100644--- a/server-product/jsw/wrapper.conf+++ b/server-product/jsw/wrapper.conf@@ -85,7 +85,7 @@ wrapper.java.additional.16=--add-opens=java.desktop/java.awt.font=ALL-UNNAMEDwrapper.java.maxmemory.percent=60# Application parameters. Add parameters as needed starting from 1-wrapper.app.parameter.1=io.onedev.commons.launcher.bootstrap.Bootstrap+wrapper.app.parameter.1=io.onedev.commons.bootstrap.Bootstrap#********************************************************************# Wrapper Logging Propertiesdiff --git a/server-product/pom.xml b/server-product/pom.xmlindex 286311c4f8..47c5816906 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.10.0</version>+ <version>4.10.3</version></parent><dependencies><dependency>diff --git a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.javaindex c2c6fcd078..19de478080 100644--- a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java+++ b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java@@ -11,8 +11,8 @@ import org.apache.commons.codec.binary.Base64;import org.apache.commons.lang3.StringUtils;import org.glassfish.jersey.internal.guava.Preconditions;-import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.util.ServerConfig;diff --git a/server-product/src/main/java/io/onedev/server/product/ProductModule.java b/server-product/src/main/java/io/onedev/server/product/ProductModule.javaindex c0b7622410..e19870f388 100644--- a/server-product/src/main/java/io/onedev/server/product/ProductModule.java+++ b/server-product/src/main/java/io/onedev/server/product/ProductModule.java@@ -8,8 +8,8 @@ import static org.hibernate.cfg.AvailableSettings.USER;import java.io.File;-import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.commons.launcher.loader.AbstractPluginModule;+import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.persistence.HibernateProperties;diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.javaindex 4876c2b347..d93d1e0cb3 100644--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java@@ -16,7 +16,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;import org.eclipse.jetty.servlet.ServletHolder;import org.glassfish.jersey.servlet.ServletContainer;-import io.onedev.commons.launcher.bootstrap.Bootstrap;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.server.ServerSocketServlet;import io.onedev.server.git.GitFilter;import io.onedev.server.git.hookcallback.GitPostReceiveCallback;