Skip to content
Permalink
Browse files

[JENKINS-43507] Pick up changes for JENKINS-44891

  • Loading branch information...
stephenc committed Jun 15, 2017
1 parent 1f0d0e1 commit 07ba4b5735c6c2a57b41b384b3a2e16569b89be3
@@ -30,7 +30,7 @@
<concurrency>1C</concurrency>
<findbugs.failOnError>false</findbugs.failOnError>
<workflow.version>1.14.2</workflow.version>
<scm-api-plugin.version>2.2.0-20170612.200107-11</scm-api-plugin.version>
<scm-api-plugin.version>2.2.0-20170615.114844-13</scm-api-plugin.version>
</properties>

<build>
@@ -158,8 +158,12 @@

private static final Logger LOGGER = Logger.getLogger(AbstractGitSCMSource.class.getName());

public AbstractGitSCMSource() {
}

@Deprecated
public AbstractGitSCMSource(String id) {
super(id);
setId(id);
}

@CheckForNull
@@ -150,11 +150,16 @@
private List<SCMSourceTrait> traits = new ArrayList<>();

@DataBoundConstructor
public GitSCMSource(String id, String remote) {
super(id);
public GitSCMSource(String remote) {
this.remote = remote;
}

@Deprecated
public GitSCMSource(String id, String remote) {
this(remote);
setId(id);
}

@DataBoundSetter
public void setCredentialsId(@CheckForNull String credentialsId) {
this.credentialsId = credentialsId;
@@ -153,7 +153,6 @@ private void assertGuessURL(String remote, String web, String... refSpecs) {
private final String remote;
private final String[] refSpecs;
MockSCMSource(String remote, String[] refSpecs) {
super(null);
this.remote = remote;
this.refSpecs = refSpecs;
}
@@ -98,7 +98,7 @@ public void correctGitToolIsUsed2() throws Exception {
public static class AbstractGitSCMSourceImpl extends AbstractGitSCMSource {

public AbstractGitSCMSourceImpl() {
super("AbstractGitSCMSourceImpl-id");
setId("AbstractGitSCMSourceImpl-id");
}

@NonNull
@@ -148,7 +148,7 @@ public void testBuild() {
public class AbstractGitSCMSourceImpl extends AbstractGitSCMSource {

public AbstractGitSCMSourceImpl() {
super("AbstractGitSCMSourceImpl-id");
setId("AbstractGitSCMSourceImpl-id");
}

public String getCredentialsId() {

0 comments on commit 07ba4b5

Please sign in to comment.
You can’t perform that action at this time.