This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch loop in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git
commit b0abb8a86eec478a58e7fc3c678c139e6c047ffe Author: Elliotte Rusty Harold <elh...@ibiblio.org> AuthorDate: Fri Nov 22 13:56:06 2024 -0500 Deprecate ueJql --- .../maven/plugins/announcement/AnnouncementMojo.java | 7 ++----- .../maven/plugins/jira/AbstractJiraDownloader.java | 18 ++---------------- .../java/org/apache/maven/plugins/jira/JiraReport.java | 6 +++--- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java b/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java index aa24b75..6596971 100644 --- a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java +++ b/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java @@ -208,11 +208,10 @@ public class AnnouncementMojo extends AbstractAnnouncementMojo { private String templateEncoding; /** - * Use the JIRA query language instead of the JIRA query based on HTTP parameters. From JIRA 5.1 and up only JQL is - * supported. JIRA 4.4 supports both JQL and URL parameter based queries. From 5.1.1 this is obsolete, since REST - * queries only use JQL. + * Obsolete, since REST queries always use JQL. * * @since 2.10 + * @deprecated ignored; remove from your configs */ @Parameter(property = "changes.useJql", defaultValue = "false") private boolean useJql; @@ -725,8 +724,6 @@ public class AnnouncementMojo extends AbstractAnnouncementMojo { jiraDownloader.setJiraPassword(jiraPassword); } - jiraDownloader.setUseJql(useJql); - jiraDownloader.setWebUser(webUser); jiraDownloader.setWebPassword(webPassword); diff --git a/src/main/java/org/apache/maven/plugins/jira/AbstractJiraDownloader.java b/src/main/java/org/apache/maven/plugins/jira/AbstractJiraDownloader.java index 2132935..b608487 100644 --- a/src/main/java/org/apache/maven/plugins/jira/AbstractJiraDownloader.java +++ b/src/main/java/org/apache/maven/plugins/jira/AbstractJiraDownloader.java @@ -30,8 +30,8 @@ import org.apache.maven.settings.Proxy; import org.apache.maven.settings.Settings; /** - * Abstract API, more or less, to retrieving issue information from JIRA. Intended to have subclasses for the old (RSS) - * and new (REST) ways of doing things. + * Abstract API, more or less, to retrieve issue information from JIRA. Has a subclass for + * new (REST) ways of doing things. * * @author mfran...@xebia.com * @author jr...@exist.com @@ -91,12 +91,6 @@ public abstract class AbstractJiraDownloader { /** The maven settings. */ protected Settings settings; - /** - * Use JQL, JIRA query language, instead of URL parameter based queries. Note that this is down here to make it - * easier for the mojo to deal with both new and old flavors. - */ - protected boolean useJql; - /** Filter the JIRA query based on the current version */ protected boolean onlyCurrentVersion; @@ -337,14 +331,6 @@ public abstract class AbstractJiraDownloader { this.settings = settings; } - public boolean isUseJql() { - return useJql; - } - - public void setUseJql(boolean useJql) { - this.useJql = useJql; - } - public boolean isOnlyCurrentVersion() { return onlyCurrentVersion; } diff --git a/src/main/java/org/apache/maven/plugins/jira/JiraReport.java b/src/main/java/org/apache/maven/plugins/jira/JiraReport.java index 1399b20..3e58d82 100644 --- a/src/main/java/org/apache/maven/plugins/jira/JiraReport.java +++ b/src/main/java/org/apache/maven/plugins/jira/JiraReport.java @@ -83,12 +83,12 @@ public class JiraReport extends AbstractChangesReport { private String columnNames; /** - * Use the JIRA query language instead of the JIRA query based on HTTP parameters. From JIRA 5.1 and up only JQL is - * supported. JIRA 4.4 supports both JQL and URL parameter based queries. From 5.1.1 this is obsolete, since REST - * queries only use JQL. + * Obsolete, since REST queries only use JQL. * * @since 2.8 + * @deprecated ignored; delete from your config */ + @Deprecated @Parameter(property = "changes.useJql", defaultValue = "false") private boolean useJql;