onedev/server

■ ■ ■ ■ ■ ■

pom.xml

		skipped 8 lines
9	9		<version>1.0.5</version>
10	10		</parent>
11	11		<artifactId>server</artifactId>
12		-	<version>5.3.1</version>
	12	+	<version>5.3.3</version>
13	13		<packaging>pom</packaging>
14	14		<build>
15	15		<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
		skipped 36 lines
52	52		<plugin>
53	53		<groupId>io.onedev</groupId>
54	54		<artifactId>plugin-maven</artifactId>
55		-	<version>2.0.6</version>
	55	+	<version>2.0.7</version>
56	56		<executions>
57	57		<execution>
58	58		<?m2e execute onConfiguration,onIncremental?>
		skipped 504 lines
563	563		</repository>
564	564		</repositories>
565	565		<properties>
566		-	<commons.version>2.0.16</commons.version>
567		-	<agent.version>1.1.3</agent.version>
	566	+	<commons.version>2.0.18</commons.version>
	567	+	<agent.version>1.1.5</agent.version>
568	568		<slf4j.version>1.7.30</slf4j.version>
569	569		<logback.version>1.2.0</logback.version>
570	570		<antlr.version>4.7.2</antlr.version>
		skipped 15 lines

■ ■ ■ ■ ■ ■

server-core/pom.xml

		skipped 6 lines
7	7		<parent>
8	8		<groupId>io.onedev</groupId>
9	9		<artifactId>server</artifactId>
10		-	<version>5.3.1</version>
	10	+	<version>5.3.3</version>
11	11		</parent>
12	12		<build>
13	13		<plugins>
		skipped 319 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java

