This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git
The following commit(s) were added to refs/heads/master by this push: new f2c2c42 [MCHANGES-391] Change package from o.a.m.plugins.* to o.a.m.plugins.changes.* f2c2c42 is described below commit f2c2c42974a657acba75df188ac69bd110ee097c Author: Slawomir Jaranowski <s.jaranow...@gmail.com> AuthorDate: Tue Nov 26 21:21:39 2024 +0100 [MCHANGES-391] Change package from o.a.m.plugins.* to o.a.m.plugins.changes.* --- .../plugins/changes/ChangesReportGenerator.java | 2 +- .../apache/maven/plugins/changes/IssueAdapter.java | 4 ++-- .../announcement/AbstractAnnouncementMojo.java | 2 +- .../announcement/AnnouncementMailMojo.java | 4 ++-- .../announcement/AnnouncementMojo.java | 22 +++++++++++----------- .../{ => changes}/announcement/MailSender.java | 2 +- .../mailsender/ProjectJavamailMailSender.java | 2 +- .../{ => changes}/github/GitHubDownloader.java | 4 ++-- .../github/GitHubIssueManagementSystem.java | 4 ++-- .../plugins/{ => changes}/github/GitHubReport.java | 10 +++++----- .../issues/AbstractIssueManagementSystem.java | 2 +- .../issues/AbstractIssuesReportGenerator.java | 2 +- .../maven/plugins/{ => changes}/issues/Issue.java | 2 +- .../issues/IssueManagementSystem.java | 2 +- .../plugins/{ => changes}/issues/IssueUtils.java | 2 +- .../issues/IssuesReportGenerator.java | 2 +- .../{ => changes}/issues/IssuesReportHelper.java | 2 +- .../jira/JIRAIssueManagmentSystem.java | 4 ++-- .../plugins/{ => changes}/jira/JiraHelper.java | 2 +- .../plugins/{ => changes}/jira/JiraReport.java | 10 +++++----- .../{ => changes}/jira/JqlQueryBuilder.java | 2 +- .../{ => changes}/jira/RestJiraDownloader.java | 6 +++--- .../plugins/{ => changes}/jira/UrlBuilder.java | 2 +- .../plugins/{ => changes}/trac/TracDownloader.java | 4 ++-- .../trac/TracIssueManagmentSystem.java | 4 ++-- .../plugins/{ => changes}/trac/TracReport.java | 8 ++++---- .../{ => changes}/announcement/announcement.vm | 0 .../maven/plugins/changes/IssueAdapterTest.java | 6 +++--- .../announcement/AnnouncementMojoTest.java | 4 ++-- .../github/GitHubDownloaderTestCase.java | 4 ++-- .../issues/IssueManagementSystemTest.java | 2 +- .../{ => changes}/issues/IssueTestCase.java | 2 +- .../{ => changes}/issues/IssueUtilsTestCase.java | 2 +- .../{ => changes}/jira/JiraHelperTestCase.java | 2 +- .../plugins/{ => changes}/jira/JiraReportTest.java | 2 +- .../{ => changes}/jira/JiraUnicodeTestCase.java | 4 ++-- .../jira/JiraUnicodeTestProjectStub.java | 2 +- .../jira/JqlQueryBuilderTestCase.java | 2 +- .../{ => changes}/jira/UrlBuilderTestCase.java | 2 +- 39 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java b/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java index 4deefd2..29f181c 100644 --- a/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java +++ b/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java @@ -29,11 +29,11 @@ import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkEventAttributes; import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.doxia.util.DoxiaUtils; +import org.apache.maven.plugins.changes.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.Release; -import org.apache.maven.plugins.issues.AbstractIssuesReportGenerator; /** * Generates a changes report. diff --git a/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java b/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java index 34923a9..b7a015e 100644 --- a/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java +++ b/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java @@ -24,10 +24,10 @@ import java.util.List; import java.util.Map; import org.apache.maven.artifact.versioning.ComparableVersion; +import org.apache.maven.plugins.changes.issues.Issue; +import org.apache.maven.plugins.changes.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; /** * An adapter that can adapt data models from other issue management system to the data models used in the changes.xml diff --git a/src/main/java/org/apache/maven/plugins/announcement/AbstractAnnouncementMojo.java b/src/main/java/org/apache/maven/plugins/changes/announcement/AbstractAnnouncementMojo.java similarity index 96% rename from src/main/java/org/apache/maven/plugins/announcement/AbstractAnnouncementMojo.java rename to src/main/java/org/apache/maven/plugins/changes/announcement/AbstractAnnouncementMojo.java index 0427f81..d629d0f 100644 --- a/src/main/java/org/apache/maven/plugins/announcement/AbstractAnnouncementMojo.java +++ b/src/main/java/org/apache/maven/plugins/changes/announcement/AbstractAnnouncementMojo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.announcement; +package org.apache.maven.plugins.changes.announcement; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.changes.AbstractChangesMojo; diff --git a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java b/src/main/java/org/apache/maven/plugins/changes/announcement/AnnouncementMailMojo.java similarity index 99% rename from src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java rename to src/main/java/org/apache/maven/plugins/changes/announcement/AnnouncementMailMojo.java index 21b15dc..1f37e2d 100644 --- a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java +++ b/src/main/java/org/apache/maven/plugins/changes/announcement/AnnouncementMailMojo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.announcement; +package org.apache.maven.plugins.changes.announcement; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; @@ -35,7 +35,7 @@ import org.apache.maven.plugin.MojoExecutionException; 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.plugins.changes.announcement.mailsender.ProjectJavamailMailSender; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; diff --git a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java b/src/main/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojo.java similarity index 97% rename from src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java rename to src/main/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojo.java index aa3f356..3527d52 100644 --- a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java +++ b/src/main/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.announcement; +package org.apache.maven.plugins.changes.announcement; import javax.inject.Inject; @@ -38,16 +38,16 @@ 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.github.GitHubDownloader; +import org.apache.maven.plugins.changes.github.GitHubIssueManagementSystem; +import org.apache.maven.plugins.changes.issues.Issue; +import org.apache.maven.plugins.changes.issues.IssueManagementSystem; +import org.apache.maven.plugins.changes.issues.IssueUtils; +import org.apache.maven.plugins.changes.jira.JIRAIssueManagmentSystem; +import org.apache.maven.plugins.changes.jira.RestJiraDownloader; 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.JIRAIssueManagmentSystem; -import org.apache.maven.plugins.jira.RestJiraDownloader; -import org.apache.maven.plugins.trac.TracDownloader; -import org.apache.maven.plugins.trac.TracIssueManagmentSystem; +import org.apache.maven.plugins.changes.trac.TracDownloader; +import org.apache.maven.plugins.changes.trac.TracIssueManagmentSystem; import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Settings; import org.apache.maven.settings.crypto.SettingsDecrypter; @@ -193,7 +193,7 @@ public class AnnouncementMojo extends AbstractAnnouncementMojo { // CHECKSTYLE_OFF: LineLength @Parameter( property = "changes.templateDirectory", - defaultValue = "org/apache/maven/plugins/announcement", + defaultValue = "org/apache/maven/plugins/changes/announcement", required = true) private String templateDirectory; // CHECKSTYLE_ON: LineLength diff --git a/src/main/java/org/apache/maven/plugins/announcement/MailSender.java b/src/main/java/org/apache/maven/plugins/changes/announcement/MailSender.java similarity index 96% rename from src/main/java/org/apache/maven/plugins/announcement/MailSender.java rename to src/main/java/org/apache/maven/plugins/changes/announcement/MailSender.java index 6e25d9f..470ada7 100644 --- a/src/main/java/org/apache/maven/plugins/announcement/MailSender.java +++ b/src/main/java/org/apache/maven/plugins/changes/announcement/MailSender.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.announcement; +package org.apache.maven.plugins.changes.announcement; /** * Defines the sender of the announcement if the list of developer is empty or if the sender is not a member of the diff --git a/src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java b/src/main/java/org/apache/maven/plugins/changes/announcement/mailsender/ProjectJavamailMailSender.java similarity index 98% rename from src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java rename to src/main/java/org/apache/maven/plugins/changes/announcement/mailsender/ProjectJavamailMailSender.java index c5ab8ef..99a137e 100644 --- a/src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java +++ b/src/main/java/org/apache/maven/plugins/changes/announcement/mailsender/ProjectJavamailMailSender.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.announcement.mailsender; +package org.apache.maven.plugins.changes.announcement.mailsender; import javax.mail.Authenticator; import javax.mail.Message; diff --git a/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java b/src/main/java/org/apache/maven/plugins/changes/github/GitHubDownloader.java similarity index 98% rename from src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java rename to src/main/java/org/apache/maven/plugins/changes/github/GitHubDownloader.java index 5c0fa03..a18415b 100644 --- a/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java +++ b/src/main/java/org/apache/maven/plugins/changes/github/GitHubDownloader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.github; +package org.apache.maven.plugins.changes.github; import java.io.IOException; import java.net.MalformedURLException; @@ -26,7 +26,7 @@ import java.util.Collection; import java.util.List; import org.apache.maven.plugin.logging.Log; -import org.apache.maven.plugins.issues.Issue; +import org.apache.maven.plugins.changes.issues.Issue; import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Server; import org.apache.maven.settings.Settings; diff --git a/src/main/java/org/apache/maven/plugins/github/GitHubIssueManagementSystem.java b/src/main/java/org/apache/maven/plugins/changes/github/GitHubIssueManagementSystem.java similarity index 91% rename from src/main/java/org/apache/maven/plugins/github/GitHubIssueManagementSystem.java rename to src/main/java/org/apache/maven/plugins/changes/github/GitHubIssueManagementSystem.java index 9ae6b7a..8a3d92f 100644 --- a/src/main/java/org/apache/maven/plugins/github/GitHubIssueManagementSystem.java +++ b/src/main/java/org/apache/maven/plugins/changes/github/GitHubIssueManagementSystem.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.github; +package org.apache.maven.plugins.changes.github; import org.apache.maven.plugins.changes.IssueType; -import org.apache.maven.plugins.issues.AbstractIssueManagementSystem; +import org.apache.maven.plugins.changes.issues.AbstractIssueManagementSystem; /** * @since 2.8 diff --git a/src/main/java/org/apache/maven/plugins/github/GitHubReport.java b/src/main/java/org/apache/maven/plugins/changes/github/GitHubReport.java similarity index 96% rename from src/main/java/org/apache/maven/plugins/github/GitHubReport.java rename to src/main/java/org/apache/maven/plugins/changes/github/GitHubReport.java index cf6fe9e..cf467c4 100644 --- a/src/main/java/org/apache/maven/plugins/github/GitHubReport.java +++ b/src/main/java/org/apache/maven/plugins/changes/github/GitHubReport.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.github; +package org.apache.maven.plugins.changes.github; import javax.inject.Inject; @@ -31,10 +31,10 @@ 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.plugins.changes.issues.Issue; +import org.apache.maven.plugins.changes.issues.IssueUtils; +import org.apache.maven.plugins.changes.issues.IssuesReportGenerator; +import org.apache.maven.plugins.changes.issues.IssuesReportHelper; import org.apache.maven.reporting.MavenReportException; import org.apache.maven.settings.Settings; import org.apache.maven.settings.crypto.SettingsDecrypter; diff --git a/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java b/src/main/java/org/apache/maven/plugins/changes/issues/AbstractIssueManagementSystem.java similarity index 98% rename from src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java rename to src/main/java/org/apache/maven/plugins/changes/issues/AbstractIssueManagementSystem.java index 631388b..1d79610 100644 --- a/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java +++ b/src/main/java/org/apache/maven/plugins/changes/issues/AbstractIssueManagementSystem.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.issues; +package org.apache.maven.plugins.changes.issues; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java b/src/main/java/org/apache/maven/plugins/changes/issues/AbstractIssuesReportGenerator.java similarity index 98% rename from src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java rename to src/main/java/org/apache/maven/plugins/changes/issues/AbstractIssuesReportGenerator.java index abd1e0a..e886e62 100644 --- a/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java +++ b/src/main/java/org/apache/maven/plugins/changes/issues/AbstractIssuesReportGenerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.issues; +package org.apache.maven.plugins.changes.issues; import java.util.ResourceBundle; diff --git a/src/main/java/org/apache/maven/plugins/issues/Issue.java b/src/main/java/org/apache/maven/plugins/changes/issues/Issue.java similarity index 98% rename from src/main/java/org/apache/maven/plugins/issues/Issue.java rename to src/main/java/org/apache/maven/plugins/changes/issues/Issue.java index 0ba003f..dcfa3c6 100644 --- a/src/main/java/org/apache/maven/plugins/issues/Issue.java +++ b/src/main/java/org/apache/maven/plugins/changes/issues/Issue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.issues; +package org.apache.maven.plugins.changes.issues; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/org/apache/maven/plugins/issues/IssueManagementSystem.java b/src/main/java/org/apache/maven/plugins/changes/issues/IssueManagementSystem.java similarity index 97% rename from src/main/java/org/apache/maven/plugins/issues/IssueManagementSystem.java rename to src/main/java/org/apache/maven/plugins/changes/issues/IssueManagementSystem.java index 58c282c..b9bb125 100644 --- a/src/main/java/org/apache/maven/plugins/issues/IssueManagementSystem.java +++ b/src/main/java/org/apache/maven/plugins/changes/issues/IssueManagementSystem.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.issues; +package org.apache.maven.plugins.changes.issues; import java.util.Map; diff --git a/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java b/src/main/java/org/apache/maven/plugins/changes/issues/IssueUtils.java similarity index 98% rename from src/main/java/org/apache/maven/plugins/issues/IssueUtils.java rename to src/main/java/org/apache/maven/plugins/changes/issues/IssueUtils.java index f7396a5..4f26732 100644 --- a/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java +++ b/src/main/java/org/apache/maven/plugins/changes/issues/IssueUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.issues; +package org.apache.maven.plugins.changes.issues; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/apache/maven/plugins/issues/IssuesReportGenerator.java b/src/main/java/org/apache/maven/plugins/changes/issues/IssuesReportGenerator.java similarity index 99% rename from src/main/java/org/apache/maven/plugins/issues/IssuesReportGenerator.java rename to src/main/java/org/apache/maven/plugins/changes/issues/IssuesReportGenerator.java index 8a1abb6..565c70f 100644 --- a/src/main/java/org/apache/maven/plugins/issues/IssuesReportGenerator.java +++ b/src/main/java/org/apache/maven/plugins/changes/issues/IssuesReportGenerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.issues; +package org.apache.maven.plugins.changes.issues; import java.text.DateFormat; import java.util.List; diff --git a/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java b/src/main/java/org/apache/maven/plugins/changes/issues/IssuesReportHelper.java similarity index 99% rename from src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java rename to src/main/java/org/apache/maven/plugins/changes/issues/IssuesReportHelper.java index d376974..218f5b3 100644 --- a/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java +++ b/src/main/java/org/apache/maven/plugins/changes/issues/IssuesReportHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.issues; +package org.apache.maven.plugins.changes.issues; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/org/apache/maven/plugins/jira/JIRAIssueManagmentSystem.java b/src/main/java/org/apache/maven/plugins/changes/jira/JIRAIssueManagmentSystem.java similarity index 92% rename from src/main/java/org/apache/maven/plugins/jira/JIRAIssueManagmentSystem.java rename to src/main/java/org/apache/maven/plugins/changes/jira/JIRAIssueManagmentSystem.java index 2fe841b..18467a2 100644 --- a/src/main/java/org/apache/maven/plugins/jira/JIRAIssueManagmentSystem.java +++ b/src/main/java/org/apache/maven/plugins/changes/jira/JIRAIssueManagmentSystem.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; import org.apache.maven.plugins.changes.IssueType; -import org.apache.maven.plugins.issues.AbstractIssueManagementSystem; +import org.apache.maven.plugins.changes.issues.AbstractIssueManagementSystem; /** * The JIRA issue management system. diff --git a/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java b/src/main/java/org/apache/maven/plugins/changes/jira/JiraHelper.java similarity index 99% rename from src/main/java/org/apache/maven/plugins/jira/JiraHelper.java rename to src/main/java/org/apache/maven/plugins/changes/jira/JiraHelper.java index 2b617c8..74ec646 100644 --- a/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java +++ b/src/main/java/org/apache/maven/plugins/changes/jira/JiraHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; import java.io.IOException; import java.text.NumberFormat; diff --git a/src/main/java/org/apache/maven/plugins/jira/JiraReport.java b/src/main/java/org/apache/maven/plugins/changes/jira/JiraReport.java similarity index 98% rename from src/main/java/org/apache/maven/plugins/jira/JiraReport.java rename to src/main/java/org/apache/maven/plugins/changes/jira/JiraReport.java index f67bdd6..c14f27a 100644 --- a/src/main/java/org/apache/maven/plugins/jira/JiraReport.java +++ b/src/main/java/org/apache/maven/plugins/changes/jira/JiraReport.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; import javax.inject.Inject; @@ -31,10 +31,10 @@ 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.plugins.changes.issues.Issue; +import org.apache.maven.plugins.changes.issues.IssueUtils; +import org.apache.maven.plugins.changes.issues.IssuesReportGenerator; +import org.apache.maven.plugins.changes.issues.IssuesReportHelper; import org.apache.maven.reporting.MavenReportException; import org.apache.maven.settings.Settings; import org.apache.maven.settings.crypto.SettingsDecrypter; diff --git a/src/main/java/org/apache/maven/plugins/jira/JqlQueryBuilder.java b/src/main/java/org/apache/maven/plugins/changes/jira/JqlQueryBuilder.java similarity index 99% rename from src/main/java/org/apache/maven/plugins/jira/JqlQueryBuilder.java rename to src/main/java/org/apache/maven/plugins/changes/jira/JqlQueryBuilder.java index f2eb3bc..6c2717e 100644 --- a/src/main/java/org/apache/maven/plugins/jira/JqlQueryBuilder.java +++ b/src/main/java/org/apache/maven/plugins/changes/jira/JqlQueryBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java b/src/main/java/org/apache/maven/plugins/changes/jira/RestJiraDownloader.java similarity index 99% rename from src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java rename to src/main/java/org/apache/maven/plugins/changes/jira/RestJiraDownloader.java index abcda41..2ab4df5 100644 --- a/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java +++ b/src/main/java/org/apache/maven/plugins/changes/jira/RestJiraDownloader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; import java.io.IOException; import java.io.InputStream; @@ -58,8 +58,8 @@ import org.apache.http.message.BasicHeader; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; 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.plugins.changes.issues.Issue; +import org.apache.maven.plugins.changes.issues.IssueUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Proxy; import org.apache.maven.settings.Server; diff --git a/src/main/java/org/apache/maven/plugins/jira/UrlBuilder.java b/src/main/java/org/apache/maven/plugins/changes/jira/UrlBuilder.java similarity index 97% rename from src/main/java/org/apache/maven/plugins/jira/UrlBuilder.java rename to src/main/java/org/apache/maven/plugins/changes/jira/UrlBuilder.java index 19a58c8..b232829 100644 --- a/src/main/java/org/apache/maven/plugins/jira/UrlBuilder.java +++ b/src/main/java/org/apache/maven/plugins/changes/jira/UrlBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; /** * Builder for a URL which build up of host part, a context part and 0 or more parameters. diff --git a/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java b/src/main/java/org/apache/maven/plugins/changes/trac/TracDownloader.java similarity index 98% rename from src/main/java/org/apache/maven/plugins/trac/TracDownloader.java rename to src/main/java/org/apache/maven/plugins/changes/trac/TracDownloader.java index 3588fef..5a72284 100644 --- a/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java +++ b/src/main/java/org/apache/maven/plugins/changes/trac/TracDownloader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.trac; +package org.apache.maven.plugins.changes.trac; import java.net.MalformedURLException; import java.net.URL; @@ -29,7 +29,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.maven.plugins.issues.Issue; +import org.apache.maven.plugins.changes.issues.Issue; import org.apache.maven.project.MavenProject; import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.client.XmlRpcClient; diff --git a/src/main/java/org/apache/maven/plugins/trac/TracIssueManagmentSystem.java b/src/main/java/org/apache/maven/plugins/changes/trac/TracIssueManagmentSystem.java similarity index 92% rename from src/main/java/org/apache/maven/plugins/trac/TracIssueManagmentSystem.java rename to src/main/java/org/apache/maven/plugins/changes/trac/TracIssueManagmentSystem.java index 2b30b7f..1c1274a 100644 --- a/src/main/java/org/apache/maven/plugins/trac/TracIssueManagmentSystem.java +++ b/src/main/java/org/apache/maven/plugins/changes/trac/TracIssueManagmentSystem.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.trac; +package org.apache.maven.plugins.changes.trac; import org.apache.maven.plugins.changes.IssueType; -import org.apache.maven.plugins.issues.AbstractIssueManagementSystem; +import org.apache.maven.plugins.changes.issues.AbstractIssueManagementSystem; /** * The Trac issue management system. diff --git a/src/main/java/org/apache/maven/plugins/trac/TracReport.java b/src/main/java/org/apache/maven/plugins/changes/trac/TracReport.java similarity index 97% rename from src/main/java/org/apache/maven/plugins/trac/TracReport.java rename to src/main/java/org/apache/maven/plugins/changes/trac/TracReport.java index bc2511b..3430ed9 100644 --- a/src/main/java/org/apache/maven/plugins/trac/TracReport.java +++ b/src/main/java/org/apache/maven/plugins/changes/trac/TracReport.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.trac; +package org.apache.maven.plugins.changes.trac; import java.net.MalformedURLException; import java.util.HashMap; @@ -29,9 +29,9 @@ 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.IssuesReportGenerator; -import org.apache.maven.plugins.issues.IssuesReportHelper; +import org.apache.maven.plugins.changes.issues.Issue; +import org.apache.maven.plugins.changes.issues.IssuesReportGenerator; +import org.apache.maven.plugins.changes.issues.IssuesReportHelper; import org.apache.maven.reporting.MavenReportException; import org.apache.xmlrpc.XmlRpcException; diff --git a/src/main/resources/org/apache/maven/plugins/announcement/announcement.vm b/src/main/resources/org/apache/maven/plugins/changes/announcement/announcement.vm similarity index 100% rename from src/main/resources/org/apache/maven/plugins/announcement/announcement.vm rename to src/main/resources/org/apache/maven/plugins/changes/announcement/announcement.vm diff --git a/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java b/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java index f421475..6d4dba3 100644 --- a/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java +++ b/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java @@ -22,11 +22,11 @@ import java.util.Arrays; import java.util.List; import junit.framework.TestCase; +import org.apache.maven.plugins.changes.issues.Issue; +import org.apache.maven.plugins.changes.issues.IssueManagementSystem; +import org.apache.maven.plugins.changes.jira.JIRAIssueManagmentSystem; 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 org.apache.maven.plugins.jira.JIRAIssueManagmentSystem; /** * @author Alan Parkinson diff --git a/src/test/java/org/apache/maven/plugins/announcement/AnnouncementMojoTest.java b/src/test/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojoTest.java similarity index 96% rename from src/test/java/org/apache/maven/plugins/announcement/AnnouncementMojoTest.java rename to src/test/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojoTest.java index 32e6920..c957245 100644 --- a/src/test/java/org/apache/maven/plugins/announcement/AnnouncementMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojoTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.announcement; +package org.apache.maven.plugins.changes.announcement; import java.io.File; import java.nio.file.Files; @@ -48,7 +48,7 @@ public class AnnouncementMojoTest extends AbstractMojoTestCase { setVariableValueToObject(mojo, "version", "1.1"); setVariableValueToObject(mojo, "template", "announcement.vm"); setVariableValueToObject( - mojo, "templateDirectory", "src/main/resources/org/apache/maven/plugins/announcement/"); + mojo, "templateDirectory", "src/main/resources/org/apache/maven/plugins/changes/announcement/"); setVariableValueToObject(mojo, "basedir", getBasedir()); setVariableValueToObject(mojo, "introduction", "Nice library"); mojo.execute(); diff --git a/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java b/src/test/java/org/apache/maven/plugins/changes/github/GitHubDownloaderTestCase.java similarity index 98% rename from src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java rename to src/test/java/org/apache/maven/plugins/changes/github/GitHubDownloaderTestCase.java index 35f7401..216ebed 100644 --- a/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java +++ b/src/test/java/org/apache/maven/plugins/changes/github/GitHubDownloaderTestCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.github; +package org.apache.maven.plugins.changes.github; import java.io.IOException; import java.util.Collections; @@ -25,7 +25,7 @@ import java.util.List; import junit.framework.TestCase; import org.apache.maven.model.IssueManagement; import org.apache.maven.plugin.logging.Log; -import org.apache.maven.plugins.issues.Issue; +import org.apache.maven.plugins.changes.issues.Issue; import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Server; import org.apache.maven.settings.Settings; diff --git a/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java b/src/test/java/org/apache/maven/plugins/changes/issues/IssueManagementSystemTest.java similarity index 97% rename from src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java rename to src/test/java/org/apache/maven/plugins/changes/issues/IssueManagementSystemTest.java index 6aea3b7..ed2fb9b 100644 --- a/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java +++ b/src/test/java/org/apache/maven/plugins/changes/issues/IssueManagementSystemTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.issues; +package org.apache.maven.plugins.changes.issues; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java b/src/test/java/org/apache/maven/plugins/changes/issues/IssueTestCase.java similarity index 97% rename from src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java rename to src/test/java/org/apache/maven/plugins/changes/issues/IssueTestCase.java index 7477e13..7149856 100644 --- a/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java +++ b/src/test/java/org/apache/maven/plugins/changes/issues/IssueTestCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.issues; +package org.apache.maven.plugins.changes.issues; import junit.framework.TestCase; diff --git a/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java b/src/test/java/org/apache/maven/plugins/changes/issues/IssueUtilsTestCase.java similarity index 97% rename from src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java rename to src/test/java/org/apache/maven/plugins/changes/issues/IssueUtilsTestCase.java index d1ef116..684017e 100644 --- a/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java +++ b/src/test/java/org/apache/maven/plugins/changes/issues/IssueUtilsTestCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.issues; +package org.apache.maven.plugins.changes.issues; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/apache/maven/plugins/jira/JiraHelperTestCase.java b/src/test/java/org/apache/maven/plugins/changes/jira/JiraHelperTestCase.java similarity index 98% rename from src/test/java/org/apache/maven/plugins/jira/JiraHelperTestCase.java rename to src/test/java/org/apache/maven/plugins/changes/jira/JiraHelperTestCase.java index 21a261d..d45e75b 100644 --- a/src/test/java/org/apache/maven/plugins/jira/JiraHelperTestCase.java +++ b/src/test/java/org/apache/maven/plugins/changes/jira/JiraHelperTestCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; import java.util.Map; diff --git a/src/test/java/org/apache/maven/plugins/jira/JiraReportTest.java b/src/test/java/org/apache/maven/plugins/changes/jira/JiraReportTest.java similarity index 96% rename from src/test/java/org/apache/maven/plugins/jira/JiraReportTest.java rename to src/test/java/org/apache/maven/plugins/changes/jira/JiraReportTest.java index fefab6a..d076190 100644 --- a/src/test/java/org/apache/maven/plugins/jira/JiraReportTest.java +++ b/src/test/java/org/apache/maven/plugins/changes/jira/JiraReportTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; import org.apache.maven.plugin.testing.AbstractMojoTestCase; diff --git a/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java b/src/test/java/org/apache/maven/plugins/changes/jira/JiraUnicodeTestCase.java similarity index 97% rename from src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java rename to src/test/java/org/apache/maven/plugins/changes/jira/JiraUnicodeTestCase.java index c5928b3..ec62b00 100644 --- a/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java +++ b/src/test/java/org/apache/maven/plugins/changes/jira/JiraUnicodeTestCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; import java.io.File; import java.util.Collections; @@ -27,7 +27,7 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Plugin; import org.apache.maven.plugin.MojoExecution; import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.apache.maven.plugins.issues.Issue; +import org.apache.maven.plugins.changes.issues.Issue; import org.apache.maven.project.MavenProject; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystem; diff --git a/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestProjectStub.java b/src/test/java/org/apache/maven/plugins/changes/jira/JiraUnicodeTestProjectStub.java similarity index 97% rename from src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestProjectStub.java rename to src/test/java/org/apache/maven/plugins/changes/jira/JiraUnicodeTestProjectStub.java index 15034b0..bdd5298 100644 --- a/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/changes/jira/JiraUnicodeTestProjectStub.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; import java.util.Collections; import java.util.List; diff --git a/src/test/java/org/apache/maven/plugins/jira/JqlQueryBuilderTestCase.java b/src/test/java/org/apache/maven/plugins/changes/jira/JqlQueryBuilderTestCase.java similarity index 99% rename from src/test/java/org/apache/maven/plugins/jira/JqlQueryBuilderTestCase.java rename to src/test/java/org/apache/maven/plugins/changes/jira/JqlQueryBuilderTestCase.java index cf8e03f..e306b86 100644 --- a/src/test/java/org/apache/maven/plugins/jira/JqlQueryBuilderTestCase.java +++ b/src/test/java/org/apache/maven/plugins/changes/jira/JqlQueryBuilderTestCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/src/test/java/org/apache/maven/plugins/jira/UrlBuilderTestCase.java b/src/test/java/org/apache/maven/plugins/changes/jira/UrlBuilderTestCase.java similarity index 97% rename from src/test/java/org/apache/maven/plugins/jira/UrlBuilderTestCase.java rename to src/test/java/org/apache/maven/plugins/changes/jira/UrlBuilderTestCase.java index c86e8f3..bf9d412 100644 --- a/src/test/java/org/apache/maven/plugins/jira/UrlBuilderTestCase.java +++ b/src/test/java/org/apache/maven/plugins/changes/jira/UrlBuilderTestCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugins.jira; +package org.apache.maven.plugins.changes.jira; import junit.framework.TestCase;