|
58 | 58 | import hudson.RestrictedSince;
|
59 | 59 | import hudson.Util;
|
60 | 60 | import hudson.console.HyperlinkNote;
|
| 61 | +import hudson.init.InitMilestone; |
| 62 | +import hudson.init.Initializer; |
61 | 63 | import hudson.model.Action;
|
62 | 64 | import hudson.model.Actionable;
|
63 | 65 | import hudson.model.Item;
|
| 66 | +import hudson.model.Items; |
64 | 67 | import hudson.model.TaskListener;
|
65 | 68 | import hudson.plugins.git.GitSCM;
|
66 | 69 | import hudson.scm.SCM;
|
|
87 | 90 | import java.util.logging.Logger;
|
88 | 91 | import jenkins.authentication.tokens.api.AuthenticationTokens;
|
89 | 92 | import jenkins.model.Jenkins;
|
| 93 | +import jenkins.plugins.git.MergeWithGitSCMExtension; |
90 | 94 | import jenkins.plugins.git.traits.GitBrowserSCMSourceTrait;
|
91 | 95 | import jenkins.scm.api.SCMHead;
|
92 | 96 | import jenkins.scm.api.SCMHeadCategory;
|
@@ -140,6 +144,14 @@ public class BitbucketSCMSource extends SCMSource {
|
140 | 144 | private static final String CLOUD_REPO_TEMPLATE = "{/owner,repo}";
|
141 | 145 | private static final String SERVER_REPO_TEMPLATE = "/projects{/owner}/repos{/repo}";
|
142 | 146 |
|
| 147 | + /** |
| 148 | + * Mapping classes after refactoring for backward compatibility. |
| 149 | + */ |
| 150 | + @Initializer(before = InitMilestone.PLUGINS_STARTED) |
| 151 | + public static void aliases() { |
| 152 | + Items.XSTREAM2.addCompatibilityAlias("com.cloudbees.jenkins.plugins.bitbucket.MergeWithGitSCMExtension", MergeWithGitSCMExtension.class); |
| 153 | + } |
| 154 | + |
143 | 155 | /** How long to delay events received from Bitbucket in order to allow the API caches to sync. */
|
144 | 156 | private static /*mostly final*/ int eventDelaySeconds =
|
145 | 157 | Math.min(
|
|
0 commit comments