You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/27 20:25:11 UTC
svn commit: r1517906 [7/24] - in /maven/plugins/trunk:
maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/
maven-antru...
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java Tue Aug 27 18:25:03 2013
@@ -42,8 +42,7 @@ import org.apache.maven.plugins.changes.
*
* @version $Id$
*/
-public class ChangesReportGenerator
- extends AbstractIssuesReportGenerator
+public class ChangesReportGenerator extends AbstractIssuesReportGenerator
{
/**
@@ -206,7 +205,7 @@ public class ChangesReportGenerator
}
// If the %URL% token is used then the issue management system URL must be set.
- if ( issueLink.contains( URL_TOKEN ) && StringUtils.isBlank( getUrl() ) )
+ if (issueLink.contains(URL_TOKEN) && StringUtils.isBlank( getUrl() ) )
{
return false;
}
@@ -226,9 +225,9 @@ public class ChangesReportGenerator
{
sinkBeginReport( sink, bundle );
- constructReleaseHistory( sink, bundle, releaseList );
+ constructReleaseHistory(sink, bundle, releaseList);
- constructReleases( sink, bundle, releaseList );
+ constructReleases(sink, bundle, releaseList);
sinkEndReport( sink );
}
@@ -236,7 +235,7 @@ public class ChangesReportGenerator
/**
* Constructs table row for specified action with all calculated content (e.g. issue link).
*
- * @param sink Sink
+ * @param sink Sink
* @param bundle Resource bundle
* @param action Action to generate content for
*/
@@ -244,7 +243,7 @@ public class ChangesReportGenerator
{
sink.tableRow();
- sinkShowTypeIcon( sink, action.getType() );
+ sinkShowTypeIcon(sink, action.getType());
sink.tableCell();
@@ -312,7 +311,7 @@ public class ChangesReportGenerator
/**
* Construct a text or link that mention the people that helped with an action.
*
- * @param sink The sink
+ * @param sink The sink
* @param action The action that was done
* @param bundle A resource bundle for i18n
* @param dueTos Other people that helped with an action
@@ -321,18 +320,17 @@ public class ChangesReportGenerator
{
// Create a Map with key : dueTo name, value : dueTo email
- Map<String, String> namesEmailMap = new LinkedHashMap<String, String>();
+ Map<String,String> namesEmailMap = new LinkedHashMap<String,String>();
// Only add the dueTo specified as attributes, if it has either a dueTo or a dueToEmail
if ( StringUtils.isNotEmpty( action.getDueTo() ) || StringUtils.isNotEmpty( action.getDueToEmail() ) )
{
- namesEmailMap.put( action.getDueTo(), action.getDueToEmail() );
+ namesEmailMap.put(action.getDueTo(), action.getDueToEmail());
}
- for ( Object dueTo1 : dueTos )
- {
+ for (Object dueTo1 : dueTos) {
DueTo dueTo = (DueTo) dueTo1;
- namesEmailMap.put( dueTo.getName(), dueTo.getEmail() );
+ namesEmailMap.put(dueTo.getName(), dueTo.getEmail());
}
if ( namesEmailMap.isEmpty() )
@@ -362,16 +360,16 @@ public class ChangesReportGenerator
}
}
- sink.text( "." );
+ sink.text(".");
}
/**
* Construct links to the issues that were solved by an action.
*
- * @param issue The issue specified by attributes
+ * @param issue The issue specified by attributes
* @param system The issue management system
- * @param sink The sink
- * @param fixes The List of issues specified as fixes elements
+ * @param sink The sink
+ * @param fixes The List of issues specified as fixes elements
*/
private void constructIssueLink( String issue, String system, Sink sink, List fixes )
{
@@ -414,14 +412,14 @@ public class ChangesReportGenerator
* were solved by an action.
*
* @param issue The issue specified by attributes
- * @param sink The sink
+ * @param sink The sink
* @param fixes The List of issues specified as fixes elements
*/
private void constructIssueText( String issue, Sink sink, List fixes )
{
if ( StringUtils.isNotEmpty( issue ) )
{
- sink.text( issue );
+ sink.text(issue);
if ( !fixes.isEmpty() )
{
@@ -436,7 +434,7 @@ public class ChangesReportGenerator
String currentIssueId = fixedIssue.getIssue();
if ( StringUtils.isNotEmpty( currentIssueId ) )
{
- sink.text( currentIssueId );
+ sink.text(currentIssueId);
}
if ( iterator.hasNext() )
@@ -465,17 +463,16 @@ public class ChangesReportGenerator
sink.tableRow_();
- for ( Object aReleaseList : releaseList )
- {
+ for (Object aReleaseList : releaseList) {
Release release = (Release) aReleaseList;
sink.tableRow();
- sinkCellLink( sink, release.getVersion(), "#" + HtmlTools.encodeId( release.getVersion() ) );
+ sinkCellLink(sink, release.getVersion(), "#" + HtmlTools.encodeId(release.getVersion()));
- sinkCell( sink, release.getDateRelease() );
+ sinkCell(sink, release.getDateRelease());
- sinkCell( sink, release.getDescription() );
+ sinkCell(sink, release.getDescription());
sink.tableRow_();
}
@@ -500,24 +497,23 @@ public class ChangesReportGenerator
/**
* Constructs document sections for each of specified releases.
*
- * @param sink Sink
- * @param bundle Resource bundle
+ * @param sink Sink
+ * @param bundle Resource bundle
* @param releaseList Releases to create content for
*/
private void constructReleases( Sink sink, ResourceBundle bundle, List releaseList )
{
- for ( Object aReleaseList : releaseList )
- {
+ for (Object aReleaseList : releaseList) {
Release release = (Release) aReleaseList;
- constructRelease( sink, bundle, release );
+ constructRelease(sink, bundle, release);
}
}
/**
* Constructs document section for specified release.
*
- * @param sink Sink
- * @param bundle Resource bundle
+ * @param sink Sink
+ * @param bundle Resource bundle
* @param release Release to create document section for
*/
private void constructRelease( Sink sink, ResourceBundle bundle, Release release )
@@ -526,14 +522,13 @@ public class ChangesReportGenerator
final String date = ( release.getDateRelease() == null ) ? "" : " - " + release.getDateRelease();
- sinkSectionTitle2Anchor( sink,
- bundle.getString( "report.changes.label.release" ) + " " + release.getVersion() + date,
- release.getVersion() );
+ sinkSectionTitle2Anchor(sink, bundle.getString("report.changes.label.release") + " "
+ + release.getVersion() + date, release.getVersion());
if ( isReleaseEmpty( release ) )
{
sink.paragraph();
- sink.text( bundle.getString( "report.changes.text.no.changes" ) );
+ sink.text( bundle.getString("report.changes.text.no.changes") );
sink.paragraph_();
}
else
@@ -543,22 +538,20 @@ public class ChangesReportGenerator
sink.tableRow();
sinkHeader( sink, bundle.getString( "report.issues.label.type" ) );
sinkHeader( sink, bundle.getString( "report.issues.label.summary" ) );
- sinkHeader( sink, bundle.getString( "report.issues.label.assignee" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.assignee"));
if ( this.isAddActionDate() )
{
sinkHeader( sink, bundle.getString( "report.issues.label.updated" ) );
}
sink.tableRow_();
- for ( Action action : release.getActions() )
- {
- constructAction( sink, bundle, action );
+ for (Action action : release.getActions()) {
+ constructAction(sink, bundle, action);
}
- for ( Object o : release.getComponents() )
- {
+ for (Object o : release.getComponents()) {
Component component = (Component) o;
- constructComponent( sink, bundle, component );
+ constructComponent(sink, bundle, component);
}
sink.table_();
@@ -571,8 +564,8 @@ public class ChangesReportGenerator
* Constructs table rows for specified release component. It will create header row for
* component name and action rows for all component issues.
*
- * @param sink Sink
- * @param bundle Resource bundle
+ * @param sink Sink
+ * @param bundle Resource bundle
* @param component Release component to generate content for.
*/
private void constructComponent( Sink sink, ResourceBundle bundle, Component component )
@@ -585,7 +578,7 @@ public class ChangesReportGenerator
sink.tableHeaderCell_();
sink.tableHeaderCell();
- sink.text( component.getName() );
+ sink.text(component.getName());
sink.tableHeaderCell_();
sink.tableHeaderCell();
@@ -599,9 +592,8 @@ public class ChangesReportGenerator
sink.tableRow_();
- for ( Action action : component.getActions() )
- {
- constructAction( sink, bundle, action );
+ for (Action action : component.getActions()) {
+ constructAction(sink, bundle, action);
}
}
}
@@ -612,18 +604,15 @@ public class ChangesReportGenerator
* @param release Release to check
* @return <code>true</code> if release doesn't contain any issues, <code>false</code> otherwise
*/
- private boolean isReleaseEmpty( Release release )
- {
+ private boolean isReleaseEmpty( Release release ) {
if ( !release.getActions().isEmpty() )
{
return false;
}
- for ( Object o : release.getComponents() )
- {
+ for (Object o : release.getComponents()) {
Component component = (Component) o;
- if ( !component.getActions().isEmpty() )
- {
+ if (!component.getActions().isEmpty()) {
return false;
}
}
@@ -634,7 +623,7 @@ public class ChangesReportGenerator
/**
* Replace tokens in the issue link template with the real values.
*
- * @param issue The issue identifier
+ * @param issue The issue identifier
* @param system The issue management system
* @return An interpolated issue link
*/
@@ -643,7 +632,7 @@ public class ChangesReportGenerator
String parseLink;
String issueLink = (String) this.issueLinksPerSystem.get( system );
parseLink = issueLink.replaceFirst( ISSUE_TOKEN, issue );
- if ( parseLink.contains( URL_TOKEN ) )
+ if (parseLink.contains(URL_TOKEN))
{
String url = this.url.substring( 0, this.url.lastIndexOf( "/" ) );
parseLink = parseLink.replaceFirst( URL_TOKEN, url );
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java Tue Aug 27 18:25:03 2013
@@ -32,7 +32,7 @@ import java.util.Map;
/**
* An adapter that can adapt data models from other issue management system to the data models used in the changes.xml
* file.
- *
+ *
* @author Dennis Lundberg
* @version $Id$
* @since 2.4
@@ -40,7 +40,6 @@ import java.util.Map;
public class IssueAdapter
{
private static final String UNKNOWN_ISSUE_TYPE = "";
-
private IssueManagementSystem ims;
/**
@@ -60,7 +59,7 @@ public class IssueAdapter
/**
* Adapt a <code>List</code> of <code>Issue</code>s to a <code>List</code> of <code>Release</code>s.
- *
+ *
* @param issues The issues
* @return A list of releases
*/
@@ -105,7 +104,7 @@ public class IssueAdapter
/**
* Create an <code>Action</code> from an issue.
- *
+ *
* @param issue The issue to extract the information from
* @return An <code>Action</code>
*/
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java Tue Aug 27 18:25:03 2013
@@ -51,11 +51,10 @@ public class ReleaseUtils
* Get the latest release by matching the supplied releases
* with the version from the pom.
*
- * @param releases list of releases
+ * @param releases list of releases
* @param pomVersion Version of the artifact
* @return A <code>Release</code> that matches the next release of the current project
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If a release can't be found
+ * @throws org.apache.maven.plugin.MojoExecutionException If a release can't be found
*/
public Release getLatestRelease( List<Release> releases, String pomVersion )
throws MojoExecutionException
@@ -71,8 +70,8 @@ public class ReleaseUtils
if ( release == null )
{
- throw new MojoExecutionException(
- "Couldn't find the release '" + pomVersion + "' among the supplied releases: " + toString( releases ) );
+ throw new MojoExecutionException( "Couldn't find the release '" + pomVersion
+ + "' among the supplied releases: " + toString( releases ) );
}
return release;
@@ -87,7 +86,7 @@ public class ReleaseUtils
* Get a release with the specified version from the list of releases.
*
* @param releases A list of releases
- * @param version The version we want
+ * @param version The version we want
* @return A Release, or null if no release with the specified version can be found
*/
protected Release getRelease( List<Release> releases, String version )
@@ -96,8 +95,8 @@ public class ReleaseUtils
{
if ( getLog().isDebugEnabled() )
{
- getLog().debug(
- "The release: " + release.getVersion() + " has " + release.getActions().size() + " actions." );
+ getLog().debug( "The release: " + release.getVersion()
+ + " has " + release.getActions().size() + " actions." );
}
if ( release.getVersion() != null && release.getVersion().equals( version ) )
@@ -116,13 +115,12 @@ public class ReleaseUtils
protected void logRelease( Release release )
{
Action action;
- for ( Action action1 : release.getActions() )
- {
+ for (Action action1 : release.getActions()) {
action = action1;
- getLog().debug( "o " + action.getType() );
- getLog().debug( "issue : " + action.getIssue() );
- getLog().debug( "action : " + action.getAction() );
- getLog().debug( "dueTo : " + action.getDueTo() );
+ getLog().debug("o " + action.getType());
+ getLog().debug("issue : " + action.getIssue());
+ getLog().debug("action : " + action.getAction());
+ getLog().debug("dueTo : " + action.getDueTo());
}
}
@@ -131,7 +129,7 @@ public class ReleaseUtils
* tracker. If a release is found in both issue trackers, i.e. they have
* the same version, their issues are merged into one release.
*
- * @param firstReleases Releases from the first issue tracker
+ * @param firstReleases Releases from the first issue tracker
* @param secondReleases Releases from the second issue tracker
* @return A list containing the merged releases
*/
@@ -188,16 +186,14 @@ public class ReleaseUtils
* @return A type List of Release objects
* @todo When Modello can generate typed collections this method is no longer needed
*/
- public List<Release> convertReleaseList( List changesReleases )
- {
+ public List<Release> convertReleaseList( List changesReleases ) {
List<Release> releases = new ArrayList<Release>();
// Loop through the List of releases from changes.xml and casting each
// release to a Release
- for ( Object changesRelease : changesReleases )
- {
+ for (Object changesRelease : changesReleases) {
Release release = (Release) changesRelease;
- releases.add( release );
+ releases.add(release);
}
return releases;
}
@@ -208,13 +204,12 @@ public class ReleaseUtils
* their issues are merged into one (parent) release with component marker
* for component issues.
*
- * @param releases Releases from the parent component
- * @param componentName child component name (retrieved from project name)
+ * @param releases Releases from the parent component
+ * @param componentName child component name (retrieved from project name)
* @param componentReleases Releases from the child component
* @return A list containing the merged releases
*/
- public List mergeReleases( final List releases, final String componentName, final List componentReleases )
- {
+ public List mergeReleases( final List releases, final String componentName, final List componentReleases ) {
if ( releases == null && componentReleases == null )
{
return Collections.EMPTY_LIST;
@@ -228,47 +223,43 @@ public class ReleaseUtils
if ( releases != null )
{
- for ( Object release1 : releases )
- {
+ for (Object release1 : releases) {
final Release release = (Release) release1;
- final Release componentRelease = getRelease( componentReleases, release.getVersion() );
- if ( componentRelease != null )
- {
- release.addComponent( componentName, componentRelease );
+ final Release componentRelease = getRelease(componentReleases, release.getVersion());
+ if (componentRelease != null) {
+ release.addComponent(componentName, componentRelease);
}
- mergedReleases.add( release );
+ mergedReleases.add(release);
}
}
- for ( Object componentRelease1 : componentReleases )
- {
+ for (Object componentRelease1 : componentReleases) {
final Release release = (Release) componentRelease1;
- final Release mergedRelease = getRelease( mergedReleases, release.getVersion() );
- if ( mergedRelease == null )
- {
+ final Release mergedRelease = getRelease(mergedReleases, release.getVersion());
+ if (mergedRelease == null) {
final Release componentRelease = new Release();
- componentRelease.setVersion( release.getVersion() );
- componentRelease.setDateRelease( release.getDateRelease() );
- componentRelease.addComponent( componentName, release );
- mergedReleases.add( componentRelease );
+ componentRelease.setVersion(release.getVersion());
+ componentRelease.setDateRelease(release.getDateRelease());
+ componentRelease.addComponent(componentName, release);
+ mergedReleases.add(componentRelease);
}
}
return mergedReleases;
}
- private static String toString( Release release )
- {
- return release.getClass().getSimpleName() + "[version='" + release.getVersion() + "'" + ", date='"
- + release.getDateRelease() + "'" + ", description='" + release.getDescription() + "'" + ", actionsSize="
- + release.getActions().size() + "]";
+ private static String toString(Release release) {
+ return release.getClass().getSimpleName()
+ + "[version='" + release.getVersion() + "'"
+ + ", date='" + release.getDateRelease() + "'"
+ + ", description='" + release.getDescription() + "'"
+ + ", actionsSize=" + release.getActions().size()
+ + "]";
}
- public static String toString( List<Release> releases )
- {
+ public static String toString( List<Release> releases ) {
List<String> releaseStrings = new ArrayList<String>( releases.size() );
- for ( Release release : releases )
- {
+ for ( Release release : releases ) {
releaseStrings.add( toString( release ) );
}
return releaseStrings.toString();
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java Tue Aug 27 18:25:03 2013
@@ -43,7 +43,7 @@ import java.util.ResourceBundle;
* @author Bryan Baugher
* @since 2.8
*/
-@Mojo( name = "github-report", threadSafe = true )
+@Mojo (name = "github-report", threadSafe = true)
public class GitHubMojo
extends AbstractChangesReport
{
@@ -55,15 +55,15 @@ public class GitHubMojo
static
{
- GITHUB_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE );
- GITHUB_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED );
- GITHUB_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION );
- GITHUB_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID );
- GITHUB_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER );
- GITHUB_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS );
- GITHUB_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY );
- GITHUB_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE );
- GITHUB_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED );
+ GITHUB_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE);
+ GITHUB_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED);
+ GITHUB_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION);
+ GITHUB_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID);
+ GITHUB_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER);
+ GITHUB_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS);
+ GITHUB_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY);
+ GITHUB_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE);
+ GITHUB_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED);
}
/**
@@ -77,31 +77,31 @@ public class GitHubMojo
* <code>Updated</code>.
* </p>
*/
- @Parameter( defaultValue = "Id,Type,Summary,Assignee,Reporter,Status,Created,Updated,Fix Version" )
+ @Parameter (defaultValue = "Id,Type,Summary,Assignee,Reporter,Status,Created,Updated,Fix Version")
private String columnNames;
/**
* The scheme of your github api domain. Only use if using github enterprise.
*/
- @Parameter( defaultValue = "http" )
+ @Parameter (defaultValue = "http")
private String githubAPIScheme;
/**
* The port of your github api domain. Only use if using github enterprise.
*/
- @Parameter( defaultValue = "80" )
+ @Parameter (defaultValue = "80")
private int githubAPIPort;
/**
* Boolean which says if we should include open issues in the report.
*/
- @Parameter( defaultValue = "true" )
+ @Parameter (defaultValue = "true")
private boolean includeOpenIssues;
/**
* Boolean which says if we should include only issues with milestones.
*/
- @Parameter( defaultValue = "true" )
+ @Parameter (defaultValue = "true")
private boolean onlyMilestoneIssues;
/**
@@ -109,7 +109,7 @@ public class GitHubMojo
* The current version being used is <code>${project.version}</code> minus
* any "-SNAPSHOT" suffix.
*/
- @Parameter( defaultValue = "false" )
+ @Parameter (defaultValue = "false")
private boolean onlyCurrentVersion;
public String getOutputName()
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java Tue Aug 27 18:25:03 2013
@@ -51,18 +51,14 @@ public class IssueUtils
boolean isFound = false;
Issue issue;
- for ( Issue issue1 : issues )
- {
+ for (Issue issue1 : issues) {
issue = issue1;
- if ( issue.getFixVersions() != null )
- {
- for ( String fixVersion : issue.getFixVersions() )
- {
- if ( prefix == null || fixVersion.startsWith( prefix ) )
- {
+ if (issue.getFixVersions() != null) {
+ for (String fixVersion : issue.getFixVersions()) {
+ if (prefix == null || fixVersion.startsWith(prefix)) {
isFound = true;
- filteredIssues.add( issue );
+ filteredIssues.add(issue);
break;
}
}
@@ -72,8 +68,7 @@ public class IssueUtils
if ( !isFound )
{
throw new MojoExecutionException(
- "Couldn't find any issues with a Fix Version prefix of '" + prefix + "' among the supplied issues: "
- + toString( issues ) );
+ "Couldn't find any issues with a Fix Version prefix of '" + prefix + "' among the supplied issues: " + toString( issues ) );
}
return filteredIssues;
}
@@ -84,7 +79,7 @@ public class IssueUtils
* If the supplied version is a SNAPSHOT, then that part of the version
* will be removed prior to the matching.
*
- * @param issues A list of issues
+ * @param issues A list of issues
* @param version The version that issues should be returned for
* @return A <code>List</code> of issues for the supplied version
* @throws org.apache.maven.plugin.MojoExecutionException
@@ -104,31 +99,26 @@ public class IssueUtils
releaseVersion = version.substring( 0, version.length() - SNAPSHOT_SUFFIX.length() );
}
- for ( Issue issue1 : issues )
- {
+ for (Issue issue1 : issues) {
issue = issue1;
- if ( issue.getFixVersions() != null && issue.getFixVersions().contains( releaseVersion ) )
- {
+ if (issue.getFixVersions() != null && issue.getFixVersions().contains(releaseVersion)) {
isFound = true;
- issuesForVersion.add( issue );
+ issuesForVersion.add(issue);
}
}
if ( !isFound )
{
throw new MojoExecutionException(
- "Couldn't find any issues for the version '" + releaseVersion + "' among the supplied issues: "
- + toString( issues ) );
+ "Couldn't find any issues for the version '" + releaseVersion + "' among the supplied issues: " + toString( issues ) );
}
return issuesForVersion;
}
- public static String toString( List<Issue> issues )
- {
+ public static String toString( List<Issue> issues ) {
List<String> issueStrings = new ArrayList<String>( issues.size() );
- for ( Issue issue : issues )
- {
+ for ( Issue issue : issues ) {
issueStrings.add( issue.toString() );
}
return issueStrings.toString();
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java Tue Aug 27 18:25:03 2013
@@ -34,8 +34,7 @@ import java.util.ResourceBundle;
* @version $Id$
* @since 2.4
*/
-public class IssuesReportGenerator
- extends AbstractIssuesReportGenerator
+public class IssuesReportGenerator extends AbstractIssuesReportGenerator
{
/**
* Fallback value that is used if date field are not available.
@@ -94,64 +93,62 @@ public class IssuesReportGenerator
sink.tableRow();
- for ( int column : columns )
- {
- switch ( column )
- {
+ for (int column : columns) {
+ switch (column) {
case IssuesReportHelper.COLUMN_ASSIGNEE:
- sinkHeader( sink, bundle.getString( "report.issues.label.assignee" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.assignee"));
break;
case IssuesReportHelper.COLUMN_COMPONENT:
- sinkHeader( sink, bundle.getString( "report.issues.label.component" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.component"));
break;
case IssuesReportHelper.COLUMN_CREATED:
- sinkHeader( sink, bundle.getString( "report.issues.label.created" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.created"));
break;
case IssuesReportHelper.COLUMN_FIX_VERSION:
- sinkHeader( sink, bundle.getString( "report.issues.label.fixVersion" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.fixVersion"));
break;
case IssuesReportHelper.COLUMN_ID:
- sinkHeader( sink, bundle.getString( "report.issues.label.id" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.id"));
break;
case IssuesReportHelper.COLUMN_KEY:
- sinkHeader( sink, bundle.getString( "report.issues.label.key" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.key"));
break;
case IssuesReportHelper.COLUMN_PRIORITY:
- sinkHeader( sink, bundle.getString( "report.issues.label.priority" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.priority"));
break;
case IssuesReportHelper.COLUMN_REPORTER:
- sinkHeader( sink, bundle.getString( "report.issues.label.reporter" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.reporter"));
break;
case IssuesReportHelper.COLUMN_RESOLUTION:
- sinkHeader( sink, bundle.getString( "report.issues.label.resolution" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.resolution"));
break;
case IssuesReportHelper.COLUMN_STATUS:
- sinkHeader( sink, bundle.getString( "report.issues.label.status" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.status"));
break;
case IssuesReportHelper.COLUMN_SUMMARY:
- sinkHeader( sink, bundle.getString( "report.issues.label.summary" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.summary"));
break;
case IssuesReportHelper.COLUMN_TYPE:
- sinkHeader( sink, bundle.getString( "report.issues.label.type" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.type"));
break;
case IssuesReportHelper.COLUMN_UPDATED:
- sinkHeader( sink, bundle.getString( "report.issues.label.updated" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.updated"));
break;
case IssuesReportHelper.COLUMN_VERSION:
- sinkHeader( sink, bundle.getString( "report.issues.label.version" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.version"));
break;
default:
@@ -170,91 +167,86 @@ public class IssuesReportGenerator
return;
}
- for ( Object anIssueList : issueList )
- {
+ for (Object anIssueList : issueList) {
// Use a DateFormat based on the Locale
- DateFormat df = DateFormat.getDateInstance( DateFormat.SHORT, locale );
+ DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
Issue issue = (Issue) anIssueList;
sink.tableRow();
- for ( int column : columns )
- {
- switch ( column )
- {
+ for (int column : columns) {
+ switch (column) {
case IssuesReportHelper.COLUMN_ASSIGNEE:
- sinkCell( sink, issue.getAssignee() );
+ sinkCell(sink, issue.getAssignee());
break;
case IssuesReportHelper.COLUMN_COMPONENT:
- sinkCell( sink, IssuesReportHelper.printValues( issue.getComponents() ) );
+ sinkCell(sink, IssuesReportHelper.printValues(issue.getComponents()));
break;
case IssuesReportHelper.COLUMN_CREATED:
String created = NOT_AVAILABLE;
- if ( issue.getCreated() != null )
- {
- created = df.format( issue.getCreated() );
+ if (issue.getCreated() != null) {
+ created = df.format(issue.getCreated());
}
- sinkCell( sink, created );
+ sinkCell(sink, created);
break;
case IssuesReportHelper.COLUMN_FIX_VERSION:
- sinkCell( sink, IssuesReportHelper.printValues( issue.getFixVersions() ) );
+ sinkCell(sink, IssuesReportHelper.printValues(issue.getFixVersions()));
break;
case IssuesReportHelper.COLUMN_ID:
sink.tableCell();
- sink.link( issue.getLink() );
- sink.text( issue.getId() );
+ sink.link(issue.getLink());
+ sink.text(issue.getId());
sink.link_();
sink.tableCell_();
break;
case IssuesReportHelper.COLUMN_KEY:
sink.tableCell();
- sink.link( issue.getLink() );
- sink.text( issue.getKey() );
+ sink.link(issue.getLink());
+ sink.text(issue.getKey());
sink.link_();
sink.tableCell_();
break;
case IssuesReportHelper.COLUMN_PRIORITY:
- sinkCell( sink, issue.getPriority() );
+ sinkCell(sink, issue.getPriority());
break;
case IssuesReportHelper.COLUMN_REPORTER:
- sinkCell( sink, issue.getReporter() );
+ sinkCell(sink, issue.getReporter());
break;
case IssuesReportHelper.COLUMN_RESOLUTION:
- sinkCell( sink, issue.getResolution() );
+ sinkCell(sink, issue.getResolution());
break;
case IssuesReportHelper.COLUMN_STATUS:
- sinkCell( sink, issue.getStatus() );
+ sinkCell(sink, issue.getStatus());
break;
case IssuesReportHelper.COLUMN_SUMMARY:
- sinkCell( sink, issue.getSummary() );
+ sinkCell(sink, issue.getSummary());
break;
case IssuesReportHelper.COLUMN_TYPE:
- sinkCell( sink, issue.getType() );
+ sinkCell(sink, issue.getType());
break;
case IssuesReportHelper.COLUMN_UPDATED:
String updated = NOT_AVAILABLE;
- if ( issue.getUpdated() != null )
- {
- updated = df.format( issue.getUpdated() );
+ if (issue.getUpdated() != null) {
+ updated = df.format(issue.getUpdated());
}
- sinkCell( sink, updated );
+ sinkCell(sink, updated);
break;
case IssuesReportHelper.COLUMN_VERSION:
- sinkCell( sink, issue.getVersion() );
+ sinkCell(sink, issue.getVersion());
break;
default:
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java Tue Aug 27 18:25:03 2013
@@ -68,10 +68,10 @@ public class IssuesReportHelper
* Get a list of id:s for the columns that are to be included in the report.
*
* @param columnNames The names of the columns
- * @param allColumns A mapping from column name to column id
+ * @param allColumns A mapping from column name to column id
* @return A List of column id:s
*/
- public static List<Integer> getColumnIds( String columnNames, Map<String, Integer> allColumns )
+ public static List<Integer> getColumnIds( String columnNames, Map<String,Integer> allColumns )
{
return getColumnIds( columnNames, allColumns, null, null );
}
@@ -82,14 +82,14 @@ public class IssuesReportHelper
* If deprecated column names are used they generate a warning, indicating
* the replacement column name.
*
- * @param columnNames The names of the columns
- * @param allColumns A mapping from column name to column id
+ * @param columnNames The names of the columns
+ * @param allColumns A mapping from column name to column id
* @param deprecatedColumns A mapping from deprecated column name to column id
- * @param log A log
+ * @param log A log
* @return A List of column id:s
*/
- public static List<Integer> getColumnIds( String columnNames, Map<String, Integer> allColumns,
- Map<String, Integer> deprecatedColumns, Log log )
+ public static List<Integer> getColumnIds( String columnNames, Map<String,Integer> allColumns,
+ Map<String,Integer> deprecatedColumns, Log log )
{
DualHashBidiMap bidiColumns = null;
List<Integer> columnIds = new ArrayList<Integer>();
@@ -101,22 +101,16 @@ public class IssuesReportHelper
}
// Loop through the names of the columns, to validate each of them and add their id to the list
- for ( String aColumnNamesArray : columnNamesArray )
- {
+ for (String aColumnNamesArray : columnNamesArray) {
String columnName = aColumnNamesArray.trim();
- if ( allColumns.containsKey( columnName ) )
- {
- columnIds.add( allColumns.get( columnName ) );
- }
- else if ( deprecatedColumns != null && deprecatedColumns.containsKey( columnName ) )
- {
- Integer columnId = deprecatedColumns.get( columnName );
- columnIds.add( columnId );
- if ( log != null )
- {
- log.warn(
- "The columnName '" + columnName + "' has been deprecated." + " Please use " + "the columnName '"
- + bidiColumns.getKey( columnId ) + "' instead." );
+ if (allColumns.containsKey(columnName)) {
+ columnIds.add(allColumns.get(columnName));
+ } else if (deprecatedColumns != null && deprecatedColumns.containsKey(columnName)) {
+ Integer columnId = deprecatedColumns.get(columnName);
+ columnIds.add(columnId);
+ if (log != null) {
+ log.warn("The columnName '" + columnName + "' has been deprecated." + " Please use "
+ + "the columnName '" + bidiColumns.getKey(columnId) + "' instead.");
}
}
}
@@ -159,7 +153,7 @@ public class IssuesReportHelper
int[] intArray = new int[list.size()];
for ( int j = 0; j < intArray.length; j++ )
{
- intArray[j] = list.get( j );
+ intArray[j] = list.get(j);
}
return intArray;
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java Tue Aug 27 18:25:03 2013
@@ -150,14 +150,23 @@ public final class ClassicJiraDownloader
else
{
// create the URL for getting the proper issues from JIRA
- String jqlQuery = new JqlQueryBuilder( log ).project( jiraProject ).fixVersion( getFixFor() ).fixVersionIds(
- fixVersionIds ).statusIds( statusIds ).priorityIds( priorityIds ).resolutionIds(
- resolutionIds ).components( component ).typeIds( typeIds ).sortColumnNames( sortColumnNames ).build();
-
- String url =
- new UrlBuilder( jiraUrl, "sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml" ).addParameter(
- "tempMax", nbEntriesMax ).addParameter( "reset", "true" ).addParameter( "jqlQuery",
- jqlQuery ).build();
+ String jqlQuery = new JqlQueryBuilder( log )
+ .project( jiraProject )
+ .fixVersion( getFixFor() )
+ .fixVersionIds( fixVersionIds )
+ .statusIds( statusIds )
+ .priorityIds( priorityIds )
+ .resolutionIds( resolutionIds )
+ .components( component )
+ .typeIds( typeIds )
+ .sortColumnNames( sortColumnNames )
+ .build();
+
+ String url = new UrlBuilder( jiraUrl, "sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml" )
+ .addParameter( "tempMax", nbEntriesMax )
+ .addParameter( "reset", "true" )
+ .addParameter( "jqlQuery", jqlQuery )
+ .build();
return url;
}
@@ -191,10 +200,16 @@ public final class ClassicJiraDownloader
fullURL += "&fixfor=" + getFixFor();
}
- String createdFilter =
- new ParameterQueryBuilder( log ).fixVersionIds( fixVersionIds ).statusIds( statusIds ).priorityIds(
- priorityIds ).resolutionIds( resolutionIds ).components( component ).typeIds(
- typeIds ).sortColumnNames( sortColumnNames ).filter( filter ).build();
+ String createdFilter = new ParameterQueryBuilder( log )
+ .fixVersionIds( fixVersionIds )
+ .statusIds( statusIds )
+ .priorityIds( priorityIds )
+ .resolutionIds( resolutionIds )
+ .components( component )
+ .typeIds( typeIds )
+ .sortColumnNames( sortColumnNames )
+ .filter( filter )
+ .build();
if ( createdFilter.charAt( 0 ) != '&' )
{
@@ -233,8 +248,8 @@ public final class ClassicJiraDownloader
* jiraPassword being set. You can check this by calling
* isJiraAuthenticationConfigured().
*
- * @param client the HttpClient
- * @param jiraUrl the JIRA installation
+ * @param client the HttpClient
+ * @param jiraUrl the JIRA installation
* @return <code>true</code> if the authentication was successful, otherwise <code>false</code>
*/
private boolean doJiraAuthentication( HttpClient client, final String jiraUrl )
@@ -303,13 +318,13 @@ public final class ClassicJiraDownloader
{
final String loginFailureResponse = "your username and password are incorrect";
- return !loginGet.getResponseBodyAsString().contains( loginFailureResponse );
+ return !loginGet.getResponseBodyAsString().contains(loginFailureResponse);
}
/**
* Setup proxy access if we have to.
*
- * @param client the HttpClient
+ * @param client the HttpClient
*/
private void determineProxy( String jiraUrl, HttpClient client )
{
@@ -328,7 +343,8 @@ public final class ClassicJiraDownloader
getLog().debug( "Using proxy user: " + proxyUser );
client.getState().setProxyCredentials(
- new AuthScope( null, AuthScope.ANY_PORT, null, AuthScope.ANY_SCHEME ),
+ new AuthScope( null, AuthScope.ANY_PORT, null,
+ AuthScope.ANY_SCHEME ),
new UsernamePasswordCredentials( proxyUser, proxyPass ) );
}
}
@@ -337,8 +353,8 @@ public final class ClassicJiraDownloader
/**
* Downloads the given link using the configured HttpClient, possibly following redirects.
*
- * @param cl the HttpClient
- * @param link the URL to JIRA
+ * @param cl the HttpClient
+ * @param link the URL to JIRA
*/
private void download( final HttpClient cl, final String link )
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java Tue Aug 27 18:25:03 2013
@@ -47,7 +47,7 @@ public class JiraHelper
* @param issueManagementUrl The URL to the issue management system
* @return A <code>Map</code> containing the URL and project id
*/
- static Map<String, String> getJiraUrlAndProjectId( String issueManagementUrl )
+ static Map<String,String> getJiraUrlAndProjectId( String issueManagementUrl )
{
String url = issueManagementUrl;
@@ -87,7 +87,7 @@ public class JiraHelper
}
}
- HashMap<String, String> urlMap = new HashMap<String, String>( 4 );
+ HashMap<String,String> urlMap = new HashMap<String,String>( 4 );
urlMap.put( "url", jiraUrl );
@@ -99,9 +99,9 @@ public class JiraHelper
/**
* Try to get a JIRA pid from the issue management URL.
*
- * @param log Used to tell the user what happened
+ * @param log Used to tell the user what happened
* @param issueManagementUrl The URL to the issue management system
- * @param client The client used to connect to JIRA
+ * @param client The client used to connect to JIRA
* @return The JIRA id for the project, or null if it can't be found
*/
public static String getPidFromJira( Log log, String issueManagementUrl, HttpClient client )
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -52,24 +52,24 @@ public class JiraMojo
/**
* Valid JIRA columns.
*/
- private static final Map<String, Integer> JIRA_COLUMNS = new HashMap<String, Integer>( 16 );
+ private static final Map<String,Integer> JIRA_COLUMNS = new HashMap<String,Integer>( 16 );
static
{
- JIRA_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE );
- JIRA_COLUMNS.put( "Component", IssuesReportHelper.COLUMN_COMPONENT );
- JIRA_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED );
- JIRA_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION );
- JIRA_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID );
- JIRA_COLUMNS.put( "Key", IssuesReportHelper.COLUMN_KEY );
- JIRA_COLUMNS.put( "Priority", IssuesReportHelper.COLUMN_PRIORITY );
- JIRA_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER );
- JIRA_COLUMNS.put( "Resolution", IssuesReportHelper.COLUMN_RESOLUTION );
- JIRA_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS );
- JIRA_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY );
- JIRA_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE );
- JIRA_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED );
- JIRA_COLUMNS.put( "Version", IssuesReportHelper.COLUMN_VERSION );
+ JIRA_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE);
+ JIRA_COLUMNS.put( "Component", IssuesReportHelper.COLUMN_COMPONENT);
+ JIRA_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED);
+ JIRA_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION);
+ JIRA_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID);
+ JIRA_COLUMNS.put( "Key", IssuesReportHelper.COLUMN_KEY);
+ JIRA_COLUMNS.put( "Priority", IssuesReportHelper.COLUMN_PRIORITY);
+ JIRA_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER);
+ JIRA_COLUMNS.put( "Resolution", IssuesReportHelper.COLUMN_RESOLUTION);
+ JIRA_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS);
+ JIRA_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY);
+ JIRA_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE);
+ JIRA_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED);
+ JIRA_COLUMNS.put( "Version", IssuesReportHelper.COLUMN_VERSION);
}
/**
@@ -90,7 +90,7 @@ public class JiraMojo
private String columnNames;
/**
- * Use the JIRA query language instead of the JIRA query based on HTTP parameters.
+ * 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.
*
@@ -106,9 +106,9 @@ public class JiraMojo
*
* @since 2.9
*/
- @Parameter( defaultValue = "false" )
+ @Parameter( defaultValue = "false")
private boolean forceRss;
-
+
/**
* Sets the component(s) that you want to limit your report to include.
* Multiple values can be separated by commas (such as 10011,10012).
@@ -211,7 +211,7 @@ public class JiraMojo
/**
* If set to <code>true</code>, then the JIRA report will not be generated.
- *
+ *
* @since 2.8
*/
@Parameter( property = "changes.jira.skip", defaultValue = "false" )
@@ -311,10 +311,10 @@ public class JiraMojo
*/
@Parameter( defaultValue = "" )
private String webUser;
-
+
/*
- * Used for tests.
- */
+ * Used for tests.
+ */
private AbstractJiraDownloader mockDownloader;
/* --------------------------------------------------------------------- */
@@ -330,7 +330,7 @@ public class JiraMojo
{
return false;
}
- if ( mockDownloader != null )
+ if ( mockDownloader != null )
{
return true;
}
@@ -373,7 +373,7 @@ public class JiraMojo
int originalNumberOfIssues = issueList.size();
issueList = IssueUtils.filterIssuesWithVersionPrefix( issueList, versionPrefix );
getLog().debug( "Filtered out " + issueList.size() + " issues of " + originalNumberOfIssues
- + " that matched the versionPrefix '" + versionPrefix + "'." );
+ + " that matched the versionPrefix '" + versionPrefix + "'." );
}
if ( onlyCurrentVersion )
@@ -464,9 +464,9 @@ public class JiraMojo
issueDownloader.setSettings( settings );
issueDownloader.setUseJql( useJql );
-
+
issueDownloader.setOnlyCurrentVersion( onlyCurrentVersion );
-
+
issueDownloader.setVersionPrefix( versionPrefix );
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java Tue Aug 27 18:25:03 2013
@@ -38,7 +38,6 @@ public class JqlQueryBuilder
implements JiraQueryBuilder
{
private String filter = "";
-
private boolean urlEncode = true;
/**
@@ -135,7 +134,6 @@ public class JqlQueryBuilder
/**
* Add a sequence of version IDs already in a list.
- *
* @param fixVersionIds the version ids.
* @return
*/
@@ -247,7 +245,7 @@ public class JqlQueryBuilder
query.append( " AND " );
}
- query.append( key ).append( " in (" );
+ query.append(key).append(" in (");
String[] valuesArr = values.split( "," );
@@ -277,7 +275,7 @@ public class JqlQueryBuilder
trimAndQuoteValue( values.get( i ) );
query.append( ", " );
}
- trimAndQuoteValue( values.get( values.size() - 1 ) );
+ trimAndQuoteValue( values.get ( values.size() - 1 ) );
query.append( ")" );
}
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java Tue Aug 27 18:25:03 2013
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* JIRA 3.x way of constructing a search query based on URL parameters.
- *
+ *
* @author ton.swieb@finalist.com
* @version $Id$
* @since 2.8
@@ -37,33 +37,18 @@ public class ParameterQueryBuilder
implements JiraQueryBuilder
{
private String filter = "";
-
- /**
- * Log for debug output.
- */
+ /** Log for debug output. */
private Log log;
-
private StringBuilder query = new StringBuilder();
- /**
- * Mapping containing all allowed JIRA priority values.
- */
- private final Map<String, String> priorityMap = new HashMap<String, String>( 8 );
-
- /**
- * Mapping containing all allowed JIRA resolution values.
- */
- private final Map<String, String> resolutionMap = new HashMap<String, String>( 8 );
-
- /**
- * Mapping containing all allowed JIRA status values.
- */
- private final Map<String, String> statusMap = new HashMap<String, String>( 8 );
-
- /**
- * Mapping containing all allowed JIRA type values.
- */
- private final Map<String, String> typeMap = new HashMap<String, String>( 8 );
+ /** Mapping containing all allowed JIRA priority values. */
+ private final Map<String,String> priorityMap = new HashMap<String,String>( 8 );
+ /** Mapping containing all allowed JIRA resolution values. */
+ private final Map<String,String> resolutionMap = new HashMap<String,String>( 8 );
+ /** Mapping containing all allowed JIRA status values. */
+ private final Map<String,String> statusMap = new HashMap<String,String>( 8 );
+ /** Mapping containing all allowed JIRA type values. */
+ private final Map<String,String> typeMap = new HashMap<String,String>( 8 );
public ParameterQueryBuilder( Log log )
{
@@ -167,11 +152,9 @@ public class ParameterQueryBuilder
{
String[] fixVersions = fixVersionIds.split( "," );
- for ( String fixVersion : fixVersions )
- {
- if ( fixVersion.length() > 0 )
- {
- query.append( "&fixfor=" ).append( fixVersion.trim() );
+ for (String fixVersion : fixVersions) {
+ if (fixVersion.length() > 0) {
+ query.append("&fixfor=").append(fixVersion.trim());
}
}
}
@@ -335,15 +318,16 @@ public class ParameterQueryBuilder
else
{
// Error in the configuration
- getLog().error( "maven-changes-plugin: The configured value '" + lowerColumnName
- + "' for sortColumnNames is not correct." );
+ getLog().error(
+ "maven-changes-plugin: The configured value '" + lowerColumnName
+ + "' for sortColumnNames is not correct." );
}
}
if ( validSortColumnNames == 0 )
{
// Error in the configuration
- getLog().error( "maven-changes-plugin: None of the configured sortColumnNames '" + sortColumnNames
- + "' are correct." );
+ getLog().error(
+ "maven-changes-plugin: None of the configured sortColumnNames '" + sortColumnNames + "' are correct." );
}
}
return this;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java Tue Aug 27 18:25:03 2013
@@ -29,7 +29,6 @@ package org.apache.maven.plugin.jira;
public class UrlBuilder
{
private static final String AMPERSAND = "&";
-
private static final String QUESTION_MARK = "?";
private StringBuilder query = new StringBuilder();
@@ -51,7 +50,7 @@ public class UrlBuilder
{
query.append( QUESTION_MARK );
}
- query.append( key ).append( "=" ).append( value );
+ query.append(key).append("=").append(value);
}
return this;
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java Tue Aug 27 18:25:03 2013
@@ -36,7 +36,7 @@ import org.apache.velocity.util.StringUt
/**
* Resource Loader for external projects.
- *
+ *
* @version $Id$
*/
public class ProjectResourceLoader
@@ -52,7 +52,7 @@ public class ProjectResourceLoader
* so that we can properly check the modification
* times of the files.
*/
- private Hashtable<String, String> templatePaths = new Hashtable<String, String>();
+ private Hashtable<String,String> templatePaths = new Hashtable<String,String>();
public void init( ExtendedProperties configuration )
{
@@ -60,19 +60,17 @@ public class ProjectResourceLoader
String separator = System.getProperty( "file.separator" );
- String path =
- System.getProperty( "user.dir" ) + separator + "src" + separator + "main" + separator + "resources"
- + separator;
+ String path = System.getProperty( "user.dir" ) + separator + "src" + separator + "main" + separator
+ + "resources" + separator;
rsvc.getLog().info( "path :" + path );
-
+
paths = new ArrayList<String>();
paths.add( path );
-
- for ( String path1 : paths )
- {
- rsvc.getLog().info( "ProjectResourceLoader : adding path '" + path1 + "'" );
+
+ for (String path1 : paths) {
+ rsvc.getLog().info("ProjectResourceLoader : adding path '" + path1 + "'");
}
rsvc.getLog().info( "ProjectResourceLoader : initialization complete." );
}
@@ -84,7 +82,7 @@ public class ProjectResourceLoader
* @param templateName name of template to get
* @return InputStream containing the template
* @throws ResourceNotFoundException if template not found
- * in the file template path.
+ * in the file template path.
*/
public synchronized InputStream getResourceStream( String templateName )
throws ResourceNotFoundException
@@ -105,9 +103,8 @@ public class ProjectResourceLoader
String template = StringUtils.normalizePath( templateName );
if ( template == null || template.length() == 0 )
{
- String msg =
- "Project Resource loader error : argument " + template + " contains .. and may be trying to access "
- + "content outside of template root. Rejected.";
+ String msg = "Project Resource loader error : argument " + template
+ + " contains .. and may be trying to access " + "content outside of template root. Rejected.";
rsvc.getLog().error( "ProjectResourceLoader : " + msg );
@@ -121,7 +118,7 @@ public class ProjectResourceLoader
{
template = template.substring( 1 );
}
-
+
// MCHANGES-118 adding the basedir path
paths.add( (String) rsvc.getApplicationAttribute( "baseDirectory" ) );
@@ -154,16 +151,17 @@ public class ProjectResourceLoader
/**
* Try to find a template given a normalized path.
- *
+ *
* @param path a normalized path
* @return InputStream input stream that will be parsed
+ *
*/
private InputStream findTemplate( String path, String template )
{
try
{
File file = new File( path, template );
-
+
if ( file.canRead() )
{
return new BufferedInputStream( new FileInputStream( file.getAbsolutePath() ) );
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java Tue Aug 27 18:25:03 2013
@@ -47,24 +47,13 @@ import java.util.Map;
*/
public class TracDownloader
{
- /**
- * The Maven project.
- */
+ /** The Maven project. */
private MavenProject project;
-
- /**
- * The Trac query for searching for tickets.
- */
+ /** The Trac query for searching for tickets. */
private String query;
-
- /**
- * The password for authentication into a private Trac installation.
- */
+ /** The password for authentication into a private Trac installation. */
private String tracPassword;
-
- /**
- * The username for authentication into a private Trac installation.
- */
+ /** The username for authentication into a private Trac installation. */
private String tracUser;
private Issue createIssue( Object[] ticketObj )
@@ -104,8 +93,7 @@ public class TracDownloader
return issue;
}
- public List<Issue> getIssueList()
- throws MalformedURLException, XmlRpcException
+ public List<Issue> getIssueList() throws MalformedURLException, XmlRpcException
{
// Create and configure an XML-RPC client
XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
@@ -135,19 +123,18 @@ public class TracDownloader
qstr = query;
}
- Object[] params = new Object[]{ qstr };
+ Object[] params = new Object[] {qstr};
Object[] queryResult;
ArrayList<Issue> issueList = new ArrayList<Issue>();
try
{
queryResult = (Object[]) client.execute( "ticket.query", params );
- for ( Object aQueryResult : queryResult )
- {
- params = new Object[]{ aQueryResult };
+ for (Object aQueryResult : queryResult) {
+ params = new Object[]{aQueryResult};
Object[] ticketGetResult;
- ticketGetResult = (Object[]) client.execute( "ticket.get", params );
- issueList.add( createIssue( ticketGetResult ) );
+ ticketGetResult = (Object[]) client.execute("ticket.get", params);
+ issueList.add(createIssue(ticketGetResult));
}
}
catch ( XmlRpcException e )
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java Tue Aug 27 18:25:03 2013
@@ -50,40 +50,40 @@ public class TracMojo
/**
* Deprecated Trac columns.
*/
- private static Map<String, Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<String, Integer>();
+ private static Map<String,Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<String,Integer>();
/**
* Valid Trac columns.
*/
- private static Map<String, Integer> TRAC_COLUMNS = new HashMap<String, Integer>();
+ private static Map<String,Integer> TRAC_COLUMNS = new HashMap<String,Integer>();
static
{
- DEPRECATED_TRAC_COLUMNS.put( "changed", IssuesReportHelper.COLUMN_UPDATED );
- DEPRECATED_TRAC_COLUMNS.put( "component", IssuesReportHelper.COLUMN_COMPONENT );
- DEPRECATED_TRAC_COLUMNS.put( "created", IssuesReportHelper.COLUMN_CREATED );
- DEPRECATED_TRAC_COLUMNS.put( "id", IssuesReportHelper.COLUMN_ID );
- DEPRECATED_TRAC_COLUMNS.put( "milestone", IssuesReportHelper.COLUMN_FIX_VERSION );
- DEPRECATED_TRAC_COLUMNS.put( "owner", IssuesReportHelper.COLUMN_ASSIGNEE );
- DEPRECATED_TRAC_COLUMNS.put( "priority", IssuesReportHelper.COLUMN_PRIORITY );
- DEPRECATED_TRAC_COLUMNS.put( "reporter", IssuesReportHelper.COLUMN_REPORTER );
- DEPRECATED_TRAC_COLUMNS.put( "resolution", IssuesReportHelper.COLUMN_RESOLUTION );
- DEPRECATED_TRAC_COLUMNS.put( "status", IssuesReportHelper.COLUMN_STATUS );
- DEPRECATED_TRAC_COLUMNS.put( "summary", IssuesReportHelper.COLUMN_SUMMARY );
- DEPRECATED_TRAC_COLUMNS.put( "type", IssuesReportHelper.COLUMN_TYPE );
-
- TRAC_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE );
- TRAC_COLUMNS.put( "Component", IssuesReportHelper.COLUMN_COMPONENT );
- TRAC_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED );
- TRAC_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION );
- TRAC_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID );
- TRAC_COLUMNS.put( "Priority", IssuesReportHelper.COLUMN_PRIORITY );
- TRAC_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER );
- TRAC_COLUMNS.put( "Resolution", IssuesReportHelper.COLUMN_RESOLUTION );
- TRAC_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS );
- TRAC_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY );
- TRAC_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE );
- TRAC_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED );
+ DEPRECATED_TRAC_COLUMNS.put( "changed", IssuesReportHelper.COLUMN_UPDATED);
+ DEPRECATED_TRAC_COLUMNS.put( "component", IssuesReportHelper.COLUMN_COMPONENT);
+ DEPRECATED_TRAC_COLUMNS.put( "created", IssuesReportHelper.COLUMN_CREATED);
+ DEPRECATED_TRAC_COLUMNS.put( "id", IssuesReportHelper.COLUMN_ID);
+ DEPRECATED_TRAC_COLUMNS.put( "milestone", IssuesReportHelper.COLUMN_FIX_VERSION);
+ DEPRECATED_TRAC_COLUMNS.put( "owner", IssuesReportHelper.COLUMN_ASSIGNEE);
+ DEPRECATED_TRAC_COLUMNS.put( "priority", IssuesReportHelper.COLUMN_PRIORITY);
+ DEPRECATED_TRAC_COLUMNS.put( "reporter", IssuesReportHelper.COLUMN_REPORTER);
+ DEPRECATED_TRAC_COLUMNS.put( "resolution", IssuesReportHelper.COLUMN_RESOLUTION);
+ DEPRECATED_TRAC_COLUMNS.put( "status", IssuesReportHelper.COLUMN_STATUS);
+ DEPRECATED_TRAC_COLUMNS.put( "summary", IssuesReportHelper.COLUMN_SUMMARY);
+ DEPRECATED_TRAC_COLUMNS.put( "type", IssuesReportHelper.COLUMN_TYPE);
+
+ TRAC_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE);
+ TRAC_COLUMNS.put( "Component", IssuesReportHelper.COLUMN_COMPONENT);
+ TRAC_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED);
+ TRAC_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION);
+ TRAC_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID);
+ TRAC_COLUMNS.put( "Priority", IssuesReportHelper.COLUMN_PRIORITY);
+ TRAC_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER);
+ TRAC_COLUMNS.put( "Resolution", IssuesReportHelper.COLUMN_RESOLUTION);
+ TRAC_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS);
+ TRAC_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY);
+ TRAC_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE);
+ TRAC_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED);
}
/**
@@ -139,8 +139,8 @@ public class TracMojo
throws MavenReportException
{
// Validate parameters
- List<Integer> columnIds =
- IssuesReportHelper.getColumnIds( columnNames, TRAC_COLUMNS, DEPRECATED_TRAC_COLUMNS, getLog() );
+ List<Integer> columnIds = IssuesReportHelper.getColumnIds( columnNames, TRAC_COLUMNS, DEPRECATED_TRAC_COLUMNS,
+ getLog() );
if ( columnIds.size() == 0 )
{
// This can happen if the user has configured column names and they are all invalid
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java Tue Aug 27 18:25:03 2013
@@ -32,8 +32,8 @@ import org.codehaus.plexus.logging.conso
/**
* @author Olivier Lamy
- * @version $Id$
* @since 27 juil. 2008
+ * @version $Id$
*/
public class ChangesXMLTest
extends PlexusTestCase
@@ -146,18 +146,16 @@ public class ChangesXMLTest
List releases = changesXML.getReleaseList();
assertEquals( 2, releases.size() );
- for ( Object release1 : releases )
- {
+ for (Object release1 : releases) {
Release release = (Release) release1;
- if ( "1.0".equals( release.getVersion() ) )
- {
- Action action = release.getActions().get( 0 );
- assertEquals( 2, action.getFixedIssues().size() );
- assertEquals( "JIRA-XXX", action.getFixedIssues().get( 0 ).getIssue() );
- assertEquals( "JIRA-YYY", action.getFixedIssues().get( 1 ).getIssue() );
- assertEquals( 2, action.getDueTos().size() );
+ if ("1.0".equals(release.getVersion())) {
+ Action action = release.getActions().get(0);
+ assertEquals(2, action.getFixedIssues().size());
+ assertEquals("JIRA-XXX", action.getFixedIssues().get(0).getIssue());
+ assertEquals("JIRA-YYY", action.getFixedIssues().get(1).getIssue());
+ assertEquals(2, action.getDueTos().size());
}
}
}
-
+
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java Tue Aug 27 18:25:03 2013
@@ -71,7 +71,7 @@ public class IssueUtilsTestCase
try
{
IssueUtils.filterIssuesWithVersionPrefix( issueList, "yourPrefix-" );
- fail( "No issues should be found." );
+ fail("No issues should be found.");
}
catch ( MojoExecutionException e )
{
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-131/module/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-131/module/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-131/module/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-131/module/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>example</artifactId>
<groupId>com.mycompany</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>module</artifactId>
+ <artifactId>module</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Example Module</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-a/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-a/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-a/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-a/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,14 +1,13 @@
<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>multi-modules-aggregate-parent</artifactId>
<groupId>org.apache.maven.plugins.checkstyle.its</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>multi-modules-child</artifactId>
+ <artifactId>multi-modules-child</artifactId>
<version>1.0-SNAPSHOT</version>
<name>multi-modules-child</name>
<url>http://maven.apache.org</url>
@@ -27,7 +26,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@pom.version@</version>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -40,7 +39,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@pom.version@</version>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-b/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-b/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-b/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-b/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,14 +1,13 @@
<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>multi-modules-aggregate-parent</artifactId>
<groupId>org.apache.maven.plugins.checkstyle.its</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>multi-modules-child-nosource</artifactId>
+ <artifactId>multi-modules-child-nosource</artifactId>
<version>1.0-SNAPSHOT</version>
<name>multi-modules-child-nosource</name>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child-nosource/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child-nosource/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child-nosource/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child-nosource/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,14 +1,13 @@
<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>multi-modules-parent</artifactId>
<groupId>org.apache.maven.plugins.checkstyle.its</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>multi-modules-child-nosource</artifactId>
+ <artifactId>multi-modules-child-nosource</artifactId>
<version>1.0-SNAPSHOT</version>
<name>multi-modules-child-nosource</name>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,14 +1,13 @@
<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>multi-modules-parent</artifactId>
<groupId>org.apache.maven.plugins.checkstyle.its</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>multi-modules-child</artifactId>
+ <artifactId>multi-modules-child</artifactId>
<version>1.0-SNAPSHOT</version>
<name>multi-modules-child</name>
<url>http://maven.apache.org</url>
@@ -27,7 +26,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@pom.version@</version>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -40,7 +39,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>@pom.version@</version>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
</project>