Skip to content

Commit b3ddce6

Browse files
committed
[FIXED JENKINS-9843] PreBuildMergeOptions can now export for the API properly.
1 parent 539e87f commit b3ddce6

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

src/main/java/hudson/plugins/git/opt/PreBuildMergeOptions.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
import java.io.Serializable;
44
import org.eclipse.jgit.transport.RemoteConfig;
55

6+
import org.kohsuke.stapler.export.Exported;
7+
import org.kohsuke.stapler.export.ExportedBean;
8+
69
/**
710
* Git SCM can optionally perform a merge with another branch (possibly another repository.)
811
*
912
* This object specifies that configuration.
1013
*/
14+
@ExportedBean(defaultVisibility = 999)
1115
public class PreBuildMergeOptions implements Serializable {
1216
private static final long serialVersionUID = 2L;
1317

@@ -21,6 +25,7 @@ public class PreBuildMergeOptions implements Serializable {
2125
*/
2226
public String mergeTarget = null;
2327

28+
@Exported
2429
public RemoteConfig getMergeRemote() {
2530
return mergeRemote;
2631
}
@@ -29,6 +34,7 @@ public void setMergeRemote(RemoteConfig mergeRemote) {
2934
this.mergeRemote = mergeRemote;
3035
}
3136

37+
@Exported
3238
public String getMergeTarget() {
3339
return mergeTarget;
3440
}
@@ -37,6 +43,7 @@ public void setMergeTarget(String mergeTarget) {
3743
this.mergeTarget = mergeTarget;
3844
}
3945

46+
@Exported
4047
public String getRemoteBranchName() {
4148
return mergeRemote.getName() + "/" + mergeTarget;
4249
}

0 commit comments

Comments
 (0)