onedev/server

■ ■ ■ ■ ■ ■

pom.xml

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

■ ■ ■ ■ ■ ■

server-core/pom.xml

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

■ ■ ■ ■ ■ ■

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

		skipped 169 lines
170	170
171	171		@Transactional
172	172		@Override
173		-	public Build submit(Project project, ObjectId commitId, String jobName, String triggerId,
	173	+	public Build submit(Project project, ObjectId commitId, String jobName,
174	174		Map<String, List<String>> paramMap, SubmitReason reason) {
175	175		Lock lock = LockUtils.getLock("job-manager: " + project.getId() + "-" + commitId.name());
176	176		transactionManager.mustRunAfterTransaction(new Runnable() {
		skipped 11 lines
188	188
189	189		validate(project, commitId);
190	190
191		-	return submit(project, commitId, jobName, triggerId, paramMap, reason, new LinkedHashSet<>());
	191	+	return submit(project, commitId, jobName, paramMap, reason, new LinkedHashSet<>());
192	192		} catch (Throwable e) {
193	193		throw ExceptionUtils.unchecked(e);
194	194		}
195	195		}
196	196
197		-	private Build submit(Project project, ObjectId commitId, String jobName, String triggerId,
	197	+	private Build submit(Project project, ObjectId commitId, String jobName,
198	198		Map<String, List<String>> paramMap, SubmitReason reason, Set<String> checkedJobNames) {
199	199
200	200		ScriptIdentity.push(new JobIdentity(project, commitId));
		skipped 2 lines
203	203		build.setProject(project);
204	204		build.setCommitHash(commitId.name());
205	205		build.setJobName(jobName);
206		-	build.setTriggerId(triggerId);
207	206		build.setSubmitDate(new Date());
208	207		build.setStatus(Build.Status.WAITING);
209	208		build.setSubmitReason(reason.getDescription());
		skipped 15 lines
225	224		}
226	225
227	226		Collection<Build> builds = buildManager.query(project, commitId, jobName,
228		-	reason.getRefName(), reason.getPullRequest(), triggerId, paramMapToQuery);
	227	+	reason.getRefName(), reason.getPullRequest(), paramMapToQuery);
229	228
230	229		if (builds.isEmpty()) {
231	230		for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {
		skipped 24 lines
256	255		@Override
257	256		public void run(Map<String, List<String>> params) {
258	257		Build dependencyBuild = submit(project, commitId, dependency.getJobName(),
259		-	triggerId, params, reason, new LinkedHashSet<>(checkedJobNames));
	258	+	params, reason, new LinkedHashSet<>(checkedJobNames));
260	259		BuildDependence dependence = new BuildDependence();
261	260		dependence.setDependency(dependencyBuild);
262	261		dependence.setDependent(build);
		skipped 362 lines
625	624
626	625		@Override
627	626		public void run(Map<String, List<String>> paramMap) {
628		-	submit(project, commitId, job.getName(), event.getUuid(),
629		-	paramMap, match.getReason());
	627	+	submit(project, commitId, job.getName(), paramMap, match.getReason());
630	628		}
631	629
632	630		}.run();
		skipped 379 lines

■ ■ ■ ■ ■ ■

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

		skipped 12 lines
13	13
14	14		public interface JobManager {
15	15
16		-	Build submit(Project project, ObjectId commitId, String jobName, String triggerId,
	16	+	Build submit(Project project, ObjectId commitId, String jobName,
17	17		Map<String, List<String>> paramMap, SubmitReason reason);
18	18
19	19		void resubmit(Build build, Map<String, List<String>> paramMap);
		skipped 12 lines

■ ■ ■ ■ ■ ■

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

		skipped 109 lines
110	110		};
111	111		JobManager jobManager = OneDev.getInstance(JobManager.class);
112	112		jobManager.submit(build.getProject(), build.getCommitId(), getJobName(),
113		-	build.getTriggerId(), paramMap, reason);
	113	+	paramMap, reason);
114	114		}
115	115
116	116		}.run();
		skipped 26 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java

		skipped 33 lines
34	34		Collection<Long> queryNumbersOfStreamPrevious(Build build, @Nullable Build.Status status, int limit);
35	35
36	36		Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,
37		-	@Nullable String refName, @Nullable PullRequest request, @Nullable String triggerId,
38		-	Map<String, List<String>> params);
	37	+	@Nullable String refName, @Nullable PullRequest request, Map<String, List<String>> params);
