[i18n] branch develop updated (e1de9fb -> 004b464)
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 e1de9fb [jgitflow-maven-plugin]updating poms for 3.4-SNAPSHOT development new f36b8df [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 9a7be4d [jgitflow-maven-plugin]updating poms for branch'release/3.3' with non-snapshot versions new 77a8a5d - optimize dependencies - fix license headers - update third parties new cd280d7 optimize dependencies new 343e5a2 Merge branch 'release/3.3' new 81c4bf8 Merge branch 'master' into develop new 004b464 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 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 004b464bc38d7e1396f2b13daa7224188cc4f421 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:36:05 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 81c4bf83cfbe5b9e5ddcd82243c7ede66a574285 Merge: f36b8df 343e5a2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:36:05 2014 +0200 Merge branch 'master' into develop commit f36b8df6361fcf71d247f797bda2edb918fb99f7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:36:05 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 343e5a2ddcb28510d965aa5f696157dda9cc2c4e Merge: ea1d988 cd280d7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:36:03 2014 +0200 Merge branch 'release/3.3' commit cd280d729f62fe93ddccacdbdda76dbe4e3cf170 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:34:49 2014 +0200 optimize dependencies commit 77a8a5d2c01b4a6998593cfe2bfdd8c3551f994c Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:32:42 2014 +0200 - optimize dependencies - fix license headers - update third parties commit 9a7be4deeb7f69f75801047f22a5e37f3e5d35cd Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:29:03 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.3' with non-snapshot versions Summary of changes: i18n-maven-plugin/pom.xml | 5 +++++ .../src/license/THIRD-PARTY.properties | 8 +++++++- .../i18n/plugin/AbstractI18nGenerateMojo.java | 22 ++++++++++++++++++++++ .../main/java/org/nuiton/i18n/plugin/I18nUtil.java | 22 ++++++++++++++++++++++ .../plugin/bundle/csv/AbstractCsvBundleMojo.java | 22 ++++++++++++++++++++++ .../plugin/bundle/csv/GenerateCsvBundleMojo.java | 22 ++++++++++++++++++++++ .../i18n/plugin/bundle/csv/I18nBundleModel.java | 22 ++++++++++++++++++++++ .../i18n/plugin/bundle/csv/I18nBundleModelRow.java | 22 ++++++++++++++++++++++ .../plugin/bundle/csv/MergeBackCsvBundleMojo.java | 22 ++++++++++++++++++++++ .../i18n/plugin/bundle/csv/SplitCsvBundleMojo.java | 22 ++++++++++++++++++++++ pom.xml | 6 ++++++ 11 files changed, 194 insertions(+), 1 deletion(-) -- 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 9a7be4deeb7f69f75801047f22a5e37f3e5d35cd Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:29:03 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.3' 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 ca94a48..f1e66af 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.3</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index 61c519d..2fb54b2 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.3</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index 10390eb..2052fa3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3</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 77a8a5d2c01b4a6998593cfe2bfdd8c3551f994c Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:32:42 2014 +0200 - optimize dependencies - fix license headers - update third parties --- i18n-maven-plugin/pom.xml | 5 +++++ .../src/license/THIRD-PARTY.properties | 8 +++++++- .../i18n/plugin/AbstractI18nGenerateMojo.java | 22 ++++++++++++++++++++++ .../main/java/org/nuiton/i18n/plugin/I18nUtil.java | 22 ++++++++++++++++++++++ .../plugin/bundle/csv/AbstractCsvBundleMojo.java | 22 ++++++++++++++++++++++ .../plugin/bundle/csv/GenerateCsvBundleMojo.java | 22 ++++++++++++++++++++++ .../i18n/plugin/bundle/csv/I18nBundleModel.java | 22 ++++++++++++++++++++++ .../i18n/plugin/bundle/csv/I18nBundleModelRow.java | 22 ++++++++++++++++++++++ .../plugin/bundle/csv/MergeBackCsvBundleMojo.java | 22 ++++++++++++++++++++++ .../i18n/plugin/bundle/csv/SplitCsvBundleMojo.java | 22 ++++++++++++++++++++++ 10 files changed, 188 insertions(+), 1 deletion(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index f1e66af..b845cd3 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -55,6 +55,11 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> <dependency> <groupId>org.antlr</groupId> diff --git a/i18n-maven-plugin/src/license/THIRD-PARTY.properties b/i18n-maven-plugin/src/license/THIRD-PARTY.properties index ea08f8c..db5e303 100644 --- a/i18n-maven-plugin/src/license/THIRD-PARTY.properties +++ b/i18n-maven-plugin/src/license/THIRD-PARTY.properties @@ -1,21 +1,27 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - Eclipse Public License, Version 1.0 +# - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 +# - The BSD License # - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 07:31:47 CEST 2011 +#Fri Aug 01 08:29:40 CEST 2014 classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nGenerateMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nGenerateMojo.java index 99f5c13..037c9b9 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nGenerateMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nGenerateMojo.java @@ -1,5 +1,27 @@ package org.nuiton.i18n.plugin; +/* + * #%L + * I18n :: Maven Plugin + * %% + * Copyright (C) 2007 - 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% + */ + import org.apache.maven.plugins.annotations.Parameter; import java.io.File; diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/I18nUtil.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/I18nUtil.java index 90a98c9..1aa559d 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/I18nUtil.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/I18nUtil.java @@ -1,5 +1,27 @@ package org.nuiton.i18n.plugin; +/* + * #%L + * I18n :: Maven Plugin + * %% + * Copyright (C) 2007 - 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% + */ + import org.nuiton.plugin.PluginHelper; import java.io.File; diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/AbstractCsvBundleMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/AbstractCsvBundleMojo.java index fc4201f..6459fc9 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/AbstractCsvBundleMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/AbstractCsvBundleMojo.java @@ -1,5 +1,27 @@ package org.nuiton.i18n.plugin.bundle.csv; +/* + * #%L + * I18n :: Maven Plugin + * %% + * Copyright (C) 2007 - 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% + */ + import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.plugin.AbstractI18nMojo; diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/GenerateCsvBundleMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/GenerateCsvBundleMojo.java index 2f9ed92..0c37815 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/GenerateCsvBundleMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/GenerateCsvBundleMojo.java @@ -1,5 +1,27 @@ package org.nuiton.i18n.plugin.bundle.csv; +/* + * #%L + * I18n :: Maven Plugin + * %% + * Copyright (C) 2007 - 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% + */ + import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/I18nBundleModel.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/I18nBundleModel.java index 020a65b..6f2f732 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/I18nBundleModel.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/I18nBundleModel.java @@ -1,5 +1,27 @@ package org.nuiton.i18n.plugin.bundle.csv; +/* + * #%L + * I18n :: Maven Plugin + * %% + * Copyright (C) 2007 - 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% + */ + import org.nuiton.csv.ValueGetterSetter; import org.nuiton.csv.ext.AbstractImportExportModel; diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/I18nBundleModelRow.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/I18nBundleModelRow.java index 0c78852..e326794 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/I18nBundleModelRow.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/I18nBundleModelRow.java @@ -1,5 +1,27 @@ package org.nuiton.i18n.plugin.bundle.csv; +/* + * #%L + * I18n :: Maven Plugin + * %% + * Copyright (C) 2007 - 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% + */ + import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/MergeBackCsvBundleMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/MergeBackCsvBundleMojo.java index 5f39276..413a8a6 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/MergeBackCsvBundleMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/MergeBackCsvBundleMojo.java @@ -1,5 +1,27 @@ package org.nuiton.i18n.plugin.bundle.csv; +/* + * #%L + * I18n :: Maven Plugin + * %% + * Copyright (C) 2007 - 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% + */ + import com.google.common.collect.Lists; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/SplitCsvBundleMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/SplitCsvBundleMojo.java index a0237d9..a865e6b 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/SplitCsvBundleMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/SplitCsvBundleMojo.java @@ -1,5 +1,27 @@ package org.nuiton.i18n.plugin.bundle.csv; +/* + * #%L + * I18n :: Maven Plugin + * %% + * Copyright (C) 2007 - 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% + */ + import com.google.common.collect.Lists; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -- 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 cd280d729f62fe93ddccacdbdda76dbe4e3cf170 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:34:49 2014 +0200 optimize dependencies --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 2052fa3..f2a00ca 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,12 @@ <dependencies> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>17.0</version> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> <version>4.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 343e5a2ddcb28510d965aa5f696157dda9cc2c4e Merge: ea1d988 cd280d7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:36:03 2014 +0200 Merge branch 'release/3.3' i18n-maven-plugin/pom.xml | 12 +- .../src/license/THIRD-PARTY.properties | 8 +- .../i18n/plugin/AbstractI18nGenerateMojo.java | 88 +++++++ .../org/nuiton/i18n/plugin/AbstractI18nMojo.java | 111 +------- .../java/org/nuiton/i18n/plugin/GenerateMojo.java | 35 ++- .../java/org/nuiton/i18n/plugin/GetterMojo.java | 14 +- .../main/java/org/nuiton/i18n/plugin/I18nUtil.java | 63 +++++ .../i18n/plugin/bundle/AbstractI18nBundleMojo.java | 5 +- .../plugin/bundle/AbstractMakeI18nBundleMojo.java | 284 --------------------- .../org/nuiton/i18n/plugin/bundle/BundleMojo.java | 245 +++++++++++++++++- .../plugin/bundle/CollectI18nArtifactsMojo.java | 4 + .../i18n/plugin/bundle/TapestryBundleMojo.java | 190 -------------- .../plugin/bundle/csv/AbstractCsvBundleMojo.java | 44 ++++ .../plugin/bundle/csv/GenerateCsvBundleMojo.java | 277 ++++++++++++++++++++ .../i18n/plugin/bundle/csv/I18nBundleModel.java | 66 +++++ .../i18n/plugin/bundle/csv/I18nBundleModelRow.java | 57 +++++ .../plugin/bundle/csv/MergeBackCsvBundleMojo.java | 147 +++++++++++ .../i18n/plugin/bundle/csv/SplitCsvBundleMojo.java | 146 +++++++++++ .../i18n/plugin/parser/AbstractI18nParserMojo.java | 34 ++- i18n-maven-plugin/src/site/apt/index.apt | 6 + i18n-maven-plugin/src/site/apt/usages.apt | 30 +++ i18n-maven-plugin/src/site/site_en.xml | 15 +- i18n-maven-plugin/src/site/site_fr.xml | 15 +- nuiton-i18n/pom.xml | 32 ++- nuiton-i18n/src/site/site_en.xml | 12 - nuiton-i18n/src/site/site_fr.xml | 12 - pom.xml | 14 +- src/site/site_en.xml | 7 +- src/site/site_fr.xml | 3 +- 29 files changed, 1312 insertions(+), 664 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 f36b8df6361fcf71d247f797bda2edb918fb99f7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:36:05 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 846faa9..f1e66af 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.4-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index b0c460d..2fb54b2 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.4-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index 3825201..2052fa3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.3</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 81c4bf83cfbe5b9e5ddcd82243c7ede66a574285 Merge: f36b8df 343e5a2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:36:05 2014 +0200 Merge branch 'master' into develop i18n-maven-plugin/pom.xml | 5 +++++ .../src/license/THIRD-PARTY.properties | 8 +++++++- .../i18n/plugin/AbstractI18nGenerateMojo.java | 22 ++++++++++++++++++++++ .../main/java/org/nuiton/i18n/plugin/I18nUtil.java | 22 ++++++++++++++++++++++ .../plugin/bundle/csv/AbstractCsvBundleMojo.java | 22 ++++++++++++++++++++++ .../plugin/bundle/csv/GenerateCsvBundleMojo.java | 22 ++++++++++++++++++++++ .../i18n/plugin/bundle/csv/I18nBundleModel.java | 22 ++++++++++++++++++++++ .../i18n/plugin/bundle/csv/I18nBundleModelRow.java | 22 ++++++++++++++++++++++ .../plugin/bundle/csv/MergeBackCsvBundleMojo.java | 22 ++++++++++++++++++++++ .../i18n/plugin/bundle/csv/SplitCsvBundleMojo.java | 22 ++++++++++++++++++++++ pom.xml | 6 ++++++ 11 files changed, 194 insertions(+), 1 deletion(-) -- 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 004b464bc38d7e1396f2b13daa7224188cc4f421 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 1 08:36:05 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 b845cd3..8c62c88 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</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index 2fb54b2..b0c460d 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</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index f2a00ca..44a57d2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.3</version> + <version>3.4-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