Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-43507] Pick up changes for JENKINS-44891
  • Loading branch information
stephenc committed Jun 15, 2017
1 parent 1f0d0e1 commit 07ba4b5
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -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>
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java
Expand Up @@ -158,8 +158,12 @@ public abstract class AbstractGitSCMSource extends SCMSource {

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

public AbstractGitSCMSource() {
}

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

@CheckForNull
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/jenkins/plugins/git/GitSCMSource.java
Expand Up @@ -150,11 +150,16 @@ public class GitSCMSource extends AbstractGitSCMSource {
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;
Expand Down
Expand Up @@ -153,7 +153,6 @@ private static class MockSCMSource extends AbstractGitSCMSource {
private final String remote;
private final String[] refSpecs;
MockSCMSource(String remote, String[] refSpecs) {
super(null);
this.remote = remote;
this.refSpecs = refSpecs;
}
Expand Down
Expand Up @@ -98,7 +98,7 @@ public static class GitToolNotSpecified extends RuntimeException {
public static class AbstractGitSCMSourceImpl extends AbstractGitSCMSource {

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

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

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

public String getCredentialsId() {
Expand Down

0 comments on commit 07ba4b5

Please sign in to comment.