From d93a7a39cf27df868a016e1cce3fb048de7b0d45 Mon Sep 17 00:00:00 2001 From: David Tanner Date: Wed, 14 Oct 2015 12:26:26 -0600 Subject: [PATCH] Fix configVersion to share latest value --- src/main/java/org/jenkinsci/plugins/ghprb/GhprbTrigger.java | 2 +- .../plugins/ghprb/GhprbTriggerBackwardsCompatible.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTrigger.java b/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTrigger.java index 277c366b5..c540df369 100644 --- a/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTrigger.java +++ b/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTrigger.java @@ -133,7 +133,7 @@ public GhprbTrigger(String adminlist, this.allowMembersOfWhitelistedOrgsAsAdmin = allowMembersOfWhitelistedOrgsAsAdmin; this.buildDescTemplate = buildDescTemplate; setExtensions(extensions); - configVersion = 1; + configVersion = latestVersion; } @Override diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTriggerBackwardsCompatible.java b/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTriggerBackwardsCompatible.java index fdd120340..a2b8f8e32 100644 --- a/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTriggerBackwardsCompatible.java +++ b/src/main/java/org/jenkinsci/plugins/ghprb/GhprbTriggerBackwardsCompatible.java @@ -23,6 +23,8 @@ public abstract class GhprbTriggerBackwardsCompatible extends Trigger getExtensions(); + protected final int latestVersion = 3; + protected String triggerPhrase; protected Integer configVersion; @@ -58,7 +60,7 @@ protected void convertPropertiesToExtensions() { checkBuildStatusMessages(); checkCommitStatusContext(); - configVersion = 3; + configVersion = latestVersion; } private void checkBuildStatusMessages() {