Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-43507] There will be no 2.1.0 release
  • Loading branch information
stephenc committed Jun 20, 2017
1 parent efaf706 commit d4f2fda
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Expand Up @@ -135,7 +135,7 @@ public class GitHubSCMSource extends AbstractGitSCMSource {
Math.min(300, Math.max(0, Integer.getInteger(GitHubSCMSource.class.getName() + ".eventDelaySeconds", 5)));
/**
* Lock to guard access to the {@link #pullRequestSourceMap} field and prevent concurrent GitHub queries during
* a 1.x to 2.1.0+ upgrade.
* a 1.x to 2.2.0+ upgrade.
*
* @since 2.2.0
*/
Expand Down Expand Up @@ -264,12 +264,12 @@ public class GitHubSCMSource extends AbstractGitSCMSource {
private transient /*effectively final*/ Map<Integer,ContributorMetadataAction> pullRequestContributorCache;

/**
* Used during upgrade from 1.x to 2.1.0+ only.
* Used during upgrade from 1.x to 2.2.0+ only.
*
* @see #retrievePullRequestSource(int)
* @see PullRequestSCMHead.FixMetadata
* @see PullRequestSCMHead.FixMetadataMigration
* @since 2.1.0
* @since 2.2.0
*/
@CheckForNull // normally null except during a migration from 1.x
private transient /*effectively final*/ Map<Integer,PullRequestSource> pullRequestSourceMap;
Expand Down
Expand Up @@ -127,7 +127,7 @@ private Object readResolve() {
if (metadata != null) {
// Upgrade from 1.x:
if (UPGRADE_SKIPPED_2_0_X.compareAndSet(false, true)) {
LOGGER.log(Level.WARNING, "GitHub Branch Source plugin was directly upgraded from 1.x to 2.1.0 "
LOGGER.log(Level.WARNING, "GitHub Branch Source plugin was directly upgraded from 1.x to 2.2.0 "
+ "or newer without completing a full fetch from all repositories. Consequently startup may be "
+ "delayed while GitHub is queried for the missing information");
}
Expand Down
Expand Up @@ -25,7 +25,7 @@

/**
* Used for data migration for a 1.x upgrade.
* @since 2.1.0
* @since 2.2.0
*/
@Deprecated // TODO remove once migration from 1.x is no longer supported
class PullRequestSource {
Expand Down

0 comments on commit d4f2fda

Please sign in to comment.