This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository maven-helper-plugin. See http://git.nuiton.org/maven-helper-plugin.git commit d2dbb98fc9da63d77abc7037c4fedbf4b1ded6e0 Merge: b581f0e a5104f7 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 26 06:29:08 2015 +0000 Merge branch 'master' into develop Conflicts: helper-maven-plugin/pom.xml pom.xml helper-maven-plugin-api/pom.xml | 5 +---- .../src/license/THIRD-PARTY.properties | 15 ++------------- helper-maven-plugin-test-api/pom.xml | 9 +++++++-- .../src/license/THIRD-PARTY.properties | 16 +++------------- .../main/java/org/nuiton/plugin/MojoTestRule.java | 22 ++++++++++++++++++++++ .../main/java/org/nuiton/plugin/TestHelper.java | 22 ++++++++++++++++++++++ .../src/site/apt/index.apt | 21 +++++++++++++++++++++ .../src/site/apt/mojo-testFramework.apt | 21 +++++++++++++++++++++ helper-maven-plugin-test-api/src/site/site.xml | 22 ++++++++++++++++++++++ helper-maven-plugin/pom.xml | 7 ++----- .../src/license/THIRD-PARTY.properties | 15 ++------------- .../plugin/CheckAutoContainerPluginTest.java | 22 ++++++++++++++++++++++ pom.xml | 19 ++++++++----------- 13 files changed, 155 insertions(+), 61 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.