Merge a4578c4 into f1a96d7

jenkinsci · Apr 7, 2020 · 0a0c5d9 · 0a0c5d9
2 parents f1a96d7 + a4578c4
commit 0a0c5d9
Show file tree

Hide file tree

Showing 19 changed files with 219 additions and 678 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
   <url>https://github.com/jenkinsci/jira-plugin</url>
 
   <properties>
-    <revision>3.0.15</revision>
+    <revision>4.0.0</revision>
     <changelist>-SNAPSHOT</changelist>
     <java.level>8</java.level>
     <mockito.version>1.10.19</mockito.version>
@@ -50,8 +50,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
-              <additionalparam>-Xdoclint:none</additionalparam>
-            </configuration>
+              <doclint>none</doclint>  <!-- Turnoff all checks -->            </configuration>
           </plugin>
         </plugins>
       </build>

diff --git a/src/main/java/hudson/plugins/jira/JiraCreateIssueNotifier.java b/src/main/java/hudson/plugins/jira/JiraCreateIssueNotifier.java
@@ -76,11 +76,6 @@ public JiraCreateIssueNotifier(String projectKey, String testDescription, String
         this.actionIdOnSuccess = actionIdOnSuccess;
     }
 
-    @Deprecated
-    public JiraCreateIssueNotifier(String projectKey, String testDescription, String assignee, String component) {
-        this(projectKey, testDescription, assignee, component, null, null, null);
-    }
-
     public String getProjectKey() {
         return projectKey;
     }

diff --git a/src/main/java/hudson/plugins/jira/JiraFolderProperty.java b/src/main/java/hudson/plugins/jira/JiraFolderProperty.java
@@ -39,16 +39,6 @@ public JiraSite[] getSites() {
         return sites.toArray(new JiraSite[0]);
     }
 
-    /**
-     * @deprecated use {@link #setSites(List)} instead
-     *
-     * @param site the Jira site
-     */
-    @Deprecated
-    public void setSites(JiraSite site) {
-        sites.add(site);
-    }
-
     @DataBoundSetter
     public void setSites(List<JiraSite> sites) {
         this.sites = sites;

diff --git a/src/main/java/hudson/plugins/jira/JiraProjectProperty.java b/src/main/java/hudson/plugins/jira/JiraProjectProperty.java
@@ -70,8 +70,6 @@ public JiraSite getSite() {
 
     @Extension
     public static final class DescriptorImpl extends JobPropertyDescriptor {
-        @Deprecated
-        protected transient List<JiraSite> sites;
 
         @Override
         @SuppressWarnings("unchecked")
@@ -117,32 +115,5 @@ public ListBoxModel doFillSiteNameItems(@AncestorInPath AbstractFolder<?> folder
             return items;
         }
 
-        @SuppressWarnings("unused") // Used to start migration after all extensions are loaded
-        @Initializer(after=InitMilestone.EXTENSIONS_AUGMENTED)
-        public void migrate() {
-            DescriptorImpl descriptor = (DescriptorImpl) Jenkins.getInstance()
-                .getDescriptor(JiraProjectProperty.class);
-            if (descriptor != null) {
-                descriptor.load(); // force readResolve without registering descriptor as configurable
-            }
-        }
-
-        @SuppressWarnings("deprecation") // Migrate configuration
-        protected Object readResolve() {
-            if (sites != null) {
-                JiraGlobalConfiguration jiraGlobalConfiguration = (JiraGlobalConfiguration) Jenkins.getInstance()
-                    .getDescriptorOrDie(JiraGlobalConfiguration.class);
-                jiraGlobalConfiguration.load();
-                jiraGlobalConfiguration.getSites().addAll(sites);
-                jiraGlobalConfiguration.save();
-                sites = null;
-                DescriptorImpl oldDescriptor = (DescriptorImpl) Jenkins.getInstance()
-                    .getDescriptor(JiraProjectProperty.class);
-                if (oldDescriptor != null) {
-                    oldDescriptor.save();
-                }
-            }
-            return this;
-        }
     }
 }
diff --git a/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdater.java b/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdater.java
diff --git a/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdaterBuilder.java b/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdaterBuilder.java
@@ -26,12 +26,6 @@ public class JiraReleaseVersionUpdaterBuilder extends Builder implements SimpleB
     @Extension
     public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
 
-    @Deprecated
-    public JiraReleaseVersionUpdaterBuilder(String jiraProjectKey, String jiraRelease) {
-        this.jiraRelease = jiraRelease;
-        this.jiraProjectKey = jiraProjectKey;
-    }
-
     @DataBoundConstructor
     public JiraReleaseVersionUpdaterBuilder(String jiraProjectKey, String jiraRelease, String jiraDescription) {
         this.jiraRelease = jiraRelease;

diff --git a/src/main/java/hudson/plugins/jira/JiraRestService.java b/src/main/java/hudson/plugins/jira/JiraRestService.java
@@ -99,11 +99,6 @@ public class JiraRestService {
 
     private final int timeout;
 
-    @Deprecated
-    public JiraRestService(URI uri, ExtendedJiraRestClient jiraRestClient, String username, String password) {
-    	this(uri, jiraRestClient, username, password, JiraSite.DEFAULT_TIMEOUT);
-    }
-
     public JiraRestService(URI uri, ExtendedJiraRestClient jiraRestClient, String username, String password, int timeout) {
         this.uri = uri;
         this.objectMapper = new ObjectMapper();
@@ -268,11 +263,6 @@ public void releaseVersion(String projectKey, ExtendedVersion version) {
         }
     }
 
-    @Deprecated
-    public BasicIssue createIssue(String projectKey, String description, String assignee, Iterable<String> components, String summary) {
-        return createIssue(projectKey, description, assignee, components, summary, BUG_ISSUE_TYPE_ID, null);
-    }
-
     public BasicIssue createIssue(String projectKey, String description, String assignee, Iterable<String> components, String summary,
                                   @Nonnull Long issueTypeId, @Nullable Long priorityId) {
         IssueInputBuilder builder = new IssueInputBuilder();

diff --git a/src/main/java/hudson/plugins/jira/JiraSession.java b/src/main/java/hudson/plugins/jira/JiraSession.java
@@ -393,21 +393,6 @@ private Map<Long, String> getKnownStatuses() {
         return knownStatuses;
     }
 
-    /**
-     * Returns issue-id of the created issue
-     *
-     * @param projectKey
-     * @param description
-     * @param assignee
-     * @param components
-     * @param summary
-     * @return The issue id
-     */
-    @Deprecated
-    public Issue createIssue(String projectKey, String description, String assignee, Iterable<String> components, String summary) {
-        return createIssue(projectKey, description, assignee, components, summary, null, null);
-    }
-
     public Issue createIssue(String projectKey, String description, String assignee, Iterable<String> components, String summary, @Nonnull Long issueTypeId, @Nullable Long priorityId) {
         final BasicIssue basicIssue = service.createIssue(projectKey, description, assignee, components, summary, issueTypeId, priorityId);
         return service.getIssue(basicIssue.getKey());