onedev/server

■ ■ ■ ■ ■ ■

pom.xml

		skipped 8 lines
9	9		<version>1.0.5</version>
10	10		</parent>
11	11		<artifactId>server</artifactId>
12		-	<version>6.1.4</version>
	12	+	<version>6.1.5</version>
13	13		<packaging>pom</packaging>
14	14		<build>
15	15		<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
		skipped 570 lines

■ ■ ■ ■ ■ ■

server-core/pom.xml

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

■ ■ ■ ■ ■ ■

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

		skipped 52 lines
53	53		import io.onedev.commons.utils.ExplicitException;
54	54		import io.onedev.commons.utils.FileUtils;
55	55		import io.onedev.commons.utils.LockUtils;
	56	+	import io.onedev.commons.utils.StringUtils;
56	57		import io.onedev.commons.utils.TaskLogger;
57	58		import io.onedev.k8shelper.Action;
58	59		import io.onedev.k8shelper.CacheInstance;
		skipped 365 lines
424	425		private JobExecutor getJobExecutor(Build build, TaskLogger jobLogger) {
425	426		VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
426	427		String jobExecutorName = interpolator.interpolate(build.getJob().getJobExecutor());
427		-	if (jobExecutorName != null) {
	428	+	if (StringUtils.isNotBlank(jobExecutorName)) {
428	429		JobExecutor jobExecutor = null;
429	430		for (JobExecutor each: settingManager.getJobExecutors()) {
430	431		if (each.getName().equals(jobExecutorName)) {
		skipped 771 lines
1202	1203		if (explicitException != null)
1203	1204		jobLogger.error(explicitException.getMessage());
1204	1205		else if (ExceptionUtils.find(e, FailedException.class) == null)
1205		-	jobLogger.error(e.getMessage());
	1206	+	jobLogger.error("Error running job", e);
1206	1207		} catch (InterruptedException e) {
1207	1208		} finally {
1208	1209		build.setFinishDate(new Date());
		skipped 144 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java

		skipped 157 lines
158	158		builder.append(interpolated);
159	159		}
160	160		}
161		-	if (builder.length() != 0)
162		-	return builder.toString();
163		-	else
164		-	return null;
	161	+	// Should not return null here even if result is empty in order not to
	162	+	// surprise caller. For instance command step may have empty line in commands
	163	+	// and we should not convert them to null after interpolation
	164	+	return builder.toString();
165	165		} else {
166	166		return null;
167	167		}
		skipped 10 lines

■ ■ ■ ■ ■ ■

server-plugin/pom.xml

		skipped 5 lines
6	6		<parent>
7	7		<groupId>io.onedev</groupId>
8	8		<artifactId>server</artifactId>
9		-	<version>6.1.4</version>
	9	+	<version>6.1.5</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>6.1.4</version>
	9	+	<version>6.1.5</version>
10	10		</parent>
11	11		<build>
12	12		<resources>
		skipped 44 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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	9	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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-servershell/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>6.1.4</version>
	8	+	<version>6.1.5</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-import-bitbucketcloud/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	8	+	<version>6.1.5</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>6.1.4</version>
	9	+	<version>6.1.5</version>
10	10		</parent>
11	11		<dependencies>
12	12		<dependency>
		skipped 16 lines

■ ■ ■ ■ ■ ■

server-product/pom.xml

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

Fix issue #503 - Job failed with NullPointerException if there are empty lines in build spec command step