Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 28B5CD88B for ; Sat, 1 Sep 2012 22:48:17 +0000 (UTC) Received: (qmail 84308 invoked by uid 500); 1 Sep 2012 22:48:17 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 84107 invoked by uid 500); 1 Sep 2012 22:48:16 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 84099 invoked by uid 99); 1 Sep 2012 22:48:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Sep 2012 22:48:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FRT_STOCK2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Sep 2012 22:48:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F2B5D2388993; Sat, 1 Sep 2012 22:47:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1379888 - in /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira: AbstractJiraDownloader.java JiraMojo.java Date: Sat, 01 Sep 2012 22:47:32 -0000 To: commits@maven.apache.org From: dennisl@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120901224732.F2B5D2388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Sat Sep 1 22:47:32 2012 New Revision: 1379888 URL: http://svn.apache.org/viewvc?rev=1379888&view=rev Log: [MCHANGES-285] SAXException parsing JIRA XML from JIRA 5.1 Submitted by: Ton Swieb Reviewed by: Dennis Lundberg Add smarts to make the handling of a single version faster when using JQL. Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java?rev=1379888&r1=1379887&r2=1379888&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java Sat Sep 1 22:47:32 2012 @@ -34,6 +34,7 @@ import org.apache.commons.httpclient.met import org.apache.commons.httpclient.params.HttpClientParams; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.issues.Issue; +import org.apache.maven.plugin.issues.IssueUtils; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Proxy; @@ -103,6 +104,10 @@ public abstract class AbstractJiraDownlo private Settings settings; /** Use JQL, JIRA query language, instead of URL parameter based queries */ private boolean useJql; + /** Filter the JIRA query based on the current version */ + private boolean onlyCurrentVersion; + /** The versionPrefix to apply to the POM version */ + private String versionPrefix; /** The pattern used to parse dates from the JIRA xml file. */ protected String jiraDatePattern; @@ -267,7 +272,27 @@ public abstract class AbstractJiraDownlo */ protected String getFixFor() { - return null; + if ( onlyCurrentVersion && useJql ) + { + // Let JIRA do the filtering of the current version instead of the JIRA mojo. + // This way JIRA returns less issues and we do not run into the "nbEntriesMax" limit that easily. + + String version = ( versionPrefix == null ? "" : versionPrefix ) + project.getVersion(); + + // Remove "-SNAPSHOT" from the end of the version, if it's there + if ( version != null && version.endsWith( IssueUtils.SNAPSHOT_SUFFIX ) ) + { + return version.substring( 0, version.length() - IssueUtils.SNAPSHOT_SUFFIX.length() ); + } + else + { + return version; + } + } + else + { + return null; + } } /** @@ -769,4 +794,24 @@ public abstract class AbstractJiraDownlo { this.useJql = useJql; } + + public boolean isOnlyCurrentVersion() + { + return onlyCurrentVersion; + } + + public void setOnlyCurrentVersion(boolean onlyCurrentVersion) + { + this.onlyCurrentVersion = onlyCurrentVersion; + } + + public String getVersionPrefix() + { + return versionPrefix; + } + + public void setVersionPrefix(String versionPrefix) + { + this.versionPrefix = versionPrefix; + } } Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java?rev=1379888&r1=1379887&r2=1379888&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java Sat Sep 1 22:47:32 2012 @@ -435,6 +435,10 @@ public class JiraMojo issueDownloader.setSettings( settings ); issueDownloader.setUseJql( useJql ); + + issueDownloader.setOnlyCurrentVersion( onlyCurrentVersion ); + + issueDownloader.setVersionPrefix( versionPrefix ); } public void setMockDownloader( AbstractJiraDownloader mockDownloader )