[JENKINS-43507] There will be no 2.1.0 release

jenkinsci · Jun 20, 2017 · d4f2fda50687538058312e635c78605dde7be66c · d4f2fda
1 parent efaf706
commit d4f2fda50687538058312e635c78605dde7be66c
diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
@@ -135,7 +135,7 @@
            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
     */
@@ -264,12 +264,12 @@
    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;

diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMHead.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMHead.java
@@ -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");
            }

diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSource.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSource.java
@@ -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 {