[i18n] branch develop updated (8ef7be8 -> 67805aa)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository i18n. See http://git.nuiton.org/i18n.git from 8ef7be8 [jgitflow-maven-plugin]updating poms for 3.3-SNAPSHOT development new ffd1f50 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c1a7307 [maven-release-plugin] copy for tag i18n-3.1 new 9e93175 [jgitflow-maven-plugin]updating poms for branch'release/3.2' with non-snapshot versions new 85bcbcd addmissing file headers new ea1d988 Merge branch 'release/3.2' new 317f476 Merge branch 'master' into develop new 67805aa [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 67805aa4490a6250b962e865a956a3396ae7afd5 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:22:57 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 317f476b7e7200e3750f58752dcbd969f432fec9 Merge: ffd1f50 ea1d988 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:22:56 2014 +0200 Merge branch 'master' into develop commit ffd1f5009b245083718656335845feb2f6092356 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:22:56 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ea1d988c33b3035072fc54df2efd002298328226 Merge: c1a7307 85bcbcd Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:22:55 2014 +0200 Merge branch 'release/3.2' commit 85bcbcde99b06267eeedee45a29daae79e67de3c Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:22:34 2014 +0200 addmissing file headers commit 9e9317550bf61ec8468c576a776fb424fb2ea88b Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:20:36 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.2' with non-snapshot versions Summary of changes: src/site/apt/history.apt | 21 +++++++++++++++++++++ src/site/en/apt/history.apt | 21 +++++++++++++++++++++ 2 files changed, 42 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 i18n. See http://git.nuiton.org/i18n.git commit 9e9317550bf61ec8468c576a776fb424fb2ea88b Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:20:36 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.2' with non-snapshot versions --- i18n-maven-plugin/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index b941e08..4dcc297 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index 9e784c9..aa66c64 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index 610180d..6db1fb3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</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 i18n. See http://git.nuiton.org/i18n.git commit 85bcbcde99b06267eeedee45a29daae79e67de3c Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:22:34 2014 +0200 addmissing file headers --- src/site/apt/history.apt | 21 +++++++++++++++++++++ src/site/en/apt/history.apt | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/site/apt/history.apt b/src/site/apt/history.apt index f9dda8e..3d51956 100644 --- a/src/site/apt/history.apt +++ b/src/site/apt/history.apt @@ -1,3 +1,24 @@ +~~~ +~~ #%L +~~ I18n +~~ %% +~~ Copyright (C) 2008 - 2014 CodeLutin +~~ %% +~~ This program is free software: you can redistribute it and/or modify +~~ it under the terms of the GNU Lesser General Public License as +~~ published by the Free Software Foundation, either version 3 of the +~~ License, or (at your option) any later version. +~~ +~~ This program is distributed in the hope that it will be useful, +~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~ GNU General Lesser Public License for more details. +~~ +~~ You should have received a copy of the GNU General Lesser Public +~~ License along with this program. If not, see +~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. +~~ #L% +~~~ Quoi de neuf dans la version 3.0 diff --git a/src/site/en/apt/history.apt b/src/site/en/apt/history.apt index f31b7f2..ef3bced 100644 --- a/src/site/en/apt/history.apt +++ b/src/site/en/apt/history.apt @@ -1,3 +1,24 @@ +~~~ +~~ #%L +~~ I18n +~~ %% +~~ Copyright (C) 2008 - 2014 CodeLutin +~~ %% +~~ This program is free software: you can redistribute it and/or modify +~~ it under the terms of the GNU Lesser General Public License as +~~ published by the Free Software Foundation, either version 3 of the +~~ License, or (at your option) any later version. +~~ +~~ This program is distributed in the hope that it will be useful, +~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~ GNU General Lesser Public License for more details. +~~ +~~ You should have received a copy of the GNU General Lesser Public +~~ License along with this program. If not, see +~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. +~~ #L% +~~~ What's new in 3.0 version -- 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 i18n. See http://git.nuiton.org/i18n.git commit ea1d988c33b3035072fc54df2efd002298328226 Merge: c1a7307 85bcbcd Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:22:55 2014 +0200 Merge branch 'release/3.2' .gitignore | 13 ++ i18n-maven-plugin/pom.xml | 26 +-- .../org/nuiton/i18n/plugin/AbstractI18nMojo.java | 3 +- .../i18n/plugin/parser/impl/ParserJavaMojo.java | 36 ++-- i18n-maven-plugin/src/site/site_en.xml | 22 +-- i18n-maven-plugin/src/site/site_fr.xml | 22 +-- nuiton-i18n-editor/src/site/site_fr.xml | 2 +- nuiton-i18n/pom.xml | 7 +- .../src/main/java/org/nuiton/i18n/I18nUtil.java | 8 +- .../org/nuiton/i18n/bundle/I18nBundleUtil.java | 8 +- .../org/nuiton/util/converter/LocaleConverter.java | 2 + .../org/nuiton/util/converter/package-info.java | 1 + .../org.apache.commons.beanutils.Converter | 1 - nuiton-i18n/src/site/apt/index.apt | 45 ----- nuiton-i18n/src/site/en/apt/index.apt | 45 ----- nuiton-i18n/src/site/site_en.xml | 37 +--- nuiton-i18n/src/site/site_fr.xml | 37 +--- .../nuiton/util/converter/LocaleConverterTest.java | 1 + pom.xml | 97 +++++---- src/site/apt/{index.apt => history.apt} | 39 +--- src/site/apt/index.apt | 219 --------------------- src/site/en/apt/{index.apt => history.apt} | 44 +---- src/site/en/apt/index.apt | 211 -------------------- src/site/site_en.xml | 35 +--- src/site/site_fr.xml | 51 +---- 25 files changed, 139 insertions(+), 873 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 i18n. See http://git.nuiton.org/i18n.git commit ffd1f5009b245083718656335845feb2f6092356 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:22:56 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- i18n-maven-plugin/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index 5458e59..4dcc297 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index 3fb6d9e..aa66c64 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index 74f4392..6db1fb3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</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 i18n. See http://git.nuiton.org/i18n.git commit 317f476b7e7200e3750f58752dcbd969f432fec9 Merge: ffd1f50 ea1d988 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:22:56 2014 +0200 Merge branch 'master' into develop src/site/apt/history.apt | 21 +++++++++++++++++++++ src/site/en/apt/history.apt | 21 +++++++++++++++++++++ 2 files changed, 42 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 i18n. See http://git.nuiton.org/i18n.git commit 67805aa4490a6250b962e865a956a3396ae7afd5 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 23 23:22:57 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- i18n-maven-plugin/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index 4dcc297..5458e59 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index aa66c64..3fb6d9e 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index 6db1fb3..74f4392 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm