[Jredmine-commits] branch master updated (62dc0a7 -> b5bd4fc)

This is an automated email from the git hooks/post-receive script. New change to branch master in repository jredmine. See https://gitlab.nuiton.org/nuiton/jredmine.git from 62dc0a7 Merge branch 'release/1.9' adds 64dc29e [jgitflow-maven-plugin]updating poms for 2.0-SNAPSHOT development adds 19a9b10 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b776266 Merge branch 'master' into develop adds ec3081a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds b77f7e9 Migration vers gitlab + simplification configuration des sites adds f7e7024 doc(README.txt) Adding a small description of the project. adds 020ee45 Update parent pom adds b3bf1dc Add a new mojo to generate a changelog.txt from the generated changes.xml (Fixes #4020) adds 758f510 Use maven 3.3.9 API instead of 2.2.1 (Fixes #4021) adds c9761a6 Update tests adds 8ea5284 Update dependencies (Fixes #4023) adds 9d4796f Make javadoc 1.8 + update file headers adds d0a097c Update doc adds 2c60bea [jgitflow-maven-plugin]updating poms for 1.10 branch with snapshot versions adds f8052a2 [jgitflow-maven-plugin]updating poms for branch'release/1.10' with non-snapshot versions adds 4e5b828 Pass to java level 7 (Fixes #4025) adds f17a1a4 optimize third parties adds b5bd4fc [jgitflow-maven-plugin]merging 'release/1.10' into 'master' No new revisions were added by this update. Summary of changes: README.md | 11 + README.txt | 2 - changelog.txt | 5 - .../README.txt => jredmine-client/README.md | 0 jredmine-client/changelog.txt | 5 - jredmine-client/pom.xml | 4 +- jredmine-client/src/it/redmine-1.4.x/pom.xml | 4 +- .../src/it/redmine-1.4.x/postbuild.groovy | 4 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/test-config.properties | 4 +- jredmine-client/src/it/redmine-2.0.x/pom.xml | 4 +- .../src/it/redmine-2.0.x/postbuild.groovy | 4 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/test-config.properties | 4 +- jredmine-client/src/it/redmine-2.1.x/pom.xml | 4 +- .../src/it/redmine-2.1.x/postbuild.groovy | 4 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/test-config.properties | 4 +- jredmine-client/src/it/settings.xml | 2 +- .../src/main/assembly/dist/log4j.properties | 2 +- .../src/main/assembly/jredmine_rails-1.x.xml | 4 +- .../src/main/assembly/jredmine_rails-2.x.xml | 4 +- jredmine-client/src/main/assembly/tool.xml | 2 +- .../org/nuiton/jredmine/client/RedmineClient.java | 6 +- .../client/RedmineClientAuthConfiguration.java | 6 +- .../client/RedmineClientConfiguration.java | 7 +- .../org/nuiton/jredmine/client/RedmineRequest.java | 6 +- .../jredmine/client/RedmineRequestHelper.java | 6 +- .../java/org/nuiton/jredmine/model/Attachment.java | 7 +- .../java/org/nuiton/jredmine/model/I18nAble.java | 7 +- .../java/org/nuiton/jredmine/model/IdAble.java | 7 +- .../java/org/nuiton/jredmine/model/IdAbles.java | 6 +- .../main/java/org/nuiton/jredmine/model/Issue.java | 7 +- .../org/nuiton/jredmine/model/IssueCategory.java | 7 +- .../org/nuiton/jredmine/model/IssuePriority.java | 7 +- .../org/nuiton/jredmine/model/IssueStatus.java | 7 +- .../main/java/org/nuiton/jredmine/model/News.java | 7 +- .../java/org/nuiton/jredmine/model/Project.java | 7 +- .../java/org/nuiton/jredmine/model/TimeEntry.java | 7 +- .../java/org/nuiton/jredmine/model/Tracker.java | 7 +- .../main/java/org/nuiton/jredmine/model/User.java | 7 +- .../java/org/nuiton/jredmine/model/Version.java | 7 +- .../nuiton/jredmine/model/VersionStatusEnum.java | 7 +- .../model/io/xpp3/AttachmentXpp3Reader.java | 7 +- .../model/io/xpp3/IssueCategoryXpp3Reader.java | 7 +- .../model/io/xpp3/IssuePriorityXpp3Reader.java | 7 +- .../model/io/xpp3/IssueStatusXpp3Reader.java | 7 +- .../jredmine/model/io/xpp3/IssueXpp3Reader.java | 7 +- .../jredmine/model/io/xpp3/NewsXpp3Reader.java | 7 +- .../jredmine/model/io/xpp3/ProjectXpp3Reader.java | 7 +- .../model/io/xpp3/RedmineDataConverter.java | 9 +- .../jredmine/model/io/xpp3/RedmineXpp3Helper.java | 7 +- .../model/io/xpp3/TimeEntryXpp3Reader.java | 7 +- .../jredmine/model/io/xpp3/TrackerXpp3Reader.java | 7 +- .../jredmine/model/io/xpp3/UserXpp3Reader.java | 7 +- .../jredmine/model/io/xpp3/VersionXpp3Reader.java | 7 +- .../model/io/xpp3/api/AbstractXpp3Reader.java | 46 ++-- .../io/xpp3/api/AttributeValueToProperty.java | 6 +- .../jredmine/model/io/xpp3/api/DataConverter.java | 8 +- .../model/io/xpp3/api/DefaultDataConverter.java | 8 +- .../jredmine/model/io/xpp3/api/PropertyMapper.java | 10 +- .../model/io/xpp3/api/TagContentToProperty.java | 6 +- .../io/xpp3/api/TagTextContentToProperty.java | 6 +- .../jredmine/model/io/xpp3/api/Xpp3Helper.java | 10 +- .../jredmine/model/io/xpp3/api/Xpp3Reader.java | 58 +++-- .../jredmine/service/AbstractRedmineService.java | 6 +- .../jredmine/service/DefaultRedmineService.java | 6 +- .../jredmine/service/RedmineAnonymousService.java | 15 +- .../jredmine/service/RedmineConfigurationUtil.java | 8 +- .../jredmine/service/RedmineLogguedService.java | 39 ++-- .../nuiton/jredmine/service/RedmineService.java | 9 +- .../service/RedmineServiceConfiguration.java | 8 +- .../jredmine/service/RedmineServiceException.java | 7 +- .../service/RedmineServiceLoginException.java | 9 +- .../jredmine/tool/FetchProjectsVersionsTool.java | 8 +- .../nuiton/jredmine/tool/JRedmineToolAction.java | 2 +- .../jredmine/tool/JRedmineToolCommandLine.java | 2 +- .../app/controllers/jredmine_controller.rb | 2 +- .../src/main/redmine/jredmine-1.x/config/routes.rb | 4 +- .../src/main/redmine/jredmine-1.x/init.rb | 2 +- .../app/controllers/jredmine_controller.rb | 2 +- .../src/main/redmine/jredmine-2.x/config/routes.rb | 4 +- .../src/main/redmine/jredmine-2.x/init.rb | 2 +- jredmine-client/src/site/apt/index.apt | 2 +- jredmine-client/src/site/apt/rails_api.apt | 2 +- jredmine-client/src/site/apt/redmine_service.apt | 2 +- jredmine-client/src/site/site.xml | 2 +- .../java/org/nuiton/jredmine/RedmineFixtures.java | 6 +- .../nuiton/jredmine/client/RedmineClientTest.java | 7 +- .../model/io/xpp3/RedmineModelFixtures.java | 6 +- .../model/io/xpp3/RedmineXpp3HelperTest.java | 9 +- .../service/RedmineAnonymousServiceTest.java | 8 +- .../service/RedmineServiceAsAnonymousTest.java | 6 +- .../jredmine/service/RedmineServiceTest.java | 6 +- .../jredmine/test/AbstractRedmineFixtures.java | 6 +- .../test/RedmineAnonymousFixtureClassRule.java | 6 +- .../jredmine/test/RedmineFixtureClassRule.java | 6 +- .../org/nuiton/jredmine/test/RedmineServer.java | 8 +- .../test/tck/RedmineAnonymousServiceTCK.java | 8 +- .../test/tck/RedmineServiceAsAnonymousTCK.java | 6 +- .../jredmine/test/tck/RedmineServiceTCK.java | 6 +- .../jredmine/test/tck/RedmineTCKFixtures.java | 6 +- .../src/test/resources/log4j.properties | 2 +- .../model/io/xpp3/array-empty/attachment.xml | 4 +- .../jredmine/model/io/xpp3/array-empty/issue.xml | 2 +- .../model/io/xpp3/array-empty/issueCategory.xml | 4 +- .../model/io/xpp3/array-empty/issuePriority.xml | 2 +- .../model/io/xpp3/array-empty/issueStatus.xml | 2 +- .../jredmine/model/io/xpp3/array-empty/news.xml | 2 +- .../jredmine/model/io/xpp3/array-empty/project.xml | 4 +- .../model/io/xpp3/array-empty/timeEntry.xml | 4 +- .../jredmine/model/io/xpp3/array-empty/tracker.xml | 2 +- .../jredmine/model/io/xpp3/array-empty/user.xml | 2 +- .../jredmine/model/io/xpp3/array-empty/version.xml | 2 +- .../model/io/xpp3/array-empty2/attachment.xml | 4 +- .../jredmine/model/io/xpp3/array-empty2/issue.xml | 2 +- .../model/io/xpp3/array-empty2/issueCategory.xml | 4 +- .../model/io/xpp3/array-empty2/issuePriority.xml | 2 +- .../model/io/xpp3/array-empty2/issueStatus.xml | 2 +- .../jredmine/model/io/xpp3/array-empty2/news.xml | 2 +- .../model/io/xpp3/array-empty2/project.xml | 4 +- .../model/io/xpp3/array-empty2/timeEntry.xml | 4 +- .../model/io/xpp3/array-empty2/tracker.xml | 2 +- .../jredmine/model/io/xpp3/array-empty2/user.xml | 2 +- .../model/io/xpp3/array-empty2/version.xml | 2 +- .../model/io/xpp3/array-multi/attachment.xml | 4 +- .../jredmine/model/io/xpp3/array-multi/issue.xml | 2 +- .../model/io/xpp3/array-multi/issueCategory.xml | 4 +- .../model/io/xpp3/array-multi/issuePriority.xml | 2 +- .../model/io/xpp3/array-multi/issueStatus.xml | 4 +- .../jredmine/model/io/xpp3/array-multi/news.xml | 4 +- .../jredmine/model/io/xpp3/array-multi/project.xml | 4 +- .../model/io/xpp3/array-multi/timeEntry.xml | 4 +- .../jredmine/model/io/xpp3/array-multi/tracker.xml | 2 +- .../jredmine/model/io/xpp3/array-multi/user.xml | 2 +- .../jredmine/model/io/xpp3/array-multi/version.xml | 2 +- .../model/io/xpp3/array-singleton/attachment.xml | 4 +- .../model/io/xpp3/array-singleton/issue.xml | 2 +- .../io/xpp3/array-singleton/issueCategory.xml | 4 +- .../io/xpp3/array-singleton/issuePriority.xml | 2 +- .../model/io/xpp3/array-singleton/issueStatus.xml | 4 +- .../model/io/xpp3/array-singleton/news.xml | 4 +- .../model/io/xpp3/array-singleton/project.xml | 4 +- .../model/io/xpp3/array-singleton/timeEntry.xml | 4 +- .../model/io/xpp3/array-singleton/tracker.xml | 2 +- .../model/io/xpp3/array-singleton/user.xml | 2 +- .../model/io/xpp3/array-singleton/version.xml | 2 +- .../jredmine/model/io/xpp3/single/attachment.xml | 2 +- .../nuiton/jredmine/model/io/xpp3/single/issue.xml | 2 +- .../model/io/xpp3/single/issueCategory.xml | 2 +- .../model/io/xpp3/single/issuePriority.xml | 2 +- .../jredmine/model/io/xpp3/single/issueStatus.xml | 2 +- .../nuiton/jredmine/model/io/xpp3/single/news.xml | 2 +- .../jredmine/model/io/xpp3/single/project.xml | 2 +- .../jredmine/model/io/xpp3/single/timeEntry.xml | 2 +- .../jredmine/model/io/xpp3/single/tracker.xml | 2 +- .../nuiton/jredmine/model/io/xpp3/single/user.xml | 2 +- .../jredmine/model/io/xpp3/single/version.xml | 2 +- .../jredmine/model/io/xpp3/single2/issue.xml | 2 +- .../nuiton/jredmine/model/io/xpp3/single2/user.xml | 2 +- .../src/test/resources/test-config.properties | 4 +- .../README.txt => jredmine-maven-plugin/README.md | 0 jredmine-maven-plugin/changelog.txt | 5 - jredmine-maven-plugin/pom.xml | 18 +- .../src/it/multi/invoker.properties | 2 +- jredmine-maven-plugin/src/it/multi/module1/pom.xml | 2 +- jredmine-maven-plugin/src/it/multi/module2/pom.xml | 2 +- jredmine-maven-plugin/src/it/multi/pom.xml | 2 +- jredmine-maven-plugin/src/it/multi/verify.groovy | 5 +- .../src/it/report/invoker.properties | 2 +- jredmine-maven-plugin/src/it/report/pom.xml | 2 +- jredmine-maven-plugin/src/it/report/verify.groovy | 5 +- jredmine-maven-plugin/src/it/settings.xml | 2 +- .../src/it/single/invoker.properties | 2 +- jredmine-maven-plugin/src/it/single/pom.xml | 2 +- .../java/org/nuiton/jredmine/plugin/MyClass.java | 7 +- jredmine-maven-plugin/src/it/single/verify.groovy | 5 +- .../src/it/single_failed/invoker.properties | 2 +- jredmine-maven-plugin/src/it/single_failed/pom.xml | 2 +- .../java/org/nuiton/jredmine/plugin/MyClass.java | 7 +- .../src/it/single_failed/verify.groovy | 5 +- .../src/it/skip-report/invoker.properties | 2 +- jredmine-maven-plugin/src/it/skip-report/pom.xml | 2 +- .../src/it/skip-report/verify.groovy | 5 +- .../src/license/THIRD-PARTY.properties | 9 +- .../jredmine/plugin/AbstractRedmineMojo.java | 17 +- .../plugin/AbstractRedmineMojoWithProject.java | 6 +- .../AbstractRedmineMojoWithProjectAndVersion.java | 6 +- .../nuiton/jredmine/plugin/DisplayDataMojo.java | 15 +- .../org/nuiton/jredmine/plugin/DryRunAware.java | 6 +- .../jredmine/plugin/GenerateChangelogMojo.java | 247 +++++++++++++++++++++ .../jredmine/plugin/GenerateChangesMojo.java | 27 +-- .../plugin/IssueCollectorConfiguration.java | 9 +- .../nuiton/jredmine/plugin/IssuesCollector.java | 9 +- .../nuiton/jredmine/plugin/NextVersionMojo.java | 22 +- .../jredmine/plugin/PublishAttachmentsMojo.java | 15 +- .../nuiton/jredmine/plugin/PublishNewsMojo.java | 9 +- .../jredmine/plugin/RedmineProjectAware.java | 6 +- .../jredmine/plugin/RedmineVersionAware.java | 6 +- .../jredmine/plugin/SkipOrRunOnlyOnceAware.java | 6 +- .../nuiton/jredmine/plugin/UpdateVersionMojo.java | 19 +- .../announcement/AbstractAnnouncementMojo.java | 7 +- .../plugin/announcement/AnnouncementGenerator.java | 7 +- .../AnnouncementGeneratorConfiguration.java | 7 +- .../GenerateEmailAnnouncementMojo.java | 7 +- .../announcement/GenerateNewsAnnouncementMojo.java | 7 +- .../plugin/report/AbstractIssuesReport.java | 7 +- .../plugin/report/AbstractRedmineReport.java | 58 ++--- .../plugin/report/IssueReportGenerator.java | 9 +- .../jredmine/plugin/report/IssuesReport.java | 23 +- .../plugin/report/IssuesReportByAssignee.java | 23 +- .../plugin/report/IssuesReportByCategory.java | 23 +- .../plugin/report/IssuesReportByPriority.java | 23 +- .../plugin/report/IssuesReportByReporter.java | 23 +- .../plugin/report/IssuesReportByStatus.java | 23 +- .../plugin/report/IssuesReportByTracker.java | 23 +- .../plugin/report/IssuesReportByVersion.java | 23 +- .../main/resources/META-INF/plexus/components.xml | 4 +- .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/redmine-report.properties | 2 +- .../main/resources/redmine-report_de.properties | 2 +- .../main/resources/redmine-report_en.properties | 2 +- .../main/resources/redmine-report_fr.properties | 2 +- jredmine-maven-plugin/src/site/apt/index.apt | 4 +- jredmine-maven-plugin/src/site/site.xml | 2 +- .../jredmine/RedmineAnonymousFixtureClassRule.java | 6 +- .../java/org/nuiton/jredmine/RedmineFixtures.java | 6 +- .../jredmine/RedmineLogguedFixtureClassRule.java | 6 +- .../plugin/AbstractAnonymousRedmineMojoTest.java | 7 +- .../plugin/AbstractLogguedRedmineMojoTest.java | 7 +- .../jredmine/plugin/AbstractRedmineMojoTest.java | 160 +++++-------- .../jredmine/plugin/DisplayDataMojoTest.java | 40 ++-- .../jredmine/plugin/GenerateChangesMojoTest.java | 26 ++- .../jredmine/plugin/NextVersionMojoTest.java | 28 ++- .../plugin/PublishAttachmentsMojoTest.java | 28 ++- .../jredmine/plugin/PublishNewsMojoTest.java | 28 ++- ...dmineMojoTest.java => RedmineMojoTestRule.java} | 79 +++---- .../jredmine/plugin/UpdateVersionMojoTest.java | 28 ++- .../GenerateEmailAnnouncementMojoTest.java | 33 +-- .../GenerateNewsAnnouncementMojoTest.java | 33 +-- .../plugin/report/AbstractIssuesReportTest.java | 7 +- .../plugin/report/IssuesReportByAssigneeTest.java | 15 +- .../plugin/report/IssuesReportByCategoryTest.java | 15 +- .../plugin/report/IssuesReportByPriorityTest.java | 15 +- .../plugin/report/IssuesReportByReporterTest.java | 15 +- .../plugin/report/IssuesReportByStatusTest.java | 15 +- .../plugin/report/IssuesReportByTrackerTest.java | 15 +- .../plugin/report/IssuesReportByVersionTest.java | 15 +- .../jredmine/plugin/report/IssuesReportTest.java | 15 +- .../src/test/resources/log4j.properties | 2 +- .../jredmine/plugin/announcement/changes.xml | 2 +- .../generateEmailAnnouncement.xml | 4 +- .../skipGenerateEmailAnnouncement.xml | 4 +- .../generateNewsAnnouncement.xml | 4 +- .../skipGenerateNewsAnnouncement.xml | 4 +- .../plugin/displayDataMojoTest/displayAll.xml | 4 +- .../displayDataMojoTest/displayIssuePriorities.xml | 4 +- .../displayDataMojoTest/displayIssueStatuses.xml | 4 +- .../displayProjectIssueCategories.xml | 4 +- .../displayDataMojoTest/displayProjectTrackers.xml | 4 +- .../displayDataMojoTest/displayProjectUsers.xml | 4 +- .../plugin/displayDataMojoTest/displayProjects.xml | 4 +- .../plugin/displayDataMojoTest/displayVersions.xml | 4 +- .../generateChangesMojoTest/generateChanges.xml | 4 +- .../plugin/nextVersionMojoTest/nextVersion.xml | 4 +- .../plugin/nextVersionMojoTest/skipNextVersion.xml | 4 +- .../publishAttachments.xml | 4 +- .../skipPublishAttachments.xml | 4 +- .../plugin/publishNewsMojoTest/publishNews.xml | 4 +- .../plugin/publishNewsMojoTest/skipPublishNews.xml | 4 +- .../issuesReportByAssigneeTest/issueReport.xml | 4 +- .../issuesReportByCategoryTest/issueReport.xml | 4 +- .../issuesReportByPriorityTest/issueReport.xml | 4 +- .../issuesReportByReporterTest/issueReport.xml | 4 +- .../issuesReportByStatusTest/issueReport.xml | 4 +- .../issuesReportByTrackerTest/issueReport.xml | 4 +- .../issuesReportByVersionTest/issueReport.xml | 4 +- .../plugin/report/issuesReportTest/issueReport.xml | 4 +- .../updateVersionMojoTest/skipUpdateVersion.xml | 4 +- .../plugin/updateVersionMojoTest/updateVersion.xml | 4 +- .../src/test/resources/test-config.properties | 4 +- pom.xml | 159 +++++-------- src/site/apt/index.apt | 6 +- src/site/apt/tests.apt | 8 +- src/site/site.xml | 9 +- 285 files changed, 1245 insertions(+), 1410 deletions(-) create mode 100644 README.md delete mode 100644 README.txt delete mode 100644 changelog.txt rename jredmine-maven-plugin/README.txt => jredmine-client/README.md (100%) delete mode 100644 jredmine-client/changelog.txt rename jredmine-client/README.txt => jredmine-maven-plugin/README.md (100%) delete mode 100644 jredmine-maven-plugin/changelog.txt create mode 100644 jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangelogMojo.java copy jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/{AbstractRedmineMojoTest.java => RedmineMojoTestRule.java} (74%) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.