39	38
40	39		Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName);
41	40
		skipped 30 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java

		skipped 250 lines
251	251		@Sessional
252	252		@Override
253	253		public Collection<Build> query(Project project, ObjectId commitId, String jobName) {
254		-	return query(project, commitId, jobName, null, null, null, new HashMap<>());
	254	+	return query(project, commitId, jobName, null, null, new HashMap<>());
255	255		}
256	256
257	257		@Sessional
258	258		@Override
259	259		public Collection<Build> query(Project project, ObjectId commitId, String jobName,
260		-	String refName, PullRequest request, String triggerId,
261		-	Map<String, List<String>> params) {
	260	+	String refName, PullRequest request, Map<String, List<String>> params) {
262	261		CriteriaBuilder builder = getSession().getCriteriaBuilder();
263	262		CriteriaQuery<Build> query = builder.createQuery(Build.class);
264	263		Root<Build> root = query.from(Build.class);
		skipped 8 lines
273	272
274	273		if (request != null)
275	274		predicates.add(builder.equal(root.get(Build.PROP_PULL_REQUEST), request));
276		-	if (triggerId != null)
277		-	predicates.add(builder.equal(root.get(Build.PROP_TRIGGER_ID), triggerId));
278	275
279	276		for (Map.Entry<String, List<String>> entry: params.entrySet()) {
280	277		if (!entry.getValue().isEmpty()) {
		skipped 601 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/event/Event.java

1	1		package io.onedev.server.event;
2	2
3	3		import java.util.Date;
4		-	import java.util.UUID;
5	4
6	5		import javax.annotation.Nullable;
7	6
		skipped 5 lines
13	12		@JsonTypeInfo(property="@class", use=Id.CLASS)
14	13		public abstract class Event {
15	14
16		-	private final String uuid = UUID.randomUUID().toString();
17		-
18	15		private final User user;
19	16
20	17		private final Date date;
		skipped 1 lines
22	19		public Event(@Nullable User user, Date date) {
23	20		this.user = user;
24	21		this.date = date;
25		-	}
26		-
27		-	public String getUuid() {
28		-	return uuid;
29	22		}
30	23
31	24		@Nullable
		skipped 10 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/migration/DataMigrator.java

		skipped 2252 lines
2253	2253		}
2254	2254		}
2255	2255
	2256	+	// Migrate to 4.0.6
	2257	+	private void migrate45(File dataDir, Stack<Integer> versions) {
	2258	+	for (File file: dataDir.listFiles()) {
	2259	+	if (file.getName().startsWith("Builds.xml")) {
	2260	+	VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
	2261	+	for (Element element: dom.getRootElement().elements())
	2262	+	element.element("triggerId").detach();
	2263	+	dom.writeToFile(file, false);
	2264	+	}
	2265	+	}
	2266	+	}
	2267	+
2256	2268		}
2257	2269

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/model/Build.java

		skipped 6 lines
7	7		import static io.onedev.server.model.Build.PROP_NUMBER;
8	8		import static io.onedev.server.model.Build.PROP_PENDING_DATE;
9	9		import static io.onedev.server.model.Build.PROP_REF_NAME;
10		-	import static io.onedev.server.model.Build.PROP_TRIGGER_ID;
11	10		import static io.onedev.server.model.Build.PROP_RUNNING_DATE;
12	11		import static io.onedev.server.model.Build.PROP_STATUS;
13	12		import static io.onedev.server.model.Build.PROP_SUBMITTER_NAME;
		skipped 88 lines
102	101		@Entity
103	102		@Table(
104	103		indexes={@Index(columnList="o_project_id"), @Index(columnList="o_submitter_id"), @Index(columnList="o_canceller_id"),
105		-	@Index(columnList="o_request_id"),
106		-	@Index(columnList=PROP_SUBMITTER_NAME), @Index(columnList=PROP_CANCELLER_NAME), @Index(columnList=PROP_COMMIT),
107		-	@Index(columnList=PROP_NUMBER), @Index(columnList=PROP_JOB), @Index(columnList=PROP_STATUS),
108		-	@Index(columnList=PROP_REF_NAME), @Index(columnList=PROP_TRIGGER_ID),
109		-	@Index(columnList=PROP_SUBMIT_DATE), @Index(columnList=PROP_PENDING_DATE), @Index(columnList=PROP_RUNNING_DATE),
110		-	@Index(columnList=PROP_FINISH_DATE), @Index(columnList=PROP_VERSION), @Index(columnList="o_numberScope_id"),
	104	+	@Index(columnList="o_request_id"), @Index(columnList=PROP_SUBMITTER_NAME),
	105	+	@Index(columnList=PROP_CANCELLER_NAME), @Index(columnList=PROP_COMMIT),
	106	+	@Index(columnList=PROP_NUMBER), @Index(columnList=PROP_JOB),
	107	+	@Index(columnList=PROP_STATUS), @Index(columnList=PROP_REF_NAME),
	108	+	@Index(columnList=PROP_SUBMIT_DATE), @Index(columnList=PROP_PENDING_DATE),
	109	+	@Index(columnList=PROP_RUNNING_DATE), @Index(columnList=PROP_FINISH_DATE),
	110	+	@Index(columnList=PROP_VERSION), @Index(columnList="o_numberScope_id"),
111	111		@Index(columnList="o_project_id, " + PROP_COMMIT)},
112	112		uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})}
113	113		)
		skipped 188 lines
