branch develop updated (7652052 -> 78433ce)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git from 7652052 Use nuitonpom maven helper plugin version new 0a8409b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 77874f2 [jgitflow-maven-plugin]updating poms for 3.0-alpha-5 branch with snapshot versions new ea1b90a [jgitflow-maven-plugin]updating poms for branch'release/3.0-alpha-5' with non-snapshot versions new f032386 Add missing license header new bd5b95b [jgitflow-maven-plugin]merging 'release/3.0-alpha-5' into 'master' new 51266d0 [jgitflow-maven-plugin]merging 'master' into 'develop' new 78433ce [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 78433ce6a436979ae35d9cfe64483cf502efcddb Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:55:50 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 51266d08b120838ea388bd30a2af862be2eb66e7 Merge: 0a8409b bd5b95b Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:55:50 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 0a8409bbb65da14640bda36d30eb75f48cb10d1d Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:55:50 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit bd5b95b7d846ab12f17be4757032619b6d5f54e8 Merge: 9c8bbc0 f032386 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:55:49 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.0-alpha-5' into 'master' commit f0323867d70f3b336486036c49c26068137f4042 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:55:40 2016 +0200 Add missing license header commit ea1b90a48e230a0b48ddd7991727629c0349a184 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:52:45 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.0-alpha-5' with non-snapshot versions Summary of changes: .../java/org/nuiton/eugene/ResourcesHelper.java | 22 ++++++++++++++++++++++ 1 file changed, 22 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 eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit ea1b90a48e230a0b48ddd7991727629c0349a184 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:52:45 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.0-alpha-5' with non-snapshot versions --- eugene-java-templates/pom.xml | 2 +- eugene-maven-plugin/pom.xml | 2 +- eugene-plantuml-templates/pom.xml | 2 +- eugene-yaml-templates/pom.xml | 2 +- eugene/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eugene-java-templates/pom.xml b/eugene-java-templates/pom.xml index 062b1c6..dfeaf61 100644 --- a/eugene-java-templates/pom.xml +++ b/eugene-java-templates/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-5-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-maven-plugin/pom.xml b/eugene-maven-plugin/pom.xml index c5ea3b3..a751ca8 100644 --- a/eugene-maven-plugin/pom.xml +++ b/eugene-maven-plugin/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-5-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-plantuml-templates/pom.xml b/eugene-plantuml-templates/pom.xml index 5e4d4de..f879dbc 100644 --- a/eugene-plantuml-templates/pom.xml +++ b/eugene-plantuml-templates/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-5-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-yaml-templates/pom.xml b/eugene-yaml-templates/pom.xml index 35baa9c..f42367a 100644 --- a/eugene-yaml-templates/pom.xml +++ b/eugene-yaml-templates/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-5-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene/pom.xml b/eugene/pom.xml index 11c93e9..eb58ccd 100644 --- a/eugene/pom.xml +++ b/eugene/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-5-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/pom.xml b/pom.xml index 66996a4..f80b009 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>3.0-alpha-5-SNAPSHOT</version> + <version>3.0-alpha-5</version> <packaging>pom</packaging> <name>EUGene</name> -- 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 eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit f0323867d70f3b336486036c49c26068137f4042 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:55:40 2016 +0200 Add missing license header --- .../java/org/nuiton/eugene/ResourcesHelper.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/eugene/src/main/java/org/nuiton/eugene/ResourcesHelper.java b/eugene/src/main/java/org/nuiton/eugene/ResourcesHelper.java index a0369a9..e1b63a8 100644 --- a/eugene/src/main/java/org/nuiton/eugene/ResourcesHelper.java +++ b/eugene/src/main/java/org/nuiton/eugene/ResourcesHelper.java @@ -1,5 +1,27 @@ package org.nuiton.eugene; +/* + * #%L + * EUGene :: EUGene + * %% + * Copyright (C) 2004 - 2016 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.logging.Log; import org.apache.commons.logging.LogFactory; -- 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 eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit bd5b95b7d846ab12f17be4757032619b6d5f54e8 Merge: 9c8bbc0 f032386 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:55:49 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.0-alpha-5' into 'master' .gitignore | 5 + README.txt => README.md | 0 changelog.txt | 12 --- .../README.md | 0 eugene-java-templates/README.txt | 0 eugene-java-templates/changelog.txt | 0 eugene-java-templates/pom.xml | 2 +- .../eugene/java/AbstractJavaBeanTransformer.java | 2 +- eugene/README.txt => eugene-maven-plugin/README.md | 0 eugene-maven-plugin/changelog.txt | 57 ----------- eugene-maven-plugin/pom.xml | 2 +- .../it/evol-879/model/{README.txt => README.md} | 0 .../src/it/evol-879/xmi/{README.txt => README.md} | 0 .../it/evol-879/zargo/{README.txt => README.md} | 0 .../testIncludeWithNoProtocol/README.md} | 0 .../{README.txt => README.md} | 0 .../{generators/README.txt => all/README.md} | 0 .../src/it/generate/all/changelog.txt | 53 ---------- .../{all/README.txt => generators/README.md} | 0 .../src/it/generate/generators/changelog.txt | 53 ---------- .../only-zargo-xmi/{README.txt => README.md} | 0 .../README.txt => generate/only-zargo/README.md} | 0 .../README.md | 0 eugene-plantuml-templates/README.txt | 0 eugene-plantuml-templates/pom.xml | 2 +- .../README.md | 0 eugene-yaml-templates/pom.xml | 2 +- eugene-maven-plugin/README.txt => eugene/README.md | 0 eugene/changelog.txt | 113 --------------------- eugene/pom.xml | 2 +- .../java/org/nuiton/eugene/ResourcesHelper.java | 110 ++++++++++++++++++++ .../src/main/java/org/nuiton/eugene/Template.java | 7 ++ .../eugene/java/ObjectModelTransformerToJava.java | 25 ++--- pom.xml | 27 +++-- src/site/site_en.xml | 10 -- src/site/site_fr.xml | 10 -- 36 files changed, 147 insertions(+), 347 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 eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit 0a8409bbb65da14640bda36d30eb75f48cb10d1d Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:55:50 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- eugene-java-templates/pom.xml | 2 +- eugene-maven-plugin/pom.xml | 2 +- eugene-plantuml-templates/pom.xml | 2 +- eugene-yaml-templates/pom.xml | 2 +- eugene/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eugene-java-templates/pom.xml b/eugene-java-templates/pom.xml index 1c2950f..dfeaf61 100644 --- a/eugene-java-templates/pom.xml +++ b/eugene-java-templates/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-maven-plugin/pom.xml b/eugene-maven-plugin/pom.xml index e615679..a751ca8 100644 --- a/eugene-maven-plugin/pom.xml +++ b/eugene-maven-plugin/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-plantuml-templates/pom.xml b/eugene-plantuml-templates/pom.xml index 8dfbcd3..f879dbc 100644 --- a/eugene-plantuml-templates/pom.xml +++ b/eugene-plantuml-templates/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-yaml-templates/pom.xml b/eugene-yaml-templates/pom.xml index aec2638..f42367a 100644 --- a/eugene-yaml-templates/pom.xml +++ b/eugene-yaml-templates/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene/pom.xml b/eugene/pom.xml index 5e0498f..eb58ccd 100644 --- a/eugene/pom.xml +++ b/eugene/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-5</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/pom.xml b/pom.xml index 89153df..f80b009 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-5</version> <packaging>pom</packaging> <name>EUGene</name> -- 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 eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit 51266d08b120838ea388bd30a2af862be2eb66e7 Merge: 0a8409b bd5b95b Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:55:50 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../java/org/nuiton/eugene/ResourcesHelper.java | 22 ++++++++++++++++++++++ 1 file changed, 22 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 eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit 78433ce6a436979ae35d9cfe64483cf502efcddb Author: Maven Release <maven-release@codelutin.com> Date: Sun May 1 14:55:50 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- eugene-java-templates/pom.xml | 2 +- eugene-maven-plugin/pom.xml | 2 +- eugene-plantuml-templates/pom.xml | 2 +- eugene-yaml-templates/pom.xml | 2 +- eugene/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eugene-java-templates/pom.xml b/eugene-java-templates/pom.xml index dfeaf61..1c2950f 100644 --- a/eugene-java-templates/pom.xml +++ b/eugene-java-templates/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-5</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-maven-plugin/pom.xml b/eugene-maven-plugin/pom.xml index a751ca8..e615679 100644 --- a/eugene-maven-plugin/pom.xml +++ b/eugene-maven-plugin/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-5</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-plantuml-templates/pom.xml b/eugene-plantuml-templates/pom.xml index f879dbc..8dfbcd3 100644 --- a/eugene-plantuml-templates/pom.xml +++ b/eugene-plantuml-templates/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-5</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-yaml-templates/pom.xml b/eugene-yaml-templates/pom.xml index f42367a..aec2638 100644 --- a/eugene-yaml-templates/pom.xml +++ b/eugene-yaml-templates/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-5</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene/pom.xml b/eugene/pom.xml index eb58ccd..5e0498f 100644 --- a/eugene/pom.xml +++ b/eugene/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-5</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/pom.xml b/pom.xml index f80b009..89153df 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>3.0-alpha-5</version> + <version>3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>EUGene</name> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm