Merge branch 'master_k' into CredentialsSupport

# Conflicts:
#	src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java

1 files changed, 14 insertions, 0 deletions

diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java
index 09802af..664c6d8 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java
@@ -36,6 +36,8 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
     private final String password;
     private final String repositoryOwner;
     private final String repositoryName;
+    private final String ciKey;
+    private final String ciName;
     private final String ciSkipPhrases;
     private final boolean checkDestinationCommit;
     private final boolean approveIfSuccess;
@@ -54,6 +56,8 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
             String password,
             String repositoryOwner,
             String repositoryName,
+            String ciKey,
+            String ciName,
             String ciSkipPhrases,
             boolean checkDestinationCommit,
             boolean approveIfSuccess
@@ -66,6 +70,8 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
         this.password = password;
         this.repositoryOwner = repositoryOwner;
         this.repositoryName = repositoryName;
+        this.ciKey = ciKey;
+        this.ciName = ciName;
         this.ciSkipPhrases = ciSkipPhrases;
         this.checkDestinationCommit = checkDestinationCommit;
         this.approveIfSuccess = approveIfSuccess;
@@ -99,6 +105,14 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
         return repositoryName;
     }
 
+    public String getCiKey() {
+        return ciKey;
+    }
+
+    public String getCiName() {
+        return ciName;
+    }
+
     public String getCiSkipPhrases() {
         return ciSkipPhrases;
     }