302	302
303	303		@Column(length=MAX_ERROR_MESSAGE_LEN)
304	304		private String errorMessage;
305		-
306		-	@Column(nullable=false)
307		-	private String triggerId;
308	305
309	306		@OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)
310	307		@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
		skipped 246 lines
557	554		errorMessage = StringUtils.replace(errorMessage, secretValue, SecretInput.MASK);
558	555		}
559	556		this.errorMessage = errorMessage;
560		-	}
561		-
562		-	@Nullable
563		-	public String getTriggerId() {
564		-	return triggerId;
565		-	}
566		-
567		-	public void setTriggerId(String triggerId) {
568		-	this.triggerId = triggerId;
569	557		}
570	558
571	559		@Nullable
		skipped 508 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java

		skipped 2 lines
3	3		import java.util.ArrayList;
4	4		import java.util.Collection;
5	5		import java.util.List;
6		-	import java.util.UUID;
7	6
8	7		import javax.annotation.Nullable;
9	8
		skipped 77 lines
87	86
88	87		@Override
89	88		protected Component newContent(String id, FloatingPanel dropdown) {
90		-	return new JobListPanel(id, commitId, UUID.randomUUID().toString(),
91		-	refName, jobsModel.getObject()) {
	89	+	return new JobListPanel(id, commitId, refName, jobsModel.getObject()) {
92	90
93	91		@Override
94	92		protected Project getProject() {
		skipped 80 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java

		skipped 44 lines
45	45
46	46		private final String jobName;
47	47
48		-	private final String triggerId;
49		-
50		-	public RunJobLink(String componentId, ObjectId commitId, String jobName,
51		-	String triggerId, @Nullable String refName) {
	48	+	public RunJobLink(String componentId, ObjectId commitId, String jobName, @Nullable String refName) {
52	49		super(componentId);
53	50
54	51		this.commitId = commitId;
55	52		this.jobName = jobName;
56	53		this.refName = refName;
57		-	this.triggerId = triggerId;
58	54		}
59	55
60	56		protected abstract Project getProject();
		skipped 63 lines
124	120
125	121		};
126	122		builds.add(getJobManager().submit(getProject(), commitId, job.getName(),
127		-	triggerId, paramMap, reason));
	123	+	paramMap, reason));
128	124		}
129	125		if (builds.size() == 1)
130	126		setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(builds.iterator().next()));
		skipped 40 lines
171	167
172	168		};
173	169		Build build = getJobManager().submit(getProject(), commitId, job.getName(),
174		-	triggerId, new HashMap<>(), reason);
	170	+	new HashMap<>(), reason);
175	171		setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build));
176	172		}
177	173		}
		skipped 13 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java

		skipped 41 lines
42	42
43	43		private final ObjectId commitId;
44	44
45		-	private final String triggerId;
46		-
47	45		private final String refName;
48	46
49	47		private final List<Job> jobs;
		skipped 12 lines
