This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from 7c6bc70 [jgitflow-maven-plugin]updating poms for 2.30-SNAPSHOT development new 85fa671 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0f6dfb1 Up to nuiton-utils 3.0-rc-12 (downgrade to jdk 1.6 please) adds a5bd80f Fixes #3946: Update nuiton-version to 1.0-rc-2 Fixes #3947: Update nuiton-config to 3.0-rc-5 Fixes #3948: Update nuiton-utils to 3.0-rc-12 adds 8228758 the plugin must stay in java 8 since we are building it with java 8... adds 0c66a10 update third parties adds be42fd5 Adding missing license header adds 613540e [jgitflow-maven-plugin]updating poms for branch'release/2.29' with non-snapshot versions new f48dd0a [jgitflow-maven-plugin]merging 'release/2.29' into 'master-2.x' new 6e8310f [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' new d65f5af [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d65f5afaec09f28d706052bf233e837a6c08ee88 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:58 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 6e8310f100ae099c20cfda826e8c9a4b89337058 Merge: 85fa671 f48dd0a Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:57 2016 +0200 [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' commit 85fa6712e86795f22e85a0d0263c7e8935234a2a Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:57 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f48dd0a13c117a3a040b5d424ab3440df24876dd Merge: 99632ca 613540e Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:55 2016 +0200 [jgitflow-maven-plugin]merging 'release/2.29' into 'master-2.x' Summary of changes: jaxx-maven-plugin/pom.xml | 6 ++++++ .../src/license/THIRD-PARTY.properties | 12 +++--------- .../runtime/swing/renderer/EnumEditorRenderer.java | 22 ++++++++++++++++++++++ pom.xml | 6 +++--- 4 files changed, 34 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.