Author: dennisl
Date: Thu Jan 3 16:12:02 2013
New Revision: 1428434
URL: http://svn.apache.org/viewvc?rev=1428434&view=rev
Log:
[MCHANGES-278] Improved logging and exception messages to aid troubleshooting
Submitted by: Markus Spann
Reviewed by: Dennis Lundberg
- I added expanded exception messages for issues as well
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/Issue.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=1428434&r1=1428433&r2=1428434&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
Thu Jan 3 16:12:02 2013
@@ -550,6 +550,9 @@ public class AnnouncementMojo
{
String version = ( versionPrefix == null ? "" : versionPrefix ) +
getVersion();
+ getLog().debug( "Generating announcement for version [" + version +
"]. Found these releases: "
+ + ReleaseUtils.toString( releases ) );
+
doGenerate( releases, releaseUtils.getLatestRelease( releases, version
) );
}
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=1428434&r1=1428433&r2=1428434&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
Thu Jan 3 16:12:02 2013
@@ -71,7 +71,7 @@ public class ReleaseUtils
if ( release == null )
{
throw new MojoExecutionException( "Couldn't find the release '" +
pomVersion
- + "' among the supplied releases." );
+ + "' among the supplied releases: " + toString( releases ) );
}
return release;
@@ -252,4 +252,21 @@ public class ReleaseUtils
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()
+ + "]";
+ }
+
+ public static String toString( List<Release> releases ) {
+ List<String> releaseStrings = new ArrayList<String>( releases.size() );
+ 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/issues/Issue.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/Issue.java?rev=1428434&r1=1428433&r2=1428434&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/Issue.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/Issue.java
Thu Jan 3 16:12:02 2013
@@ -251,4 +251,12 @@ public class Issue
{
this.version = version;
}
+
+ public String toString() {
+ return this.getClass().getSimpleName()
+ + "[id='" + this.getId() + "'"
+ + ", title='" + this.getTitle() + "'"
+ + ", fixVersions='" + this.getFixVersions() + "'"
+ + "]";
+ }
}
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=1428434&r1=1428433&r2=1428434&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
Thu Jan 3 16:12:02 2013
@@ -72,7 +72,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." );
+ "Couldn't find any issues with a Fix Version prefix of '" +
prefix + "' among the supplied issues: " + toString( issues ) );
}
return filteredIssues;
}
@@ -117,8 +117,16 @@ public class IssueUtils
if ( !isFound )
{
throw new MojoExecutionException(
- "Couldn't find any issues for the version '" + releaseVersion
+ "' among the supplied 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 ) {
+ List<String> issueStrings = new ArrayList<String>( issues.size() );
+ for ( Issue issue : issues ) {
+ issueStrings.add( issue.toString() );
+ }
+ return issueStrings.toString();
+ }
}
