You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gb...@apache.org on 2017/02/25 22:36:31 UTC
svn commit: r1784411 [1/2] - in /maven/plugins/trunk/maven-changes-plugin:
./ src/main/java/org/apache/maven/plugin/
src/main/java/org/apache/maven/plugins/
src/main/java/org/apache/maven/plugins/announcement/
src/main/java/org/apache/maven/plugins/ann...
Author: gboue
Date: Sat Feb 25 22:36:31 2017
New Revision: 1784411
URL: http://svn.apache.org/viewvc?rev=1784411&view=rev
Log:
[MCHANGES-381] Migrate plugin to Maven 3.0
* Replacing usage of deprecated APIs in favor of maven-artifact-transfer
* Renaming the packages to org.apache.maven.plugins
* Failing the build if any deprecated parameters are used, in preparation of their complete removal
* Removing Maven 2 specific code
* Fixing Javadoc comments
* Removing the use of raw types where possible
Added:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AbstractAnnouncementMojo.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java
- copied, changed from r1781298, 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/plugins/announcement/MailSender.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/MailSender.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/mailsender/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesMojo.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesValidatorMojo.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXML.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXMLRuntimeException.java
- copied, changed from r1784410, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXMLRuntimeException.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/FeedGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/IssueType.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueType.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ProjectUtils.java
- copied, changed from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ProjectUtils.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java
- copied, changed from r1781298, 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/plugins/changes/schema/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/resource/
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/resource/loader/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/
maven/plugins/trunk/maven-changes-plugin/src/main/resources/org/apache/maven/plugins/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/main/resources/org/apache/maven/plugin/
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/announcement/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/announcement/
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/github/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/github/
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/
maven/plugins/trunk/maven-changes-plugin/src/test/resources/org/apache/maven/plugins/
- copied from r1784410, maven/plugins/trunk/maven-changes-plugin/src/test/resources/org/apache/maven/plugin/
Removed:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-changes-plugin/src/main/resources/org/apache/maven/plugin/
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-changes-plugin/src/test/resources/org/apache/maven/plugin/
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/ChangesSchemaValidator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/SchemaValidatorException.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubIssueManagementSystem.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/Issue.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssueManagementSystem.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssuesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/AbstractJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/AdaptiveJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/ClassicJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JIRAIssueManagmentSystem.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraQueryBuilder.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraXML.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JqlQueryBuilder.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/UrlBuilder.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracIssueManagmentSystem.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/trac/TracMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/resources/META-INF/plexus/components.xml
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/include-announcement-file.apt.vm
maven/plugins/trunk/maven-changes-plugin/src/site/apt/examples/using-a-custom-announcement-template.apt.vm
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/announcement/AnnouncementMojoTest.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ActionTest.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesValidatorMojoTest.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraHelperTestCase.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraMojoTest.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestProjectStub.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/JqlQueryBuilderTestCase.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/MockJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/jira/UrlBuilderTestCase.java
maven/plugins/trunk/maven-changes-plugin/src/test/unit/jira-plugin-config.xml
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Sat Feb 25 22:36:31 2017
@@ -71,8 +71,9 @@ under the License.
<properties>
<doxiaVersion>1.4</doxiaVersion>
<doxiaSitetoolsVersion>1.4</doxiaSitetoolsVersion>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.0</mavenVersion>
<sitePluginVersion>3.3</sitePluginVersion>
+ <wagonVersion>1.0-beta-6</wagonVersion>
</properties>
<dependencies>
@@ -99,11 +100,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>${mavenVersion}</version>
</dependency>
@@ -123,20 +119,36 @@ under the License.
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>2.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
- <version>1.3</version>
+ <version>3.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-artifact-transfer</artifactId>
+ <version>0.9.0</version>
</dependency>
- <!-- A dependency to maven-filtering, but it's overridden by 1.11 if not specified explicitly here -->
- <!-- This can be removed if upgrading to maven-filtering 1.4 -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
<version>1.24</version>
</dependency>
+ <!-- wagon -->
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>${wagonVersion}</version>
+ </dependency>
+
<!-- plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -372,7 +384,25 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.2</version>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-connector-wagon</artifactId>
+ <version>1.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <version>${wagonVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -389,7 +419,7 @@ under the License.
This file should not contain a license header as it represents
real data downloaded from a JIRA server.
-->
- <exclude>src/test/resources/org/apache/maven/plugin/jira/unicode-jira-results.xml</exclude>
+ <exclude>src/test/resources/org/apache/maven/plugins/jira/unicode-jira-results.xml</exclude>
</excludes>
</configuration>
</plugin>
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AbstractAnnouncementMojo.java (from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AbstractAnnouncementMojo.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AbstractAnnouncementMojo.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java&r1=1781298&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AbstractAnnouncementMojo.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.announcement;
+package org.apache.maven.plugins.announcement;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.maven.plugin.announce
* under the License.
*/
-import org.apache.maven.plugin.changes.AbstractChangesMojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.changes.AbstractChangesMojo;
/**
* Abstract superclass for announcement mojos.
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java (from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java&r1=1781298&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.announcement;
+package org.apache.maven.plugins.announcement;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -32,10 +32,10 @@ import javax.mail.internet.InternetAddre
import org.apache.maven.model.Developer;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.announcement.mailsender.ProjectJavamailMailSender;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.announcement.mailsender.ProjectJavamailMailSender;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
@@ -65,7 +65,7 @@ public class AnnouncementMailMojo
* Possible senders.
*/
@Parameter( property = "project.developers", required = true, readonly = true )
- private List from;
+ private List<Developer> from;
/**
* The id of the developer sending the announcement mail. Only used if the <tt>mailSender</tt> attribute is not set.
@@ -202,7 +202,7 @@ public class AnnouncementMailMojo
* Recipient email address.
*/
@Parameter( required = true )
- private List toAddresses;
+ private List<Object> toAddresses;
/**
* Recipient cc email address.
@@ -210,7 +210,7 @@ public class AnnouncementMailMojo
* @since 2.5
*/
@Parameter
- private List ccAddresses;
+ private List<Object> ccAddresses;
/**
* Recipient bcc email address.
@@ -218,7 +218,7 @@ public class AnnouncementMailMojo
* @since 2.5
*/
@Parameter
- private List bccAddresses;
+ private List<Object> bccAddresses;
/**
* The username used to send the email.
@@ -437,15 +437,13 @@ public class AnnouncementMailMojo
}
else if ( fromDeveloperId == null )
{
- final Developer dev = (Developer) from.get( 0 );
+ final Developer dev = from.get( 0 );
return new MailSender( dev.getName(), dev.getEmail() );
}
else
{
- for ( Object aFrom : from )
+ for ( Developer developer : from )
{
- Developer developer = (Developer) aFrom;
-
if ( fromDeveloperId.equals( developer.getId() ) )
{
return new MailSender( developer.getName(), developer.getEmail() );
@@ -460,32 +458,32 @@ public class AnnouncementMailMojo
// announcement-mail accessors
// ================================
- public List getBccAddresses()
+ public List<Object> getBccAddresses()
{
return bccAddresses;
}
- public void setBccAddresses( List bccAddresses )
+ public void setBccAddresses( List<Object> bccAddresses )
{
this.bccAddresses = bccAddresses;
}
- public List getCcAddresses()
+ public List<Object> getCcAddresses()
{
return ccAddresses;
}
- public void setCcAddresses( List ccAddresses )
+ public void setCcAddresses( List<Object> ccAddresses )
{
this.ccAddresses = ccAddresses;
}
- public List getFrom()
+ public List<Developer> getFrom()
{
return from;
}
- public void setFrom( List from )
+ public void setFrom( List<Developer> from )
{
this.from = from;
}
@@ -600,12 +598,12 @@ public class AnnouncementMailMojo
this.announcementDirectory = announcementDirectory;
}
- public List getToAddresses()
+ public List<Object> getToAddresses()
{
return toAddresses;
}
- public void setToAddresses( List toAddresses )
+ public void setToAddresses( List<Object> toAddresses )
{
this.toAddresses = toAddresses;
}
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java (from r1781298, 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/plugins/announcement/AnnouncementMojo.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java&r1=1781298&r2=1784411&rev=1784411&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/plugins/announcement/AnnouncementMojo.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.announcement;
+package org.apache.maven.plugins.announcement;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,24 +29,24 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.changes.ChangesXML;
-import org.apache.maven.plugin.changes.IssueAdapter;
-import org.apache.maven.plugin.changes.ProjectUtils;
-import org.apache.maven.plugin.changes.ReleaseUtils;
-import org.apache.maven.plugin.github.GitHubDownloader;
-import org.apache.maven.plugin.github.GitHubIssueManagementSystem;
-import org.apache.maven.plugin.issues.Issue;
-import org.apache.maven.plugin.issues.IssueManagementSystem;
-import org.apache.maven.plugin.issues.IssueUtils;
-import org.apache.maven.plugin.jira.AbstractJiraDownloader;
-import org.apache.maven.plugin.jira.AdaptiveJiraDownloader;
-import org.apache.maven.plugin.jira.JIRAIssueManagmentSystem;
-import org.apache.maven.plugin.trac.TracDownloader;
-import org.apache.maven.plugin.trac.TracIssueManagmentSystem;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.changes.ChangesXML;
+import org.apache.maven.plugins.changes.IssueAdapter;
+import org.apache.maven.plugins.changes.ProjectUtils;
+import org.apache.maven.plugins.changes.ReleaseUtils;
import org.apache.maven.plugins.changes.model.Release;
+import org.apache.maven.plugins.github.GitHubDownloader;
+import org.apache.maven.plugins.github.GitHubIssueManagementSystem;
+import org.apache.maven.plugins.issues.Issue;
+import org.apache.maven.plugins.issues.IssueManagementSystem;
+import org.apache.maven.plugins.issues.IssueUtils;
+import org.apache.maven.plugins.jira.AbstractJiraDownloader;
+import org.apache.maven.plugins.jira.AdaptiveJiraDownloader;
+import org.apache.maven.plugins.jira.JIRAIssueManagmentSystem;
+import org.apache.maven.plugins.trac.TracDownloader;
+import org.apache.maven.plugins.trac.TracIssueManagmentSystem;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.velocity.Template;
@@ -93,7 +93,7 @@ public class AnnouncementMojo
* @since 2.1
*/
@Parameter
- private Map announceParameters;
+ private Map<Object, Object> announceParameters;
/**
*/
@@ -193,7 +193,7 @@ public class AnnouncementMojo
* </p>
*/
// CHECKSTYLE_OFF: LineLength
- @Parameter( property = "changes.templateDirectory", defaultValue = "org/apache/maven/plugin/announcement", required = true )
+ @Parameter( property = "changes.templateDirectory", defaultValue = "org/apache/maven/plugins/announcement", required = true )
private String templateDirectory;
// CHECKSTYLE_ON: LineLength
@@ -268,8 +268,8 @@ public class AnnouncementMojo
* @deprecated Since version 2.4 this parameter has been deprecated. Please use the issueManagementSystems parameter
* instead.
*/
- @Parameter( property = "generateJiraAnnouncement", defaultValue = "false", required = true )
- private boolean generateJiraAnnouncement;
+ @Parameter( property = "generateJiraAnnouncement" )
+ private Boolean generateJiraAnnouncement;
/**
* If releases from JIRA should be merged with the releases from a changes.xml file.
@@ -278,8 +278,8 @@ public class AnnouncementMojo
* @deprecated Since version 2.4 this parameter has been deprecated. Please use the issueManagementSystems parameter
* instead.
*/
- @Parameter( property = "changes.jiraMerge", defaultValue = "false" )
- private boolean jiraMerge;
+ @Parameter( property = "changes.jiraMerge" )
+ private Boolean jiraMerge;
/**
* Defines the JIRA password for authentication into a private JIRA installation.
@@ -463,17 +463,16 @@ public class AnnouncementMojo
/**
* Generate the template
*
- * @throws MojoExecutionException
+ * @throws MojoExecutionException in case of errors
*/
public void execute()
throws MojoExecutionException
{
// Fail build fast if it is using deprecated parameters
- if ( outputDirectory != null )
- {
- throw new MojoExecutionException( "You are using the old parameter 'outputDirectory'. "
- + "You must use 'announcementDirectory' instead." );
- }
+ failIfUsingDeprecatedParameter( outputDirectory, "outputDirectory", "announcementDirectory" );
+ failIfUsingDeprecatedParameter( generateJiraAnnouncement, "generateJiraAnnouncement",
+ "issueManagementSystems " );
+ failIfUsingDeprecatedParameter( jiraMerge, "jiraMerge", "issueManagementSystems " );
// Run only at the execution root
if ( runOnlyAtExecutionRoot && !isThisTheExecutionRoot() )
@@ -487,22 +486,9 @@ public class AnnouncementMojo
issueManagementSystems = new ArrayList<String>();
}
- // Handle deprecated parameters, in a backward compatible way
if ( issueManagementSystems.isEmpty() )
{
- if ( this.jiraMerge )
- {
- issueManagementSystems.add( CHANGES_XML );
- issueManagementSystems.add( JIRA );
- }
- else if ( generateJiraAnnouncement )
- {
- issueManagementSystems.add( JIRA );
- }
- else
- {
- issueManagementSystems.add( CHANGES_XML );
- }
+ issueManagementSystems.add( CHANGES_XML );
}
// Fetch releases from the configured issue management systems
@@ -512,7 +498,7 @@ public class AnnouncementMojo
if ( getXmlPath().exists() )
{
ChangesXML changesXML = new ChangesXML( getXmlPath(), getLog() );
- List<Release> changesReleases = releaseUtils.convertReleaseList( changesXML.getReleaseList() );
+ List<Release> changesReleases = changesXML.getReleaseList();
releases = releaseUtils.mergeReleases( null, changesReleases );
getLog().info( "Including issues from file " + getXmlPath() + " in announcement..." );
}
@@ -592,11 +578,21 @@ public class AnnouncementMojo
}
}
+ private void failIfUsingDeprecatedParameter( Object value, String name, String replacement )
+ throws MojoExecutionException
+ {
+ if ( value != null )
+ {
+ throw new MojoExecutionException( "You are using the old parameter '" + name + "'. " + "You must use '"
+ + replacement + "' instead." );
+ }
+ }
+
/**
* Add the parameters to velocity context
*
* @param releases A <code>List</code> of <code>Release</code>s
- * @throws MojoExecutionException
+ * @throws MojoExecutionException in case of errors
*/
public void doGenerate( List<Release> releases )
throws MojoExecutionException
@@ -649,7 +645,7 @@ public class AnnouncementMojo
if ( announceParameters == null )
{
// empty Map to prevent NPE in velocity execution
- context.put( "announceParameters", Collections.EMPTY_MAP );
+ context.put( "announceParameters", Collections.emptyMap() );
}
else
{
@@ -675,7 +671,8 @@ public class AnnouncementMojo
* @param outputDirectory directory where the file will be generated
* @param template velocity template which will the context be merged
* @param announcementFile The file name of the generated announcement
- * @throws ResourceNotFoundException, VelocityException, IOException
+ * @throws VelocityException in case of errors.
+ * @throws MojoExecutionException in case of errors.
*/
public void processTemplate( Context context, File outputDirectory, String template, String announcementFile )
throws VelocityException, MojoExecutionException
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/MailSender.java (from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/MailSender.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/MailSender.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/MailSender.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/MailSender.java&r1=1781298&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/MailSender.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/MailSender.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.announcement;
+package org.apache.maven.plugins.announcement;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.announcement.mailsender;
+package org.apache.maven.plugins.announcement.mailsender;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesMojo.java (from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesMojo.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesMojo.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java&r1=1781298&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesMojo.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java (from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java&r1=1781298&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,14 +20,6 @@ package org.apache.maven.plugin.changes;
*/
import org.apache.commons.io.IOUtils;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.doxia.sink.render.RenderingContext;
import org.apache.maven.doxia.site.decoration.Body;
import org.apache.maven.doxia.site.decoration.DecorationModel;
@@ -40,9 +32,14 @@ import org.apache.maven.execution.MavenS
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.shared.artifact.DefaultArtifactCoordinate;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.ReaderFactory;
@@ -120,22 +117,11 @@ public abstract class AbstractChangesRep
protected MavenProject project;
/**
- * Local Repository.
- */
- @Parameter( property = "localRepository", required = true, readonly = true )
- protected ArtifactRepository localRepository;
-
- /**
*/
@Component
protected ArtifactResolver resolver;
/**
- */
- @Component
- protected ArtifactFactory factory;
-
- /**
* Internationalization.
*/
@Component
@@ -145,35 +131,20 @@ public abstract class AbstractChangesRep
throws MojoExecutionException
{
Skin skin = Skin.getDefaultSkin();
-
- String version = skin.getVersion();
- Artifact artifact;
+ DefaultArtifactCoordinate coordinate = new DefaultArtifactCoordinate();
+ coordinate.setGroupId( skin.getGroupId() );
+ coordinate.setArtifactId( skin.getArtifactId() );
+ coordinate.setVersion( skin.getVersion() );
+ ProjectBuildingRequest pbr = new DefaultProjectBuildingRequest( mavenSession.getProjectBuildingRequest() );
+ pbr.setRemoteRepositories( project.getRemoteArtifactRepositories() );
try
{
- if ( version == null )
- {
- version = Artifact.RELEASE_VERSION;
- }
- VersionRange versionSpec = VersionRange.createFromVersionSpec( version );
- artifact = factory.createDependencyArtifact( skin.getGroupId(), skin.getArtifactId(), versionSpec, "jar",
- null, null );
-
- resolver.resolve( artifact, project.getRemoteArtifactRepositories(), localRepository );
- }
- catch ( InvalidVersionSpecificationException e )
- {
- throw new MojoExecutionException( "The skin version '" + version + "' is not valid: " + e.getMessage() );
+ return resolver.resolveArtifact( pbr, coordinate ).getArtifact().getFile();
}
- catch ( ArtifactResolutionException e )
+ catch ( ArtifactResolverException e )
{
- throw new MojoExecutionException( "Unable to find skin", e );
+ throw new MojoExecutionException( "Couldn't resolve the skin.", e );
}
- catch ( ArtifactNotFoundException e )
- {
- throw new MojoExecutionException( "The skin does not exist: " + e.getMessage() );
- }
-
- return artifact.getFile();
}
public void execute()
@@ -200,7 +171,7 @@ public abstract class AbstractChangesRep
RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" );
SiteRendererSink sink = new SiteRendererSink( context );
- generate( sink, locale );
+ generate( sink, null, locale );
outputDirectory.mkdirs();
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java (from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java&r1=1781298&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -79,7 +79,7 @@ public class ChangesCheckMojo
/**
* Check that the latest release contains a valid release date.
*
- * @throws MojoExecutionException
+ * @throws MojoExecutionException in case of errors.
*/
public void execute()
throws MojoExecutionException
@@ -100,7 +100,7 @@ public class ChangesCheckMojo
ChangesXML xml = new ChangesXML( xmlPath, getLog() );
ReleaseUtils releaseUtils = new ReleaseUtils( getLog() );
Release release =
- releaseUtils.getLatestRelease( releaseUtils.convertReleaseList( xml.getReleaseList() ), version );
+ releaseUtils.getLatestRelease( xml.getReleaseList(), version );
if ( !isValidDate( release.getDateRelease(), releaseDateFormat, releaseDateLocale ) )
{
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java (from r1781298, 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/plugins/changes/ChangesMojo.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java&r1=1781298&r2=1784411&rev=1784411&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/plugins/changes/ChangesMojo.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -92,8 +92,8 @@ public class ChangesMojo
* @since 2.4
* @deprecated using markup inside CDATA sections does not work for all output formats!
*/
- @Parameter( defaultValue = "true" )
- private boolean escapeHTML;
+ @Parameter
+ private Boolean escapeHTML;
/**
* The directory for interpolated changes.xml.
@@ -122,9 +122,9 @@ public class ChangesMojo
* </p>
*
* @since 2.0-beta-2
- * @deprecated As of 2.1 use issueLinkTemplatePerSystem : this one will be with system default
+ * @deprecated As of 2.1 use issueLinkTemplatePerSystem: this one will be with system default
*/
- @Parameter( property = "changes.issueLinkTemplate", defaultValue = "%URL%/ViewIssue.jspa?key=%ISSUE%" )
+ @Parameter( property = "changes.issueLinkTemplate" )
private String issueLinkTemplate;
/**
@@ -242,6 +242,11 @@ public class ChangesMojo
public void executeReport( Locale locale )
throws MavenReportException
{
+ failIfUsingDeprecatedParameter( escapeHTML, "escapeHTML",
+ "Using markup inside CDATA sections does not work for all output formats!" );
+ failIfUsingDeprecatedParameter( issueLinkTemplate, "issueLinkTemplate",
+ "You must use 'issueLinkTemplatePerSystem' for the system '"
+ + ChangesReportGenerator.DEFAULT_ISSUE_SYSTEM_KEY + "' instead." );
Date now = new Date();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat( publishDateFormat, new Locale( publishDateLocale ) );
Properties additionalProperties = new Properties();
@@ -284,7 +289,7 @@ public class ChangesMojo
report.setAuthor( changesXml.getAuthor() );
report.setTitle( changesXml.getTitle() );
- report.setEscapeHTML( escapeHTML );
+ report.setEscapeHTML( true );
// Create a case insensitive version of issueLinkTemplatePerSystem
// We need something case insensitive to maintain backward compatibility
@@ -297,9 +302,8 @@ public class ChangesMojo
caseInsensitiveIssueLinkTemplatePerSystem = new CaseInsensitiveMap( issueLinkTemplatePerSystem );
}
- // Set good default values for issue management systems here, but only
- // if they have not been configured already by the user
- addIssueLinkTemplate( ChangesReportGenerator.DEFAULT_ISSUE_SYSTEM_KEY, issueLinkTemplate );
+ // Set good default values for issue management systems here
+ addIssueLinkTemplate( ChangesReportGenerator.DEFAULT_ISSUE_SYSTEM_KEY, "%URL%/ViewIssue.jspa?key=%ISSUE%" );
addIssueLinkTemplate( "Bitbucket", "%URL%/issue/%ISSUE%" );
addIssueLinkTemplate( "Bugzilla", "%URL%/show_bug.cgi?id=%ISSUE%" );
addIssueLinkTemplate( "GitHub", "%URL%/%ISSUE%" );
@@ -350,6 +354,15 @@ public class ChangesMojo
copyStaticResources();
}
+ private void failIfUsingDeprecatedParameter( Object value, String name, String message )
+ throws MavenReportException
+ {
+ if ( value != null )
+ {
+ throw new MavenReportException( "You are using the old parameter '" + name + "'. " + message );
+ }
+ }
+
public String getDescription( Locale locale )
{
return getBundle( locale ).getString( "report.issues.description" );
@@ -451,7 +464,7 @@ public class ChangesMojo
private void copyStaticResources()
throws MavenReportException
{
- final String pluginResourcesBase = "org/apache/maven/plugin/changes";
+ final String pluginResourcesBase = "org/apache/maven/plugins/changes";
String resourceNames[] = { "images/add.gif", "images/fix.gif", "images/icon_help_sml.gif", "images/remove.gif",
"images/rss.png", "images/update.gif" };
try
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java (from r1781298, 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/plugins/changes/ChangesReportGenerator.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java&r1=1781298&r2=1784411&rev=1784411&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/plugins/changes/ChangesReportGenerator.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -32,12 +32,12 @@ import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.util.HtmlTools;
-import org.apache.maven.plugin.issues.AbstractIssuesReportGenerator;
import org.apache.maven.plugins.changes.model.Action;
import org.apache.maven.plugins.changes.model.Component;
import org.apache.maven.plugins.changes.model.DueTo;
import org.apache.maven.plugins.changes.model.FixedIssue;
import org.apache.maven.plugins.changes.model.Release;
+import org.apache.maven.plugins.issues.AbstractIssuesReportGenerator;
/**
* Generates a changes report.
@@ -100,33 +100,21 @@ public class ChangesReportGenerator
this.releaseList = releaseList;
}
- /**
- * @since 2.4
- */
public boolean isEscapeHTML()
{
return escapeHTML;
}
- /**
- * @since 2.4
- */
public void setEscapeHTML( boolean escapeHTML )
{
this.escapeHTML = escapeHTML;
}
- /**
- * @since 2.4
- */
public String getSystem()
{
return system;
}
- /**
- * @since 2.4
- */
public void setSystem( String system )
{
this.system = system;
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesValidatorMojo.java (from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesValidatorMojo.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesValidatorMojo.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java&r1=1781298&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesValidatorMojo.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,12 +24,12 @@ import java.util.List;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.changes.schema.ChangesSchemaValidator;
-import org.apache.maven.plugin.changes.schema.SchemaValidatorException;
-import org.apache.maven.plugin.changes.schema.XmlValidationHandler;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.changes.schema.ChangesSchemaValidator;
+import org.apache.maven.plugins.changes.schema.SchemaValidatorException;
+import org.apache.maven.plugins.changes.schema.XmlValidationHandler;
import org.xml.sax.SAXParseException;
/**
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXML.java (from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXML.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXML.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java&r1=1781298&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXML.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXMLRuntimeException.java (from r1784410, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXMLRuntimeException.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXMLRuntimeException.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXMLRuntimeException.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXMLRuntimeException.java&r1=1784410&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXMLRuntimeException.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXMLRuntimeException.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package org.apache.maven.plugin.changes;
/**
* This is a runtime exception class that is thrown by the
- * {@link ChangesXML#ChangesXML(java.io.File, org.apache.maven.plugin.logging.Log)} constructor if the given changes.xml
- * file cannot be parsed, for example it is not well-formed or valid.
+ * {@link ChangesXML#ChangesXML(java.io.File, org.apache.maven.plugin.logging.Log)} constructor if the given
+ * changes.xml file cannot be parsed, for example it is not well-formed or valid.
*
* @author <a href="mailto:szgabsz91@gmail.com">Gabor Szabo</a>
*/
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java (from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/FeedGenerator.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/FeedGenerator.java&r1=1781298&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/FeedGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java (from r1781298, 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/plugins/changes/IssueAdapter.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java&r1=1781298&r2=1784411&rev=1784411&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/plugins/changes/IssueAdapter.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,10 +19,10 @@ package org.apache.maven.plugin.changes;
* under the License.
*/
-import org.apache.maven.plugin.issues.Issue;
-import org.apache.maven.plugin.issues.IssueManagementSystem;
import org.apache.maven.plugins.changes.model.Action;
import org.apache.maven.plugins.changes.model.Release;
+import org.apache.maven.plugins.issues.Issue;
+import org.apache.maven.plugins.issues.IssueManagementSystem;
import java.util.ArrayList;
import java.util.HashMap;
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/IssueType.java (from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueType.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/IssueType.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/IssueType.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueType.java&r1=1781298&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueType.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/IssueType.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ProjectUtils.java (from r1781298, maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ProjectUtils.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ProjectUtils.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ProjectUtils.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ProjectUtils.java&r1=1781298&r2=1784411&rev=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ProjectUtils.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ProjectUtils.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java (from r1781298, 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/plugins/changes/ReleaseUtils.java?p2=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java&p1=maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java&r1=1781298&r2=1784411&rev=1784411&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/plugins/changes/ReleaseUtils.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes;
+package org.apache.maven.plugins.changes;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -177,27 +177,6 @@ public class ReleaseUtils
}
/**
- * Convert an untyped List of Release objects that comes from changes.xml into a typed List of Release objects.
- *
- * @param changesReleases An untyped List of Release objects
- * @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<Release> 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 )
- {
- Release release = (Release) changesRelease;
- releases.add( release );
- }
- return releases;
- }
-
- /**
* Merge releases from parent component with releases from child component. If a release is found in both
* components, i.e. they have the same version, their issues are merged into one (parent) release with component
* marker for component issues.
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/ChangesSchemaValidator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/ChangesSchemaValidator.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/ChangesSchemaValidator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/ChangesSchemaValidator.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes.schema;
+package org.apache.maven.plugins.changes.schema;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,11 +29,11 @@ import java.io.File;
public interface ChangesSchemaValidator
{
/**
- * @param file
- * @param schemaVersion
+ * @param file File to validate.
+ * @param schemaVersion Schema version.
* @param failOnValidationError if false SchemaValidatorException will not be throw
* @return {@link XmlValidationHandler}
- * @throws SchemaValidatorException
+ * @throws SchemaValidatorException if validation failed.
*/
XmlValidationHandler validateXmlWithSchema( File file, String schemaVersion, boolean failOnValidationError )
throws SchemaValidatorException;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes.schema;
+package org.apache.maven.plugins.changes.schema;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -32,17 +32,16 @@ import javax.xml.validation.SchemaFactor
import javax.xml.validation.Validator;
import org.apache.commons.io.input.XmlStreamReader;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.IOUtil;
import org.xml.sax.SAXException;
/**
- *
* @author Olivier Lamy
* @since 28 juil. 2008
* @version $Id$
- *
- * @plexus.component role="org.apache.maven.plugin.changes.schema.ChangesSchemaValidator" role-hint="default"
*/
+@Component( role = ChangesSchemaValidator.class, hint = "default" )
public class DefaultChangesSchemaValidator
implements ChangesSchemaValidator
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/SchemaValidatorException.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/SchemaValidatorException.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/SchemaValidatorException.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/SchemaValidatorException.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes.schema;
+package org.apache.maven.plugins.changes.schema;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -34,8 +34,8 @@ public class SchemaValidatorException
private static final long serialVersionUID = -8265574906534248274L;
/**
- * @param message
- * @param cause
+ * @param message Message.
+ * @param cause Cause.
*/
public SchemaValidatorException( String message, Throwable cause )
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.changes.schema;
+package org.apache.maven.plugins.changes.schema;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -47,7 +47,7 @@ public class XmlValidationHandler
private boolean failOnValidationError;
/**
- * see name
+ * @param failOnValidationError If fail on validation error.
*/
public XmlValidationHandler( boolean failOnValidationError )
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.github;
+package org.apache.maven.plugins.github;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.maven.plugin.github;
* under the License.
*/
-import org.apache.maven.plugin.issues.Issue;
import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugins.issues.Issue;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubIssueManagementSystem.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubIssueManagementSystem.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubIssueManagementSystem.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubIssueManagementSystem.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.github;
+package org.apache.maven.plugins.github;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.maven.plugin.github;
* under the License.
*/
-import org.apache.maven.plugin.changes.IssueType;
-import org.apache.maven.plugin.issues.AbstractIssueManagementSystem;
+import org.apache.maven.plugins.changes.IssueType;
+import org.apache.maven.plugins.issues.AbstractIssueManagementSystem;
/**
* @since 2.8
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.github;
+package org.apache.maven.plugins.github;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,14 +26,14 @@ import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
-import org.apache.maven.plugin.changes.AbstractChangesReport;
-import org.apache.maven.plugin.changes.ProjectUtils;
-import org.apache.maven.plugin.issues.Issue;
-import org.apache.maven.plugin.issues.IssueUtils;
-import org.apache.maven.plugin.issues.IssuesReportGenerator;
-import org.apache.maven.plugin.issues.IssuesReportHelper;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.changes.AbstractChangesReport;
+import org.apache.maven.plugins.changes.ProjectUtils;
+import org.apache.maven.plugins.issues.Issue;
+import org.apache.maven.plugins.issues.IssueUtils;
+import org.apache.maven.plugins.issues.IssuesReportGenerator;
+import org.apache.maven.plugins.issues.IssuesReportHelper;
import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.settings.Settings;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.issues;
+package org.apache.maven.plugins.issues;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,14 +23,14 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.changes.IssueType;
+import org.apache.maven.plugins.changes.IssueType;
/**
* Historically, this plugin started out working against an IMS-neutral XML file, and then added extensive support for
* JIRA with some small snippets of code for other issue management systems. This class is intended to start a cleaner
* modularity for support of multiple systems.<br>
* Initially, all it provides is a structure for mapping from per-IMS issue types to the three categories defined in
- * {@link org.apache.maven.plugin.changes.IssueAdapter}. <br/>
+ * {@link org.apache.maven.plugins.changes.IssueAdapter}. <br>
* Note that the map in here is <strong>not</strong> immutable. It contains the default configuration for an IMS. Users
* are expected to add entries to the map via configuration to reflect their customizations.
*
@@ -48,7 +48,7 @@ public abstract class AbstractIssueManag
/*
* (non-Javadoc)
- * @see org.apache.maven.plugin.issues.IssueManagementSystem#getIssueTypeMap()
+ * @see org.apache.maven.plugins.issues.IssueManagementSystem#getIssueTypeMap()
*/
public Map<String, IssueType> getIssueTypeMap()
{
@@ -57,13 +57,13 @@ public abstract class AbstractIssueManag
/*
* (non-Javadoc)
- * @see org.apache.maven.plugin.issues.IssueManagementSystem#getName()
+ * @see org.apache.maven.plugins.issues.IssueManagementSystem#getName()
*/
public abstract String getName();
/*
* (non-Javadoc)
- * @see org.apache.maven.plugin.issues.IssueManagementSystem#applyConfiguration(java.util.Map)
+ * @see org.apache.maven.plugins.issues.IssueManagementSystem#applyConfiguration(java.util.Map)
*/
public void applyConfiguration( Map<String, String> issueTypes )
throws MojoExecutionException
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.issues;
+package org.apache.maven.plugins.issues;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/Issue.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/Issue.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/Issue.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/Issue.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.issues;
+package org.apache.maven.plugins.issues;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssueManagementSystem.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssueManagementSystem.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssueManagementSystem.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssueManagementSystem.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.issues;
+package org.apache.maven.plugins.issues;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,11 +22,11 @@ package org.apache.maven.plugin.issues;
import java.util.Map;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.changes.IssueType;
+import org.apache.maven.plugins.changes.IssueType;
/**
* An interface for issue management systems.
- * <p/>
+ * <p>
* The plan is to enhance this interface to allow communication with different issue management systems in a consistent
* way.
*
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.issues;
+package org.apache.maven.plugins.issues;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssuesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssuesReportGenerator.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssuesReportGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssuesReportGenerator.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.issues;
+package org.apache.maven.plugins.issues;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.issues;
+package org.apache.maven.plugins.issues;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/AbstractJiraDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/AbstractJiraDownloader.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/AbstractJiraDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/AbstractJiraDownloader.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.jira;
+package org.apache.maven.plugins.jira;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,13 +20,14 @@ package org.apache.maven.plugin.jira;
*/
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.plugins.issues.Issue;
+import org.apache.maven.plugins.issues.IssueUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.proxy.ProxyUtils;
import java.io.File;
import java.net.MalformedURLException;
@@ -180,11 +181,7 @@ public abstract class AbstractJiraDownlo
jiraHost = url.getHost();
}
- // Validation of proxy method copied from org.apache.maven.wagon.proxy.ProxyUtils.
- // @todo Can use original when maven-changes-plugin requires a more recent version of Maven
-
- // if ( ProxyUtils.validateNonProxyHosts( proxyInfo, jiraHost ) )
- if ( JiraHelper.validateNonProxyHosts( proxyInfo, jiraHost ) )
+ if ( ProxyUtils.validateNonProxyHosts( proxyInfo, jiraHost ) )
{
return;
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/AdaptiveJiraDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/AdaptiveJiraDownloader.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/AdaptiveJiraDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/AdaptiveJiraDownloader.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.jira;
+package org.apache.maven.plugins.jira;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@ package org.apache.maven.plugin.jira;
*/
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.issues.Issue;
+import org.apache.maven.plugins.issues.Issue;
import java.util.List;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/ClassicJiraDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/ClassicJiraDownloader.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/ClassicJiraDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/ClassicJiraDownloader.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.jira;
+package org.apache.maven.plugins.jira;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -33,7 +33,7 @@ import org.apache.commons.httpclient.coo
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.params.HttpClientParams;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.issues.Issue;
+import org.apache.maven.plugins.issues.Issue;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JIRAIssueManagmentSystem.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JIRAIssueManagmentSystem.java?rev=1784411&r1=1784410&r2=1784411&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JIRAIssueManagmentSystem.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JIRAIssueManagmentSystem.java Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.jira;
+package org.apache.maven.plugins.jira;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.maven.plugin.jira;
* under the License.
*/
-import org.apache.maven.plugin.changes.IssueType;
-import org.apache.maven.plugin.issues.AbstractIssueManagementSystem;
+import org.apache.maven.plugins.changes.IssueType;
+import org.apache.maven.plugins.issues.AbstractIssueManagementSystem;
/**
* The JIRA issue management system.