branch develop updated (dbb1675 -> 81d0f49)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jmexico. See http://git.codelutin.com/jmexico.git from dbb1675 [jgitflow-maven-plugin]updating poms for 0.11.2-SNAPSHOT development new 8491a56 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds efdec01 [maven-release-plugin] copy for tag jmexico-0.11 new 58f24ba [jgitflow-maven-plugin]updating poms for branch'release/0.11.1' with non-snapshot versions new 7c9e403 [jgitflow-maven-plugin]merging 'release/0.11.1' into 'master' new 031d85a [jgitflow-maven-plugin]merging 'master' into 'develop' new 81d0f49 [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 81d0f49fd388e8ed81fcb1368e97ba1878bd32c9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 17:08:13 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 031d85a0d7e98b95758571d64e49661693418081 Merge: 8491a56 7c9e403 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 17:08:13 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 8491a5626a1507fcfa26fda1e471b52a9d2c955b Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 17:08:13 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 7c9e4034c72d4d62217c52c530b5ca1524546e31 Merge: efdec01 58f24ba Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 17:08:12 2016 +0100 [jgitflow-maven-plugin]merging 'release/0.11.1' into 'master' commit 58f24ba50812fed00c5b25b61212dcc2b12330fa Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 17:07:03 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.11.1' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jmexico. See http://git.codelutin.com/jmexico.git commit 58f24ba50812fed00c5b25b61212dcc2b12330fa Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 17:07:03 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.11.1' with non-snapshot versions --- jmexico-editor-demo/pom.xml | 2 +- jmexico-editor/pom.xml | 2 +- jmexico-model/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jmexico-editor-demo/pom.xml b/jmexico-editor-demo/pom.xml index 2189ca2..d1dbdf6 100644 --- a/jmexico-editor-demo/pom.xml +++ b/jmexico-editor-demo/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.1-SNAPSHOT</version> + <version>0.11.1</version> </parent> <artifactId>jmexico-editor-demo</artifactId> diff --git a/jmexico-editor/pom.xml b/jmexico-editor/pom.xml index 3075395..c9d29cd 100644 --- a/jmexico-editor/pom.xml +++ b/jmexico-editor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.1-SNAPSHOT</version> + <version>0.11.1</version> </parent> <artifactId>jmexico-editor</artifactId> diff --git a/jmexico-model/pom.xml b/jmexico-model/pom.xml index e68fdd7..ceb2d76 100644 --- a/jmexico-model/pom.xml +++ b/jmexico-model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.1-SNAPSHOT</version> + <version>0.11.1</version> </parent> <artifactId>jmexico-model</artifactId> diff --git a/pom.xml b/pom.xml index bafc246..8355785 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.1-SNAPSHOT</version> + <version>0.11.1</version> <packaging>pom</packaging> <name>JMexico</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jmexico. See http://git.codelutin.com/jmexico.git commit 7c9e4034c72d4d62217c52c530b5ca1524546e31 Merge: efdec01 58f24ba Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 17:08:12 2016 +0100 [jgitflow-maven-plugin]merging 'release/0.11.1' into 'master' .gitignore | 18 + LICENSE.txt | 827 ++++++++++++++++---- jmexico-editor-demo/LICENSE.txt | 828 +++++++++++++++++---- jmexico-editor-demo/pom.xml | 5 +- .../src/license/THIRD-PARTY.properties | 8 +- jmexico-editor-demo/src/main/assembly/bin.xml | 15 +- .../editor/demo/MexicoEditorDemoUI.css | 15 +- .../editor/demo/MexicoEditorDemoUI.jaxx | 15 +- .../editor/demo/MexicoEditorDemoUIHandler.java | 19 +- .../editor/demo/MexicoEditorDemoUIModel.java | 17 +- .../editor/demo/RunMexicoEditorDemo.java | 18 +- .../src/main/resources/log4j.properties | 15 +- jmexico-editor-demo/src/site/rst/index.rst | 16 +- jmexico-editor-demo/src/site/site_fr.xml | 23 +- jmexico-editor/LICENSE.txt | 828 +++++++++++++++++---- jmexico-editor/pom.xml | 9 +- .../reseaumexico/editor/AbstractScenarioModel.java | 19 +- .../fr/reseaumexico/editor/CloneScenarioModel.java | 16 +- .../fr/reseaumexico/editor/CloneScenarioPanel.css | 16 +- .../fr/reseaumexico/editor/CloneScenarioPanel.jaxx | 30 +- .../reseaumexico/editor/ExportScenarioModel.java | 18 +- .../fr/reseaumexico/editor/ExportScenarioPanel.css | 14 +- .../reseaumexico/editor/ExportScenarioPanel.jaxx | 54 +- .../editor/FactorNameCellRenderer.java | 61 ++ .../editor/ImportScenarioListener.java | 16 +- .../reseaumexico/editor/ImportScenarioModel.java | 20 +- .../fr/reseaumexico/editor/ImportScenarioPanel.css | 14 +- .../reseaumexico/editor/ImportScenarioPanel.jaxx | 18 +- .../fr/reseaumexico/editor/InputDesignEditor.css | 16 +- .../fr/reseaumexico/editor/InputDesignEditor.jaxx | 15 +- .../editor/InputDesignEditorHandler.java | 93 ++- .../editor/InputDesignEditorModel.java | 16 +- .../fr/reseaumexico/editor/InputDesignTable.java | 23 +- .../editor/MexicoDecoratorProvider.java | 63 -- .../reseaumexico/editor/RenameScenarioModel.java | 14 +- .../fr/reseaumexico/editor/RenameScenarioPanel.css | 16 +- .../reseaumexico/editor/RenameScenarioPanel.jaxx | 30 +- .../editor/factorValue/FactorValueCellEditor.java | 40 +- .../factorValue/FactorValueCellRenderer.java | 23 +- .../editor/factorValue/FactorValueEditor.jaxx | 15 +- .../factorValue/FactorValueEditorFactory.java | 28 +- jmexico-editor/src/main/resources/log4j.properties | 15 +- .../src/site/site_fr.xml | 24 +- jmexico-model/LICENSE.txt | 828 +++++++++++++++++---- jmexico-model/pom.xml | 7 +- .../fr/reseaumexico/model/AbstractMexicoBean.java | 16 +- .../fr/reseaumexico/model/DateFormatFactory.java | 18 +- .../fr/reseaumexico/model/InputDesignImpl.java | 23 +- .../model/MexicoTechnicalException.java | 17 +- .../java/fr/reseaumexico/model/MexicoUtil.java | 20 +- .../fr/reseaumexico/model/MexicoXmlConstant.java | 50 +- .../java/fr/reseaumexico/model/ScenarioImpl.java | 20 +- .../model/event/InputDesignFactorEvent.java | 17 +- .../model/event/InputDesignScenarioEvent.java | 18 +- .../model/event/ScenarioFactorValueEvent.java | 18 +- .../model/parser/ExperimentDesignParser.java | 17 +- .../model/parser/InputDesignParser.java | 17 +- .../reseaumexico/model/parser/MexicoXmlParser.java | 17 +- .../model/parser/ScenarioCSVParser.java | 38 +- .../model/parser/ScenarioXmlParser.java | 16 +- .../fr/reseaumexico/model/parser/XmlParser.java | 17 +- .../model/writer/ExperimentDesignXmlWriter.java | 17 +- .../model/writer/InputDesignXmlWriter.java | 17 +- .../reseaumexico/model/writer/MexicoXmlWriter.java | 20 +- .../model/writer/ScenarioXmlWriter.java | 16 +- .../java/fr/reseaumexico/model/writer/XmlNode.java | 28 +- .../fr/reseaumexico/model/writer/XmlWriter.java | 22 +- jmexico-model/src/main/xmi/mexico.properties | 15 +- jmexico-model/src/site/rst/index.rst | 16 +- jmexico-model/src/site/site_fr.xml | 23 +- pom.xml | 74 +- src/site/resources/examples/experimentDesign.xml | 15 +- src/site/resources/examples/inputDesign.xml | 15 +- src/site/rst/index.rst | 16 +- src/site/site_fr.xml | 57 +- 75 files changed, 3462 insertions(+), 1466 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jmexico. See http://git.codelutin.com/jmexico.git commit 8491a5626a1507fcfa26fda1e471b52a9d2c955b Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 17:08:13 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- jmexico-editor-demo/pom.xml | 2 +- jmexico-editor/pom.xml | 2 +- jmexico-model/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jmexico-editor-demo/pom.xml b/jmexico-editor-demo/pom.xml index 2be197f..d1dbdf6 100644 --- a/jmexico-editor-demo/pom.xml +++ b/jmexico-editor-demo/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.2-SNAPSHOT</version> + <version>0.11.1</version> </parent> <artifactId>jmexico-editor-demo</artifactId> diff --git a/jmexico-editor/pom.xml b/jmexico-editor/pom.xml index dd9adb6..c9d29cd 100644 --- a/jmexico-editor/pom.xml +++ b/jmexico-editor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.2-SNAPSHOT</version> + <version>0.11.1</version> </parent> <artifactId>jmexico-editor</artifactId> diff --git a/jmexico-model/pom.xml b/jmexico-model/pom.xml index ae943c8..ceb2d76 100644 --- a/jmexico-model/pom.xml +++ b/jmexico-model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.2-SNAPSHOT</version> + <version>0.11.1</version> </parent> <artifactId>jmexico-model</artifactId> diff --git a/pom.xml b/pom.xml index 880d3b7..8355785 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.2-SNAPSHOT</version> + <version>0.11.1</version> <packaging>pom</packaging> <name>JMexico</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jmexico. See http://git.codelutin.com/jmexico.git commit 031d85a0d7e98b95758571d64e49661693418081 Merge: 8491a56 7c9e403 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 17:08:13 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jmexico. See http://git.codelutin.com/jmexico.git commit 81d0f49fd388e8ed81fcb1368e97ba1878bd32c9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 17:08:13 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- jmexico-editor-demo/pom.xml | 2 +- jmexico-editor/pom.xml | 2 +- jmexico-model/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jmexico-editor-demo/pom.xml b/jmexico-editor-demo/pom.xml index d1dbdf6..2be197f 100644 --- a/jmexico-editor-demo/pom.xml +++ b/jmexico-editor-demo/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.1</version> + <version>0.11.2-SNAPSHOT</version> </parent> <artifactId>jmexico-editor-demo</artifactId> diff --git a/jmexico-editor/pom.xml b/jmexico-editor/pom.xml index c9d29cd..dd9adb6 100644 --- a/jmexico-editor/pom.xml +++ b/jmexico-editor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.1</version> + <version>0.11.2-SNAPSHOT</version> </parent> <artifactId>jmexico-editor</artifactId> diff --git a/jmexico-model/pom.xml b/jmexico-model/pom.xml index ceb2d76..ae943c8 100644 --- a/jmexico-model/pom.xml +++ b/jmexico-model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.1</version> + <version>0.11.2-SNAPSHOT</version> </parent> <artifactId>jmexico-model</artifactId> diff --git a/pom.xml b/pom.xml index 8355785..880d3b7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.reseaumexico</groupId> <artifactId>jmexico</artifactId> - <version>0.11.1</version> + <version>0.11.2-SNAPSHOT</version> <packaging>pom</packaging> <name>JMexico</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm