branch develop updated (803de52 -> fa07d0b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-utils. See http://git.nuiton.org/nuiton-utils.git from 803de52 Can't use javadoc plugin 2.10.1 (Fixes #3546) new aa3a8e6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds aee297c [jgitflow-maven-plugin]updating poms for 3.0-rc-10 branch with snapshot versions new cc7d12a Ignore Rmi test (not working on our release platform, need to be fixed) new 7814ac3 [jgitflow-maven-plugin]updating poms for branch'release/3.0-rc-10' with non-snapshot versions new d68e7e9 [jgitflow-maven-plugin]merging 'release/3.0-rc-10' into 'master' new 510be19 [jgitflow-maven-plugin]merging 'master' into 'develop' new fa07d0b [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 fa07d0b77f772d9ded1cc53723312aa048e62922 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:32:12 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 510be19326c9873e6f3812fbbb317c5b7cf2d1a6 Merge: aa3a8e6 d68e7e9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:32:11 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit aa3a8e620bab20b67087c051cf252ca410eaaaa6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:32:11 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d68e7e924e1917ce83b105380bf909dcb1496c26 Merge: a0ce275 7814ac3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:32:09 2015 +0100 [jgitflow-maven-plugin]merging 'release/3.0-rc-10' into 'master' commit 7814ac332e8dd4c0ec2bb6daf8e3e1fd660dc4f4 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:30:16 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/3.0-rc-10' with non-snapshot versions commit cc7d12a24642e89da2e39d193c9e7313fa017442 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:29:38 2015 +0100 Ignore Rmi test (not working on our release platform, need to be fixed) Summary of changes: src/test/java/org/nuiton/util/rmi/RmiExporterAndProxyTest.java | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See http://git.nuiton.org/nuiton-utils.git commit cc7d12a24642e89da2e39d193c9e7313fa017442 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:29:38 2015 +0100 Ignore Rmi test (not working on our release platform, need to be fixed) --- src/test/java/org/nuiton/util/rmi/RmiExporterAndProxyTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/nuiton/util/rmi/RmiExporterAndProxyTest.java b/src/test/java/org/nuiton/util/rmi/RmiExporterAndProxyTest.java index ad9e6a5..3d443ad 100644 --- a/src/test/java/org/nuiton/util/rmi/RmiExporterAndProxyTest.java +++ b/src/test/java/org/nuiton/util/rmi/RmiExporterAndProxyTest.java @@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; +import org.junit.Ignore; import java.io.InvalidObjectException; import java.rmi.NotBoundException; @@ -33,6 +34,7 @@ import java.rmi.NotBoundException; /** * @author Arnaud Thimel <thimel@codelutin.com> */ +@Ignore public class RmiExporterAndProxyTest { /** Logger. */ -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See http://git.nuiton.org/nuiton-utils.git commit 7814ac332e8dd4c0ec2bb6daf8e3e1fd660dc4f4 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:30:16 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/3.0-rc-10' with non-snapshot versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f6ce82e..ec0a541 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-10-SNAPSHOT</version> + <version>3.0-rc-10</version> <name>Nuiton Utils</name> <description>Library of usefull class to be used in any project.</description> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See http://git.nuiton.org/nuiton-utils.git commit d68e7e924e1917ce83b105380bf909dcb1496c26 Merge: a0ce275 7814ac3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:32:09 2015 +0100 [jgitflow-maven-plugin]merging 'release/3.0-rc-10' into 'master' pom.xml | 15 ++++++--------- src/main/java/org/nuiton/util/FileUtil.java | 7 ++----- .../org/nuiton/util/version/VersionComparator.java | 22 ++++++++++++++++++++++ src/site/site.xml | 10 ++++++++++ .../nuiton/util/rmi/RmiExporterAndProxyTest.java | 2 ++ 5 files changed, 42 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See http://git.nuiton.org/nuiton-utils.git commit aa3a8e620bab20b67087c051cf252ca410eaaaa6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:32:11 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1771b4..ec0a541 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-rc-10</version> <name>Nuiton Utils</name> <description>Library of usefull class to be used in any project.</description> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See http://git.nuiton.org/nuiton-utils.git commit 510be19326c9873e6f3812fbbb317c5b7cf2d1a6 Merge: aa3a8e6 d68e7e9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:32:11 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' src/test/java/org/nuiton/util/rmi/RmiExporterAndProxyTest.java | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See http://git.nuiton.org/nuiton-utils.git commit fa07d0b77f772d9ded1cc53723312aa048e62922 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 21:32:12 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec0a541..d1771b4 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-10</version> + <version>3.0-SNAPSHOT</version> <name>Nuiton Utils</name> <description>Library of usefull class to be used in any project.</description> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm