branch master updated (c6118e6 -> a5104f7)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository maven-helper-plugin. See http://git.nuiton.org/maven-helper-plugin.git from c6118e6 [maven-release-plugin] copy for tag maven-helper-plugin-2.1 adds 49fcb16 [maven-release-plugin] prepare for next development iteration adds 247f6e7 - updates mavenpom to 4.0 - reformat poms adds 5b75d40 fixes #3555: Migrates to git adds 940d9a6 use Maven 3.0 Api (refs #3702) + introduce Test Api module (refs #3703) adds d9af559 use Parameter instead of deprecated Component annotation for MavenProject and Settings (refs #3703) adds 22b9ef3 use jdk 7 api (refs #3702) adds 20eb087 make javadoc jdk8 compat (refs #3702) adds 3e93d17 fixes #3702: Use maven 3 API fixes #3703: Split mojo Api in two modules (one with Api and one with test Api) Merge branch 'feature/3702' into develop adds 92e789d fix documentation and javadoc (refs #3703) adds f696af8 fix documentation and javadoc (refs #3703) adds 144cc10 [jgitflow-maven-plugin]updating poms for 2.2 branch with snapshot versions adds cb2842d - update third parties files - optimize dependencies - add license headers adds c1ce5aa tidy poms adds f17ee78 [jgitflow-maven-plugin]updating poms for branch'release/2.2' with non-snapshot versions adds a5104f7 [jgitflow-maven-plugin]merging 'release/2.2' into 'master' No new revisions were added by this update. Summary of changes: .gitignore | 12 + LICENSE.txt | 5 +- helper-maven-plugin-api/LICENSE.txt | 5 +- helper-maven-plugin-api/pom.xml | 149 +------- .../src/license/THIRD-PARTY.properties | 16 +- .../src/main/java/org/nuiton/io/FileUpdater.java | 8 +- .../main/java/org/nuiton/io/FileUpdaterHelper.java | 8 +- .../java/org/nuiton/io/MirroredFileUpdater.java | 6 +- .../io/PropertiesDateRemoveFilterStream.java | 5 +- .../main/java/org/nuiton/io/SortedProperties.java | 27 +- .../nuiton/plugin/AbstractAvailableDataMojo.java | 7 +- .../java/org/nuiton/plugin/AbstractPlugin.java | 185 ++++------ .../java/org/nuiton/plugin/DependencyUtil.java | 35 +- .../src/main/java/org/nuiton/plugin/Plugin.java | 6 +- .../main/java/org/nuiton/plugin/PluginHelper.java | 42 +-- .../java/org/nuiton/plugin/PluginIOContext.java | 8 +- .../java/org/nuiton/plugin/PluginWithEncoding.java | 9 +- .../nuiton/plugin/VelocityTemplateGenerator.java | 25 +- .../src/main/resources/assemblies/deps.xml | 4 +- .../src/main/resources/assemblies/full.xml | 4 +- helper-maven-plugin-api/src/site/apt/index.apt | 22 +- .../src/site/apt/mojo-framework.apt | 2 - .../src/site/{site_en.xml => site.xml} | 27 +- .../java/org/nuiton/plugin/AbstractMojoTest.java | 389 --------------------- .../java/org/nuiton/plugin/PluginHelperTest.java | 6 +- .../test/java/org/nuiton/plugin/TestHelper.java | 123 ------- .../src/test/resources/log4j.properties | 2 - .../test/resources/org/nuiton/io/JaxxDummy.java | 4 +- .../test/resources/org/nuiton/io/JaxxDummy.jaxx | 4 +- .../LICENSE.txt | 5 +- .../README.txt | 0 .../changelog.txt | 0 helper-maven-plugin-test-api/pom.xml | 204 +++++++++++ .../src/license/THIRD-PARTY.properties | 22 ++ .../main/java/org/nuiton/plugin/MojoTestRule.java | 265 ++++++++++++++ .../main/java/org/nuiton/plugin/TestHelper.java | 139 ++++++++ .../src/site/apt/index.apt | 27 +- .../src/site/apt/mojo-testFramework.apt | 56 ++- .../src/site/site.xml | 39 +-- helper-maven-plugin/LICENSE.txt | 5 +- helper-maven-plugin/pom.xml | 74 ++-- .../central/invoker.properties | 2 - .../src/it/check-auto-container/central/pom.xml | 2 - .../it/check-auto-container/central/verify.groovy | 2 - .../nuiton-other-releases/invoker.properties | 2 - .../nuiton-other-releases/pom.xml | 2 - .../nuiton-other-releases/verify.groovy | 2 - .../unsafe-central/invoker.properties | 2 - .../it/check-auto-container/unsafe-central/pom.xml | 2 - .../unsafe-central/verify.groovy | 2 - .../src/it/collect-files/multi/invoker.properties | 2 - .../src/it/collect-files/multi/module1/pom.xml | 5 +- .../src/it/collect-files/multi/module2/pom.xml | 5 +- .../src/it/collect-files/multi/pom.xml | 2 - .../src/it/collect-files/multi/verify.groovy | 2 - .../src/it/collect-files/single/invoker.properties | 2 - .../src/it/collect-files/single/pom.xml | 2 - .../src/it/collect-files/single/verify.groovy | 2 - .../src/it/send-email/single/invoker.properties | 2 - .../src/it/send-email/single/pom.xml | 2 - .../src/it/send-email/single/verify.groovy | 2 - helper-maven-plugin/src/it/settings.xml | 2 - .../share-server-secret/single/invoker.properties | 2 - .../src/it/share-server-secret/single/pom.xml | 2 - .../it/share-server-secret/single/verify.groovy | 2 - .../src/license/THIRD-PARTY.properties | 17 +- .../java/org/nuiton/helper/io/mail/MailSender.java | 7 +- .../helper/io/mail/ProjectJavamailMailSender.java | 9 +- .../helper/plugin/CheckAutoContainerPlugin.java | 253 +++++++------- .../org/nuiton/helper/plugin/CollectFilesMojo.java | 100 ++---- .../helper/plugin/ExecuteRemoteCommandMojo.java | 47 +-- .../org/nuiton/helper/plugin/SendEmailMojo.java | 32 +- .../helper/plugin/ShareServerSecretPlugin.java | 59 ++-- .../helper/plugin/TransformProjectVersionMojo.java | 40 +-- .../main/resources/META-INF/plexus/components.xml | 4 +- helper-maven-plugin/src/site/apt/index.apt | 2 - helper-maven-plugin/src/site/apt/mojo-examples.apt | 2 - helper-maven-plugin/src/site/apt/mojo-usages.apt | 2 - .../src/site/{site_en.xml => site.xml} | 28 +- .../plugin/CheckAutoContainerPluginTest.java | 64 ++++ .../nuiton/helper/plugin/SendEmailMojoTest.java | 78 +++-- .../plugin/TransformProjectVersionMojoTest.java | 64 ++-- .../src/test/resources/log4j.properties | 2 - .../checkAutoContainerPluginTest/central.xml} | 36 +- .../helper/plugin/sendEmailMojoTest/sendEmail.xml | 4 +- .../plugin/sendEmailMojoTest/skipSendEmail.xml | 4 +- .../badVersionPattern1.xml | 4 +- .../badVersionPattern2.xml | 4 +- .../badVersionPattern3.xml | 4 +- .../keepSnapshot.xml | 4 +- .../removeSnapshot.xml | 4 +- .../transformProjectVersionMojoTest/simple.xml | 4 +- pom.xml | 163 ++++----- src/site/apt/Todo.apt | 5 +- src/site/apt/index.apt | 23 +- src/site/site.xml | 60 ++++ src/site/site_en.xml | 105 ------ src/test/java/org/nuiton/io/JavaDummy.java | 5 +- .../java/org/nuiton/io/JavaFileUpdaterTest.java | 5 +- .../java/org/nuiton/io/JaxxFileUpdaterTest.java | 5 +- .../java/org/nuiton/io/SortedPropertiesTest.java | 5 +- src/test/java/org/nuiton/io/xpp3/CountryRef.java | 5 +- .../org/nuiton/io/xpp3/CountryRefXpp3Reader.java | 7 +- src/test/java/org/nuiton/io/xpp3/Identity.java | 5 +- .../org/nuiton/io/xpp3/IdentityXpp3Reader.java | 5 +- .../java/org/nuiton/io/xpp3/Xpp3HelperTest.java | 5 +- .../java/org/nuiton/io/xpp3/Xpp3ReaderTest.java | 5 +- 107 files changed, 1448 insertions(+), 1873 deletions(-) create mode 100644 .gitignore copy helper-maven-plugin-api/src/site/{site_en.xml => site.xml} (64%) delete mode 100644 helper-maven-plugin-api/src/test/java/org/nuiton/plugin/AbstractMojoTest.java delete mode 100644 helper-maven-plugin-api/src/test/java/org/nuiton/plugin/TestHelper.java copy LICENSE.txt => helper-maven-plugin-test-api/LICENSE.txt (99%) copy {helper-maven-plugin-api => helper-maven-plugin-test-api}/README.txt (100%) copy {helper-maven-plugin-api => helper-maven-plugin-test-api}/changelog.txt (100%) create mode 100644 helper-maven-plugin-test-api/pom.xml create mode 100644 helper-maven-plugin-test-api/src/license/THIRD-PARTY.properties create mode 100644 helper-maven-plugin-test-api/src/main/java/org/nuiton/plugin/MojoTestRule.java create mode 100644 helper-maven-plugin-test-api/src/main/java/org/nuiton/plugin/TestHelper.java copy src/site/apt/Todo.apt => helper-maven-plugin-test-api/src/site/apt/index.apt (65%) rename {helper-maven-plugin-api => helper-maven-plugin-test-api}/src/site/apt/mojo-testFramework.apt (82%) rename helper-maven-plugin-api/src/site/site_en.xml => helper-maven-plugin-test-api/src/site/site.xml (57%) rename helper-maven-plugin/src/site/{site_en.xml => site.xml} (70%) create mode 100644 helper-maven-plugin/src/test/java/org/nuiton/helper/plugin/CheckAutoContainerPluginTest.java copy {helper-maven-plugin-api => helper-maven-plugin}/src/test/resources/log4j.properties (98%) copy helper-maven-plugin/src/{it/check-auto-container/central/pom.xml => test/resources/org/nuiton/helper/plugin/checkAutoContainerPluginTest/central.xml} (76%) create mode 100644 src/site/site.xml delete mode 100644 src/site/site_en.xml -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm