branch develop updated (7e6ea92 -> 0141c10)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository eugene. See http://git.nuiton.org/eugene.git from 7e6ea92 Validation fail if "tagValue" is used (Closes #3764) Merge branch 'feature/3764' into develop new c966d04 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6ff39ad [jgitflow-maven-plugin]updating poms for 3.0-alpha-3 branch with snapshot versions new 9c56949 Optimize dependencies new b87fa79 Add missing license headers new e4678e7 [jgitflow-maven-plugin]updating poms for branch'release/3.0-alpha-3' with non-snapshot versions new 38ed821 [jgitflow-maven-plugin]merging 'release/3.0-alpha-3' into 'master' new 9db35c4 [jgitflow-maven-plugin]merging 'master' into 'develop' new 0141c10 [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 0141c10fc4319016141c83a883bf11ffe2f49caf Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:26:01 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9db35c4bb6144551961f88b864bf46fa551bd305 Merge: c966d04 38ed821 Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:26:00 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit c966d04e6b3a4270eb116a52ffaf999b5756ad9e Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:26:00 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 38ed821d5d308605b1b497e402d553c08193c45e Merge: be39714 e4678e7 Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:25:58 2015 +0200 [jgitflow-maven-plugin]merging 'release/3.0-alpha-3' into 'master' commit e4678e7fefc8938460a5f56ec00d67892277f25f Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:23:35 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.0-alpha-3' with non-snapshot versions commit b87fa79fbaeb19127675e32881a3fdf8215a0e1f Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:23:27 2015 +0200 Add missing license headers commit 9c56949d089bedef9b8ea0e163d115a443cd2c44 Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:23:15 2015 +0200 Optimize dependencies Summary of changes: eugene-java-templates/pom.xml | 5 +++++ .../stereotype/MissingStereoTypeException.java | 22 ++++++++++++++++++++++ .../models/tagvalue/MissingTagValueException.java | 22 ++++++++++++++++++++++ 3 files changed, 49 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 http://git.nuiton.org/eugene.git commit 9c56949d089bedef9b8ea0e163d115a443cd2c44 Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:23:15 2015 +0200 Optimize dependencies --- eugene-java-templates/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eugene-java-templates/pom.xml b/eugene-java-templates/pom.xml index bc930bd..dbcd908 100644 --- a/eugene-java-templates/pom.xml +++ b/eugene-java-templates/pom.xml @@ -51,6 +51,11 @@ </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> -- 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 http://git.nuiton.org/eugene.git commit b87fa79fbaeb19127675e32881a3fdf8215a0e1f Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:23:27 2015 +0200 Add missing license headers --- .../stereotype/MissingStereoTypeException.java | 22 ++++++++++++++++++++++ .../models/tagvalue/MissingTagValueException.java | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MissingStereoTypeException.java b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MissingStereoTypeException.java index 346b32e..1b29142 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MissingStereoTypeException.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MissingStereoTypeException.java @@ -1,5 +1,27 @@ package org.nuiton.eugene.models.stereotype; +/* + * #%L + * EUGene :: EUGene + * %% + * Copyright (C) 2004 - 2015 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.base.Joiner; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelPackage; diff --git a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MissingTagValueException.java b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MissingTagValueException.java index b08f3c3..fbf0369 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MissingTagValueException.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/MissingTagValueException.java @@ -1,5 +1,27 @@ package org.nuiton.eugene.models.tagvalue; +/* + * #%L + * EUGene :: EUGene + * %% + * Copyright (C) 2004 - 2015 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.base.Joiner; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelPackage; -- 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 http://git.nuiton.org/eugene.git commit e4678e7fefc8938460a5f56ec00d67892277f25f Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:23:35 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.0-alpha-3' 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 dbcd908..e916cc7 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-3-SNAPSHOT</version> + <version>3.0-alpha-3</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-maven-plugin/pom.xml b/eugene-maven-plugin/pom.xml index af23330..0237f94 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-3-SNAPSHOT</version> + <version>3.0-alpha-3</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-plantuml-templates/pom.xml b/eugene-plantuml-templates/pom.xml index f4e5a60..d5177ce 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-3-SNAPSHOT</version> + <version>3.0-alpha-3</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-yaml-templates/pom.xml b/eugene-yaml-templates/pom.xml index 92aa927..5a4523f 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-3-SNAPSHOT</version> + <version>3.0-alpha-3</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene/pom.xml b/eugene/pom.xml index e181176..35ef6d0 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-3-SNAPSHOT</version> + <version>3.0-alpha-3</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/pom.xml b/pom.xml index ce9fbdb..0f82b82 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>3.0-alpha-3-SNAPSHOT</version> + <version>3.0-alpha-3</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 http://git.nuiton.org/eugene.git commit 38ed821d5d308605b1b497e402d553c08193c45e Merge: be39714 e4678e7 Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:25:58 2015 +0200 [jgitflow-maven-plugin]merging 'release/3.0-alpha-3' into 'master' eugene-java-templates/pom.xml | 7 +- .../eugene/java/AbstractJavaBeanTransformer.java | 109 +++- .../nuiton/eugene/java/JavaBeanTransformer.java | 22 +- .../eugene/java/JavaTemplatesStereoTypes.java | 317 +++++++++++ .../nuiton/eugene/java/JavaTemplatesTagValues.java | 236 ++------ .../eugene/java/SimpleJavaBeanTransformer.java | 269 ++++----- .../SimpleJavaBeanWithNoInterfaceTransformer.java | 600 +++++++++++++++------ .../eugene/java/JavaTemplatesStereoTypesTest.java | 9 +- .../eugene/java/JavaTemplatesTagValuesTest.java | 7 - eugene-maven-plugin/pom.xml | 2 +- .../org/nuiton/eugene/plugin/GenerateMojo.java | 11 +- eugene-plantuml-templates/pom.xml | 2 +- eugene-yaml-templates/pom.xml | 2 +- eugene/pom.xml | 2 +- .../main/java/org/nuiton/eugene/GeneratorUtil.java | 34 ++ .../eugene/java/ObjectModelTransformerToJava.java | 9 + .../main/java/org/nuiton/eugene/models/Model.java | 3 +- .../eugene/models/object/ObjectModelPackage.java | 12 + .../object/reader/AbstractObjectModelReader.java | 191 ++++++- .../eugene/models/object/xml/ObjectModelImpl.java | 21 +- .../models/object/xml/ObjectModelPackageImpl.java | 19 + .../eugene/models/state/xml/StateModelImpl.java | 19 + .../stereotype/MissingStereoTypeException.java | 65 +++ ...ereotypeDefinitionProviderManagerExtension.java | 63 +++ .../stereotype/StereotypeDefinitionProviders.java | 8 +- .../eugene/models/stereotype/Stereotypes.java | 58 +- .../models/tagvalue/MissingTagValueException.java | 68 +++ .../nuiton/eugene/models/tagvalue/TagValues.java | 67 ++- .../eugene/models/tagvalue/TagValuesTest.java | 24 + pom.xml | 12 +- 30 files changed, 1688 insertions(+), 580 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 http://git.nuiton.org/eugene.git commit c966d04e6b3a4270eb116a52ffaf999b5756ad9e Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:26:00 2015 +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 4770a30..a114715 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-3</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-maven-plugin/pom.xml b/eugene-maven-plugin/pom.xml index e615679..0237f94 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-3</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-plantuml-templates/pom.xml b/eugene-plantuml-templates/pom.xml index 8dfbcd3..d5177ce 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-3</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-yaml-templates/pom.xml b/eugene-yaml-templates/pom.xml index aec2638..5a4523f 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-3</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene/pom.xml b/eugene/pom.xml index 5e0498f..35ef6d0 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-3</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/pom.xml b/pom.xml index 8b4d776..0f82b82 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-3</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 http://git.nuiton.org/eugene.git commit 9db35c4bb6144551961f88b864bf46fa551bd305 Merge: c966d04 38ed821 Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:26:00 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' eugene-java-templates/pom.xml | 5 +++++ .../stereotype/MissingStereoTypeException.java | 22 ++++++++++++++++++++++ .../models/tagvalue/MissingTagValueException.java | 22 ++++++++++++++++++++++ 3 files changed, 49 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 http://git.nuiton.org/eugene.git commit 0141c10fc4319016141c83a883bf11ffe2f49caf Author: Maven Release <maven-release@codelutin.com> Date: Sun Aug 23 21:26:01 2015 +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 e916cc7..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-3</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 0237f94..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-3</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 d5177ce..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-3</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 5a4523f..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-3</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene/pom.xml b/eugene/pom.xml index 35ef6d0..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-3</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/pom.xml b/pom.xml index 0f82b82..8b4d776 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>3.0-alpha-3</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