62	60
63	61		};
64	62
65		-	public JobListPanel(String id, ObjectId commitId, String triggerId,
66		-	@Nullable String refName, List<Job> jobs) {
	63	+	public JobListPanel(String id, ObjectId commitId, @Nullable String refName, List<Job> jobs) {
67	64		super(id);
68	65		this.commitId = commitId;
69		-	this.triggerId = triggerId;
70	66		this.refName = refName;
71	67		this.jobs = jobs;
72	68		}
		skipped 36 lines
109	105		defLink.add(new Label("label", job.getName()));
110	106		jobItem.add(defLink);
111	107
112		-	jobItem.add(new RunJobLink("run", commitId, job.getName(), triggerId, refName) {
	108	+	jobItem.add(new RunJobLink("run", commitId, job.getName(), refName) {
113	109
114	110		@Override
115	111		public void onClick(AjaxRequestTarget target) {
		skipped 83 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java

1	1		package io.onedev.server.web.page.project.blob.render.renderers.buildspec;
2	2
3		-	import java.util.UUID;
4		-
5	3		import org.apache.wicket.ajax.AjaxRequestTarget;
6	4		import org.apache.wicket.ajax.attributes.CallbackParameter;
7	5		import org.apache.wicket.behavior.AttributeAppender;
		skipped 51 lines
59	57		WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId());
60	58		nav.add(new Label("jobName", job.getName()));
61	59		nav.add(AttributeAppender.append("data-name", job.getName()));
62		-	nav.add(new RunJobLink("run", context.getCommit().copy(), job.getName(),
63		-	UUID.randomUUID().toString(), getContext().getRefName()) {
	60	+	nav.add(new RunJobLink("run", context.getCommit().copy(), job.getName(), getContext().getRefName()) {
64	61
65	62		@Override
66	63		protected Project getProject() {
		skipped 71 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java

		skipped 313 lines
314	314
315	315		@Override
316	316		protected Component newContent(String id, FloatingPanel dropdown) {
317		-	return new JobListPanel(id, getBuild().getCommitId(), getBuild().getTriggerId(),
	317	+	return new JobListPanel(id, getBuild().getCommitId(),
318	318		getBuild().getRefName(), downstreamJobsModel.getObject()) {
319	319
320	320		@Override
		skipped 249 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java

		skipped 6 lines
7	7		import java.util.HashMap;
8	8		import java.util.List;
9	9		import java.util.Map;
10		-	import java.util.UUID;
11	10		import java.util.stream.Collectors;
12	11
13	12		import javax.annotation.Nullable;
		skipped 382 lines
396	395		detailLink.setOutputMarkupId(true);
397	396		item.add(detailLink);
398	397
399		-	item.add(new RunJobLink("run", commitId, job.getName(), UUID.randomUUID().toString(), null) {
	398	+	item.add(new RunJobLink("run", commitId, job.getName(), null) {
400	399
401	400		@Override
402	401		protected Project getProject() {
		skipped 360 lines

■ ■ ■ ■ ■ ■

server-plugin/pom.xml

		skipped 5 lines
6	6		<parent>
7	7		<groupId>io.onedev</groupId>
8	8		<artifactId>server</artifactId>
9		-	<version>4.0.5</version>
	9	+	<version>4.0.6</version>
10	10		</parent>
11	11		<dependencies>
12	12		<dependency>
		skipped 18 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>4.0.5</version>
	9	+	<version>4.0.6</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>4.0.5</version>
	8	+	<version>4.0.6</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>4.0.5</version>
	8	+	<version>4.0.6</version>
9	9		</parent>
10	10		<dependencies>
11	11		<dependency>
		skipped 10 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>4.0.5</version>
	8	+	<version>4.0.6</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>4.0.5</version>
	8	+	<version>4.0.6</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-docker/pom.xml

		skipped 4 lines
5	5		<parent>
6	6		<groupId>io.onedev</groupId>
7	7		<artifactId>server-plugin</artifactId>
8		-	<version>4.0.5</version>
	8	+	<version>4.0.6</version>
9	9		</parent>
10	10		<properties>
11	11		<moduleClass>io.onedev.server.plugin.docker.DockerModule</moduleClass>
		skipped 3 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>4.0.5</version>
	9	+	<version>4.0.6</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-report-html/pom.xml

		skipped 5 lines
6	6		<parent>
7	7		<groupId>io.onedev</groupId>
8	8		<artifactId>server-plugin</artifactId>
9		-	<version>4.0.5</version>
	9	+	<version>4.0.6</version>
10	10		</parent>
11	11		<properties>
12	12		<moduleClass>io.onedev.server.plugin.report.html.HtmlReportModule</moduleClass>
		skipped 2 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>4.0.5</version>
	8	+	<version>4.0.6</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-sso-openid/pom.xml

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

■ ■ ■ ■ ■ ■

server-product/pom.xml

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

fix issue #215 - Do not create duplicate build for same commit hash, param and ref combo