branch develop updated (ff909be -> 5ee8c04)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-j2r. See https://gitlab.nuiton.org/nuiton/nuiton-j2r.git from ff909be [jgitflow-maven-plugin]updating poms for 1.2.1-SNAPSHOT development new 27d5a56 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new f59702b [jgitflow-maven-plugin]updating poms for branch'release/1.2' with non-snapshot versions new 93535d3 [jgitflow-maven-plugin]merging 'release/1.2' into 'master' new b519011 [jgitflow-maven-plugin]merging 'master' into 'develop' new 5ee8c04 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 5ee8c04e9a8ed7aa8c43585175f22d1d722a289f Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 14:34:32 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b5190116224e5173ef3669f8adc041090093c033 Merge: 27d5a56 93535d3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 14:34:32 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 27d5a56df987815a3efac7c27ecb3aac445151fa Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 14:34:31 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 93535d361cfe659645dd926046f08a00cd3e5fac Merge: 2bc67f9 f59702b Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 14:34:31 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.2' into 'master' commit f59702b42de6eb2a8822d77b104a4f5330606489 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 14:34:17 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.2' with non-snapshot versions Summary of changes: -- 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-j2r. See https://gitlab.nuiton.org/nuiton/nuiton-j2r.git commit f59702b42de6eb2a8822d77b104a4f5330606489 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 14:34:17 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.2' with non-snapshot versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0ee30c3..f6e6738 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>nuiton-j2r</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> <name>Nuiton Java-2-R</name> <description>Librairie permettant d'utiliser R en Java, que ce soit par le Network ou en JNI. -- 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-j2r. See https://gitlab.nuiton.org/nuiton/nuiton-j2r.git commit 93535d361cfe659645dd926046f08a00cd3e5fac Merge: 2bc67f9 f59702b Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 14:34:31 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.2' into 'master' .gitignore | 7 + README.md | 27 +++ README.txt | 24 --- pom.xml | 195 ++++++++------------- src/license/THIRD-PARTY.properties | 19 -- src/main/assembly/deps.xml | 7 +- src/main/assembly/full.xml | 7 +- src/main/java/org/nuiton/j2r/REngine.java | 7 +- src/main/java/org/nuiton/j2r/REngineAbstract.java | 7 +- src/main/java/org/nuiton/j2r/RException.java | 7 +- src/main/java/org/nuiton/j2r/RInstructions.java | 7 +- src/main/java/org/nuiton/j2r/RProxy.java | 7 +- src/main/java/org/nuiton/j2r/jni/RJniEngine.java | 9 +- src/main/java/org/nuiton/j2r/jni/RNative.java | 17 +- src/main/java/org/nuiton/j2r/net/RNetEngine.java | 7 +- src/main/java/org/nuiton/j2r/types/RDataFrame.java | 7 +- src/main/java/org/nuiton/j2r/types/REXP.java | 7 +- .../java/org/nuiton/j2r/types/REXPAbstract.java | 7 +- src/main/java/org/nuiton/j2r/types/RList.java | 7 +- src/site/rst/etude.rst | 28 ++- src/site/rst/index.rst | 23 ++- src/site/rst/installTest.rst | 7 +- src/site/rst/installation.rst | 7 +- src/site/rst/module.rst | 37 ++-- src/site/site.xml | 151 +++++++--------- .../java/org/nuiton/j2r/AbstractEngineTest.java | 7 +- src/test/java/org/nuiton/j2r/DataframeTest.java | 7 +- src/test/java/org/nuiton/j2r/JNITest.java | 7 +- src/test/java/org/nuiton/j2r/JPurTest.java | 7 +- src/test/java/org/nuiton/j2r/ListTest.java | 7 +- src/test/java/org/nuiton/j2r/LutinTimer.java | 7 +- src/test/java/org/nuiton/j2r/NetTest.java | 7 +- src/test/java/org/nuiton/j2r/TestConstants.java | 7 +- src/test/resources/log4j.properties | 7 +- 34 files changed, 264 insertions(+), 434 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-j2r. See https://gitlab.nuiton.org/nuiton/nuiton-j2r.git commit 27d5a56df987815a3efac7c27ecb3aac445151fa Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 14:34:31 2017 +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 5909c83..f6e6738 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>nuiton-j2r</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2</version> <name>Nuiton Java-2-R</name> <description>Librairie permettant d'utiliser R en Java, que ce soit par le Network ou en JNI. -- 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-j2r. See https://gitlab.nuiton.org/nuiton/nuiton-j2r.git commit b5190116224e5173ef3669f8adc041090093c033 Merge: 27d5a56 93535d3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 14:34:32 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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-j2r. See https://gitlab.nuiton.org/nuiton/nuiton-j2r.git commit 5ee8c04e9a8ed7aa8c43585175f22d1d722a289f Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 14:34:32 2017 +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 f6e6738..5909c83 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>nuiton-j2r</artifactId> - <version>1.2</version> + <version>1.2.1-SNAPSHOT</version> <name>Nuiton Java-2-R</name> <description>Librairie permettant d'utiliser R en Java, que ce soit par le Network ou en JNI. -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm