You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/07/28 22:37:29 UTC
svn commit: r680485 - in /maven/plugins/trunk/maven-changes-plugin: ./
src/main/java/org/apache/maven/plugin/announcement/
src/main/java/org/apache/maven/plugin/changes/
src/test/java/org/apache/maven/plugin/changes/
Author: olamy
Date: Mon Jul 28 13:37:28 2008
New Revision: 680485
URL: http://svn.apache.org/viewvc?rev=680485&view=rev
Log:
[MCHANGES-120] announcement:generate mojo should warn, not fail if the changes file doesn't exist.
Add the same in the changes report mojo
Submitted by Justin Edelson
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
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/ChangesMojo.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=680485&r1=680484&r2=680485&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Mon Jul 28 13:37:28 2008
@@ -53,6 +53,12 @@
<email>dennisl@apache.org</email>
</developer>
</developers>
+
+ <contributors>
+ <contributor>
+ <email>Justin Edelson</email>
+ </contributor>
+ </contributors>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin/</connection>
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=680485&r1=680484&r2=680485&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 Mon Jul 28 13:37:28 2008
@@ -263,11 +263,18 @@
if ( !generateJiraAnnouncement )
{
- setXml( new ChangesXML( getXmlPath(), getLog() ) );
+ if ( getXmlPath().exists() )
+ {
+ setXml( new ChangesXML( getXmlPath(), getLog() ) );
- getLog().info( "Creating announcement file from " + getXmlPath() + "..." );
+ getLog().info( "Creating announcement file from " + getXmlPath() + "..." );
- doGenerate( getXml().getReleaseList() );
+ doGenerate( getXml().getReleaseList() );
+ }
+ else
+ {
+ getLog().warn( "changes.xml file " + getXmlPath().getAbsolutePath() + " does not exist." );
+ }
}
else
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java?rev=680485&r1=680484&r2=680485&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java Mon Jul 28 13:37:28 2008
@@ -128,6 +128,13 @@
public void executeReport( Locale locale )
throws MavenReportException
{
+
+ if ( !xmlPath.exists() )
+ {
+ getLog().warn( "changes.xml file " + xmlPath.getAbsolutePath() + " does not exist." );
+ return;
+ }
+
ChangesReportGenerator report = new ChangesReportGenerator( xmlPath, getLog() );
report.setIssueLinksPerSystem( issueLinkTemplatePerSystem );
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=680485&r1=680484&r2=680485&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 Mon Jul 28 13:37:28 2008
@@ -6,9 +6,6 @@
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
/*
* Licensed to the Apache Software Foundation (ASF) under one