1	1		package io.onedev.server.buildspec.job;
2	2
3	3		import java.io.Serializable;
4		-	import java.util.LinkedHashMap;
5	4		import java.util.List;
6		-	import java.util.Map;
7	5
8	6		import org.hibernate.validator.constraints.NotEmpty;
9	7
10	8		import io.onedev.commons.codeassist.InputSuggestion;
11		-	import io.onedev.k8shelper.KubernetesHelper;
12	9		import io.onedev.server.buildspec.BuildSpec;
13	10		import io.onedev.server.util.validation.annotation.RegEx;
14	11		import io.onedev.server.web.editable.annotation.Editable;
15	12		import io.onedev.server.web.editable.annotation.Interpolative;
16		-	import io.onedev.server.web.util.SuggestionUtils;
17	13
18	14		@Editable
19	15		public class CacheSpec implements Serializable {
		skipped 19 lines
39	35		@Editable(order=200, description="Specify path to cache. Non-absolute path is considered to be relative to job workspace. "
40	36		+ "Specify \".\" (without quote) to cache workspace itself. "
41	37		+ "<span class='text-warning'>Absolute path is not allowed if the job is executed by a shell executor</span>")
42		-	@Interpolative(variableSuggester="suggestVariables", literalSuggester="suggestPaths")
	38	+	@Interpolative(variableSuggester="suggestVariables")
43	39		@NotEmpty
44	40		public String getPath() {
45	41		return path;
		skipped 1 lines
47	43
48	44		public void setPath(String path) {
49	45		this.path = path;
50		-	}
51		-
52		-	@SuppressWarnings("unused")
53		-	private static List<InputSuggestion> suggestPaths(String matchWith) {
54		-	Map<String, String> candidates = new LinkedHashMap<>();
55		-	candidates.put(KubernetesHelper.HOME_PREFIX, "Path under user home");
56		-	return SuggestionUtils.suggest(candidates, matchWith);
57	46		}
58	47
59	48		@SuppressWarnings("unused")
		skipped 6 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java

		skipped 38 lines
39	39
40	40		@Override
41	41		public void start() {
42		-	if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
	42	+	if (isServerRunning(Bootstrap.installDir)) {
43	43		logger.error("Please stop server before applying db constraints");
44	44		System.exit(1);
45	45		}
		skipped 42 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java

		skipped 50 lines
51	51		System.exit(1);
52	52		}
53	53
54		-	if (Bootstrap.isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {
	54	+	if (isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {
55	55		logger.error("Please stop server before backing up database");
56	56		System.exit(1);
57	57		}
		skipped 26 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java

		skipped 33 lines
34	34
35	35		@Override
36	36		public void start() {
37		-	if (Bootstrap.isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {
	37	+	if (isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {
38	38		logger.error("Please stop server before checking data version");
39	39		System.exit(1);
40	40		}
		skipped 14 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java

		skipped 34 lines
35	35
36	36		@Override
37	37		public void start() {
38		-	if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
	38	+	if (isServerRunning(Bootstrap.installDir)) {
39	39		logger.error("Please stop server before cleaning database");
40	40		System.exit(1);
41	41		}
		skipped 23 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java

		skipped 46 lines
47	47		logger.error("Missing password parameter. Usage: {} <new password>", Bootstrap.command.getScript());
48	48		System.exit(1);
49	49		}
50		-	if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
	50	+	if (isServerRunning(Bootstrap.installDir)) {
51	51		logger.error("Please stop server before resetting admin password");
52	52		System.exit(1);
53	53		}
		skipped 29 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java

		skipped 52 lines
53	53
54	54		logger.info("Restoring database from {}...", backupFile.getAbsolutePath());
55	55
56		-	if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
	56	+	if (isServerRunning(Bootstrap.installDir)) {
57	57		logger.error("Please stop server before restoring");
58	58		System.exit(1);
59	59		}
		skipped 60 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java

		skipped 178 lines
179	179		if (oldAppVersion == null \|\| !oldAppVersion.equals(AppLoader.getProduct().getVersion())) {
180	180		logger.info("Upgrading {}...", upgradeDir.getAbsolutePath());
181	181
182		-	if (Bootstrap.isServerRunning(upgradeDir)) {
183		-	logger.error("Please stop server running at \"{}\" before upgrading", upgradeDir.getAbsolutePath());
184		-	System.exit(1);
185		-	}
186		-	if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
187		-	logger.error("Please stop server running at \"{}\" before upgrading", Bootstrap.installDir.getAbsolutePath());
	182	+	if (isServerRunning(upgradeDir) \|\| isServerRunning(Bootstrap.installDir)) {
	183	+	logger.error("Please stop server before upgrading");
188	184		System.exit(1);
189	185		}
190	186
		skipped 12 lines
203	199		}
204	200		}
205	201
	202	+	File statusDir = new File(upgradeDir, "status");
	203	+	if (statusDir.exists())
	204	+	FileUtils.cleanDir(statusDir);
	205	+
206	206		AtomicInteger oldDataVersion = new AtomicInteger(0);
207	207
208	208		int ret = buildCommandline(upgradeDir, "check-data-version").execute(new LineConsumer() {
		skipped 77 lines
286	286		FileUtils.deleteDir(new File(upgradeDir, "sampledb"), 3);
287	287		} else {
288	288		logger.info("Cleaning database with old program...");
	289	+
289	290		ret = buildCommandline(upgradeDir, "clean-db").execute(new LineConsumer() {
290	291
291	292		@Override
		skipped 103 lines
395	396		} else {
396	397		logger.info("Populating {}...", upgradeDir.getAbsolutePath());
397	398
398		-	if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
399		-	logger.error("Please stop server running at \"{}\" before populating", Bootstrap.installDir.getAbsolutePath());
	399	+	if (isServerRunning(Bootstrap.installDir)) {
	400	+	logger.error("Please stop server before populating");
400	401		System.exit(1);
401	402		}
402	403
403	404		try {
404	405		FileUtils.copyDirectory(Bootstrap.installDir, upgradeDir);
	406	+	FileUtils.cleanDir(new File(upgradeDir, "logs"));
405	407		restoreExecutables(upgradeDir);
406	408		logger.info("Successfully populated {}", upgradeDir.getAbsolutePath());
407	409		System.exit(0);
		skipped 10 lines
418	420
419	421		File siteServerScriptFile = new File(upgradeDir, "bin/server.sh");
420	422		for (File file: Bootstrap.getBinDir().listFiles()) {
421		-	try {
422		-	String serverScript = null;
423		-	if (file.getName().equals("server.sh")) {
424		-	String siteRunAsUserLine = null;
425		-	for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {
426		-	if (line.contains("RUN_AS_USER")) {
427		-	siteRunAsUserLine = line;
428		-	break;
429		-	}
430		-	}
431		-	if (siteRunAsUserLine != null) {
432		-	String newRunAsUserLine = null;
433		-	for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {
	423	+	if (!file.getName().endsWith(".pid") && !file.getName().endsWith(".status")) {
	424	+	try {
	425	+	String serverScript = null;
	426	+	if (file.getName().equals("server.sh")) {
	427	+	String siteRunAsUserLine = null;
	428	+	for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {
434	429		if (line.contains("RUN_AS_USER")) {
435		-	newRunAsUserLine = line;
	430	+	siteRunAsUserLine = line;
436	431		break;
437	432		}
438	433		}
439		-	if (newRunAsUserLine != null) {
440		-	serverScript = FileUtils.readFileToString(file, Charset.defaultCharset());
441		-	serverScript = StringUtils.replace(serverScript, newRunAsUserLine, siteRunAsUserLine);
	434	+	if (siteRunAsUserLine != null) {
	435	+	String newRunAsUserLine = null;
	436	+	for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {
	437	+	if (line.contains("RUN_AS_USER")) {
	438	+	newRunAsUserLine = line;
	439	+	break;
	440	+	}
	441	+	}
	442	+	if (newRunAsUserLine != null) {
	443	+	serverScript = FileUtils.readFileToString(file, Charset.defaultCharset());
	444	+	serverScript = StringUtils.replace(serverScript, newRunAsUserLine, siteRunAsUserLine);
	445	+	}
442	446		}
443	447		}
	448	+	if (serverScript != null)
	449	+	FileUtils.writeStringToFile(siteServerScriptFile, serverScript, Charset.defaultCharset());
	450	+	else
	451	+	FileUtils.copyFile(file, new File(upgradeDir, "bin/" + file.getName()));
	452	+	} catch (IOException e) {
	453	+	throw new RuntimeException(e);
444	454		}
445		-	if (serverScript != null)
446		-	FileUtils.writeStringToFile(siteServerScriptFile, serverScript, Charset.defaultCharset());
447		-	else
448		-	FileUtils.copyFile(file, new File(upgradeDir, "bin/" + file.getName()));
449		-	} catch (IOException e) {
450		-	throw new RuntimeException(e);
451	455		}
452	456		}
453	457
		skipped 14 lines
468	472		if (new File(upgradeDir, "bin/reset_admin_password.sh").exists())
469	473		FileUtils.deleteFile(new File(upgradeDir, "bin/reset_admin_password.sh"));
470	474
	475	+	FileUtils.deleteDir(new File(upgradeDir, "status"));
	476	+
471	477		cleanAndCopy(Bootstrap.getBootDir(), new File(upgradeDir, "boot"));
	478	+	cleanAndCopy(new File(Bootstrap.installDir, "agent"), new File(upgradeDir, "agent"));
472	479		if (new File(upgradeDir, "boot/system.classpath").exists())
473	480		FileUtils.deleteFile(new File(upgradeDir, "boot/system.classpath"));
474	481
475	482		cleanAndCopy(Bootstrap.getLibDir(), new File(upgradeDir, "lib"));
476	483		for (File file: new File(Bootstrap.getSiteDir(), "avatars").listFiles()) {
477		-	try {
478		-	FileUtils.copyFileToDirectory(file, new File(upgradeDir, "site/avatars"));
479		-	} catch (IOException e) {
480		-	throw new RuntimeException(e);
	484	+	if (file.isFile()) {
	485	+	try {
	486	+	FileUtils.copyFileToDirectory(file, new File(upgradeDir, "site/avatars"));
	487	+	} catch (IOException e) {
	488	+	throw new RuntimeException(e);
	489	+	}
481	490		}
482	491		}
483	492		File uploadedDir = new File(upgradeDir, "site/avatars/uploaded");
		skipped 23 lines
507	516		"io.onedev.commons.launcher.bootstrap.Bootstrap");
508	517		wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.commons.launcher.bootstrap.Bootstrap",
509	518		"io.onedev.commons.bootstrap.Bootstrap");
	519	+	wrapperConf = StringUtils.replace(wrapperConf, "wrapper.pidfile=../status/onedev.pid", "");
	520	+
510	521		FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, StandardCharsets.UTF_8);
511	522
512	523		File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");
		skipped 91 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java

		skipped 3 lines
4	4		import java.io.FilenameFilter;
5	5		import java.io.IOException;
6	6		import java.lang.reflect.Field;
	7	+	import java.net.ServerSocket;
7	8		import java.nio.charset.Charset;
8	9		import java.sql.Connection;
9	10		import java.sql.Driver;
		skipped 99 lines
109	110
110	111		protected boolean isHSQLDialect(String dialect) {
111	112		return dialect.trim().equals("org.hibernate.dialect.HSQLDialect");
	113	+	}
	114	+
	115	+	protected boolean isServerRunning(File installDir) {
	116	+	Properties props = FileUtils.loadProperties(new File(installDir, "conf/server.properties"));
	117	+	int sshPort = Integer.parseInt(props.get("ssh_port").toString());
	118	+	try (ServerSocket serverSocket = new ServerSocket(sshPort)) {
	119	+	return false;
	120	+	} catch (IOException e) {
	121	+	if (e.getMessage() != null && e.getMessage().contains("Address already in use"))
	122	+	return true;
	123	+	else
	124	+	throw new RuntimeException(e);
	125	+	}
112	126		}
113	127
114	128		protected void execute(List<String> sqls, boolean failOnError) {
		skipped 509 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java

		skipped 11 lines
12	12		import org.apache.sshd.server.command.Command;
13	13		import org.apache.sshd.server.shell.UnknownCommand;
14	14
	15	+	import io.onedev.commons.bootstrap.Bootstrap;
15	16		import io.onedev.commons.loader.Listen;
16	17		import io.onedev.server.event.system.SystemStarted;
17	18		import io.onedev.server.event.system.SystemStopping;
		skipped 41 lines
59	60		return new UnknownCommand(command);
60	61		});
61	62
62		-	try {
63		-	server.start();
64		-	} catch (IOException e) {
65		-	throw new RuntimeException(e);
66		-	}
	63	+	if (Bootstrap.command == null) {
	64	+	try {
	65	+	server.start();
	66	+	} catch (IOException e) {
	67	+	throw new RuntimeException(e);
	68	+	}
	69	+	}
67	70		}
68	71
69	72		@Listen
		skipped 7 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java

		skipped 104 lines
105	105		}
106	106		FileUtils.touchFile(new File(agentDir, "agent/conf/attributes.properties"));
107	107		FileUtils.touchFile(new File(agentDir, "agent/logs/console.log"));
108		-	FileUtils.touchFile(new File(agentDir, "agent/status/do_not_remove.txt"));
109	108
110	109		Collection<String> agentLibs = OneDev.getInstance(AgentManager.class).getAgentLibs();
111	110
		skipped 32 lines

■ ■ ■ ■ ■ ■

server-plugin/pom.xml

		skipped 5 lines
6	6		<parent>
7	7		<groupId>io.onedev</groupId>
8	8		<artifactId>server</artifactId>
9		-	<version>5.3.1</version>
	9	+	<version>5.3.3</version>
10	10		</parent>
11	11		<dependencies>
12	12		<dependency>
		skipped 37 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-archetype/pom.xml

		skipped 5 lines
6	6		<parent>
7	7		<groupId>io.onedev</groupId>
8	8		<artifactId>server-plugin</artifactId>
9		-	<version>5.3.1</version>
	9	+	<version>5.3.3</version>
10	10		</parent>
11	11		<build>
12	12		<resources>
		skipped 44 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml

		skipped 113 lines
114	114		<plugin>
115	115		<groupId>io.onedev</groupId>
116	116		<artifactId>plugin-maven</artifactId>
117		-	<version>2.0.6</version>
	117	+	<version>2.0.7</version>
118	118		<executions>
119	119		<execution>
120	120		<id>populate-resources</id>
		skipped 64 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-authenticator-ldap/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-buildspec-gradle/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-buildspec-maven/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-buildspec-node/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>
		skipped 4 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-executor-kubernetes/pom.xml

		skipped 5 lines
6	6		<parent>
7	7		<groupId>io.onedev</groupId>
8	8		<artifactId>server-plugin</artifactId>
9		-	<version>5.3.1</version>
	9	+	<version>5.3.3</version>
10	10		</parent>
11	11		<properties>
12	12		<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-executor-remotedocker/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<dependencies>
11	11		<dependency>
		skipped 15 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-executor-remoteshell/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<dependencies>
11	11		<dependency>
		skipped 10 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-executor-serverdocker/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java

		skipped 276 lines
277	277		for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
278	278		if (!PathUtils.isCurrent(entry.getValue())) {
279	279		String each = entry.getKey().getDirectory(hostCacheHome).getAbsolutePath();
280		-	for (String containerCachePath: KubernetesHelper.resolveCachePath(containerWorkspace, entry.getValue()))
281		-	docker.addArgs("-v", getOuterPath(each) + ":" + containerCachePath);
	280	+	String containerCachePath = PathUtils.resolve(containerWorkspace, entry.getValue());
	281	+	docker.addArgs("-v", getOuterPath(each) + ":" + containerCachePath);
282	282		}
283	283		}
284	284
		skipped 329 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-executor-servershell/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java

		skipped 132 lines
133	133
134	134		File userDir = new File(buildDir, "user");
135	135		FileUtils.createDir(userDir);
136		-	Map<String, String> environments = new HashMap<>();
137		-	environments.put("HOME", userDir.getAbsolutePath());
138	136
139	137		jobContext.reportJobWorkspace(workspaceDir.getAbsolutePath());
140	138
		skipped 34 lines
175	173		for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
176	174		if (!PathUtils.isCurrent(entry.getValue())) {
177	175		File sourceDir = entry.getKey().getDirectory(cacheHomeDir);
178		-	File destDir = resolveCachePath(workspaceDir, userDir, entry.getValue());
	176	+	File destDir = resolveCachePath(workspaceDir, entry.getValue());
179	177		if (destDir.exists())
180	178		FileUtils.deleteDir(destDir);
181	179		else
		skipped 7 lines
189	187		}
190	188
191	189		Commandline shell = getShell();
	190	+	Map<String, String> environments = new HashMap<>();
	191	+	environments.put("GIT_HOME", userDir.getAbsolutePath());
192	192		shell.workingDir(workspaceDir).environments(environments);
193	193		shell.addArgs(jobScriptFile.getAbsolutePath());
194	194
		skipped 8 lines
203	203		jobLogger.log("Checking out code...");
204	204		Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());
205	205		git.workingDir(workspaceDir);
	206	+	Map<String, String> environments = new HashMap<>();
	207	+	environments.put("HOME", userDir.getAbsolutePath());
206	208		git.environments(environments);
207	209
208	210		CloneInfo cloneInfo = checkoutExecutable.getCloneInfo();
		skipped 115 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-import-bitbucketcloud/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketPluginModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-import-gitea/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.imports.gitea.GiteaPluginModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-import-github/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.imports.github.GitHubPluginModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-import-gitlab/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabPluginModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-import-jiracloud/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraPluginModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-import-youtrack/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackPluginModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-checkstyle/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<dependencies>
11	11		<dependency>
		skipped 10 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-clover/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<dependencies>
11	11		<dependency>
		skipped 10 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-coverage/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.report.coverage.CoverageReportModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-cpd/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<dependencies>
11	11		<dependency>
		skipped 10 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-jacoco/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<dependencies>
11	11		<dependency>
		skipped 10 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-jest/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<dependencies>
11	11		<dependency>
		skipped 10 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-junit/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<dependencies>
11	11		<dependency>
		skipped 16 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-markdown/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-pmd/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<dependencies>
11	11		<dependency>
		skipped 10 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-problem/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.report.problem.ProblemReportModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-spotbugs/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<dependencies>
11	11		<dependency>
		skipped 10 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-report-unittest/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>5.3.1</version>
	8	+	<version>5.3.3</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.report.unittest.UnitTestReportModule</moduleClass>
		skipped 3 lines

■ ■ ■ ■ ■ ■

server-plugin/server-plugin-sso-openid/pom.xml

		skipped 5 lines
6	6		<parent>
7	7		<groupId>io.onedev</groupId>
8	8		<artifactId>server-plugin</artifactId>
9		-	<version>5.3.1</version>
	9	+	<version>5.3.3</version>
10	10		</parent>
11	11		<dependencies>
12	12		<dependency>
		skipped 16 lines

■ ■ ■ ■ ■ ■

server-product/docker/entrypoint.sh

		skipped 14 lines
15	15		trap _sigterm SIGTERM
16	16		trap _sigint SIGINT
17	17
18		-	/app/boot/wrapper-linux-x86-64 /app/conf/wrapper.conf wrapper.pidfile=/app/status/onedev_upgrade.pid -- upgrade /opt/onedev &
	18	+	/app/boot/wrapper-linux-x86-64 /app/conf/wrapper.conf -- upgrade /opt/onedev &
19	19		child=$!
20	20		wait "$child"
21	21
		skipped 5 lines

■ ■ ■ ■ ■ ■

server-product/jsw/App.sh.in

		skipped 65 lines
66	66		PRIORITY=
67	67
68	68		# Location of the pid file.
69		-	PIDDIR="../status"
	69	+	PIDDIR="."
70	70
71	71		# PIDFILE_CHECK_PID tells the script to double check whether the pid in the pid
72	72		# file actually exists and belongs to this application. When not set, only
		skipped 2811 lines

■ ■ ■ ■ ■ ■

server-product/jsw/agent/App.sh.in

		skipped 65 lines
66	66		PRIORITY=
67	67
68	68		# Location of the pid file.
69		-	PIDDIR="../status"
	69	+	PIDDIR="."
70	70
71	71		# PIDFILE_CHECK_PID tells the script to double check whether the pid in the pid
72	72		# file actually exists and belongs to this application. When not set, only
		skipped 2811 lines

■ ■ ■ ■ ■ ■

server-product/jsw/agent/wrapper.conf

		skipped 34 lines
35	35		wrapper.lang.folder=../lang
36	36
37	37		wrapper.restart.reload_configuration=TRUE
38		-	wrapper.pidfile=../status/onedevagent.pid
39	38		wrapper.single_invocation=TRUE
40	39
41	40		#********************************************************************
		skipped 141 lines

■ ■ ■ ■ ■ ■

server-product/jsw/wrapper.conf

		skipped 34 lines
35	35		wrapper.lang.folder=../lang
36	36
37	37		wrapper.restart.reload_configuration=TRUE
38		-	wrapper.pidfile=../status/onedev.pid
39	38		wrapper.single_invocation=TRUE
40	39
41	40		#********************************************************************
		skipped 141 lines

■ ■ ■ ■ ■ ■

server-product/pom.xml

		skipped 6 lines
7	7		<parent>
8	8		<groupId>io.onedev</groupId>
9	9		<artifactId>server</artifactId>
10		-	<version>5.3.1</version>
	10	+	<version>5.3.3</version>
11	11		</parent>
12	12		<dependencies>
13	13		<dependency>
		skipped 136 lines

■ ■ ■ ■ ■ ■

server-product/system/status/do_not_remove.txt

1

-

Fix issue #438 - OneDev upgrade does not work if server is terminated forcibly