branch develop updated (ebe20cf -> ce9de88)
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 ebe20cf use fixes versions of eugene maven plugin new 126d699 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9f86c5b [jgitflow-maven-plugin]updating poms for 3.0-alpha-1 branch with snapshot versions new 4dad2e0 fill README.txt to how to perform a eugene release new 0fc81ae add license headers new 874f26e [jgitflow-maven-plugin]updating poms for branch'release/3.0-alpha-1' with non-snapshot versions new 7a08899 [jgitflow-maven-plugin]merging 'release/3.0-alpha-1' into 'master' new 9ad1cbe [jgitflow-maven-plugin]merging 'master' into 'develop' new ce9de88 [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 ce9de887b975b38942bf628ae44f0a704bb4fb7e Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:13:43 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9ad1cbefe78d051430bfbced8c6c2e64d9b25bcc Merge: 126d699 7a08899 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:13:42 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 126d69928b8a31ff9cd6eb35aad44c8b128937a5 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:13:42 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 7a08899ac935dd69a5d1eab3e9d6771fc13eafef Merge: 5edb4b3 874f26e Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:13:38 2015 +0000 [jgitflow-maven-plugin]merging 'release/3.0-alpha-1' into 'master' commit 874f26e6e03d3652882c088faa19392f86b3d8aa Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:11:13 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.0-alpha-1' with non-snapshot versions commit 0fc81aed39a33de7cfb2ab90935e89e20be439f6 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:10:56 2015 +0000 add license headers commit 4dad2e0c03a9040c18c1cbc962a55ce95200bd9e Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:10:48 2015 +0000 fill README.txt to how to perform a eugene release Summary of changes: README.txt | 21 +++++++++++++++++++++ .../java/org/nuiton/eugene/writer/FileGrabber.java | 22 ++++++++++++++++++++++ .../eugene/writer/FileGrabberFromClassPath.java | 22 ++++++++++++++++++++++ .../eugene/writer/FileGrabberFromDirectory.java | 22 ++++++++++++++++++++++ 4 files changed, 87 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 0fc81aed39a33de7cfb2ab90935e89e20be439f6 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:10:56 2015 +0000 add license headers --- .../java/org/nuiton/eugene/writer/FileGrabber.java | 22 ++++++++++++++++++++++ .../eugene/writer/FileGrabberFromClassPath.java | 22 ++++++++++++++++++++++ .../eugene/writer/FileGrabberFromDirectory.java | 22 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabber.java b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabber.java index 12f929d..ce3b173 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabber.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabber.java @@ -1,5 +1,27 @@ package org.nuiton.eugene.writer; +/* + * #%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 java.io.File; import java.io.IOException; import java.util.Set; diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java index 9437d1a..efd876e 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromClassPath.java @@ -1,5 +1,27 @@ package org.nuiton.eugene.writer; +/* + * #%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 org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java index 3981dfc..c4da9e5 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/FileGrabberFromDirectory.java @@ -1,5 +1,27 @@ package org.nuiton.eugene.writer; +/* + * #%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 org.apache.commons.collections.CollectionUtils; 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 http://git.nuiton.org/eugene.git commit 874f26e6e03d3652882c088faa19392f86b3d8aa Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:11:13 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.0-alpha-1' 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 12cb23d..6b4387a 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-1-SNAPSHOT</version> + <version>3.0-alpha-1</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-maven-plugin/pom.xml b/eugene-maven-plugin/pom.xml index 63af2fe..d036493 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-1-SNAPSHOT</version> + <version>3.0-alpha-1</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-plantuml-templates/pom.xml b/eugene-plantuml-templates/pom.xml index 2f87b74..9e4d8fa 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-1-SNAPSHOT</version> + <version>3.0-alpha-1</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-yaml-templates/pom.xml b/eugene-yaml-templates/pom.xml index 4b93ed5..cd7c55d 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-1-SNAPSHOT</version> + <version>3.0-alpha-1</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene/pom.xml b/eugene/pom.xml index 5c51c6c..cc1d897 100644 --- a/eugene/pom.xml +++ b/eugene/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-1-SNAPSHOT</version> + <version>3.0-alpha-1</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/pom.xml b/pom.xml index e157dbd..4e1974b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>3.0-alpha-1-SNAPSHOT</version> + <version>3.0-alpha-1</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 7a08899ac935dd69a5d1eab3e9d6771fc13eafef Merge: 5edb4b3 874f26e Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:13:38 2015 +0000 [jgitflow-maven-plugin]merging 'release/3.0-alpha-1' into 'master' README.txt | 21 + eugene-java-templates/pom.xml | 4 +- .../java/JavaTemplatesModelPropertiesProvider.java | 43 -- eugene-maven-plugin/pom.xml | 7 +- .../src/it/evol-879/model/model-api/pom.xml | 4 - .../src/main/resources/models/topiatest.properties | 1 - .../src/it/evol-879/model/model-impl/pom.xml | 4 - .../src/main/models/topiatest.properties | 1 - .../src/it/evol-879/xmi/xmi-api/pom.xml | 4 - .../src/main/resources/xmi/topiatest.properties | 1 - .../src/it/evol-879/xmi/xmi-impl/pom.xml | 4 - .../src/it/evol-879/zargo/zargo-api/pom.xml | 4 - .../src/main/resources/xmi/topiatest.properties | 1 - .../src/it/evol-879/zargo/zargo-impl/pom.xml | 4 - .../zargo-impl/src/main/xmi/topiatest4.properties | 1 - .../testIncludeWithNoProtocol/pom.xml | 21 +- .../src/main/xmi/topiatest.properties | 1 - .../src/main/zargo/topiatest.properties | 1 - .../testIncludeWithOnlyProtocol/pom.xml | 19 +- eugene-maven-plugin/src/it/generate/all/pom.xml | 19 +- .../generate/all/src/main/xmi/topiatest.properties | 1 - .../all/src/main/zargo/topiatest.properties | 1 - .../it/generate/all/src/main/zargo/topiatest.zargo | Bin 20709 -> 21294 bytes .../src/it/generate/generators/pom.xml | 41 +- .../src/it/generate/only-zargo-xmi/pom.xml | 225 ++++---- .../src/main/xmi/topiatest.properties | 1 - .../src/main/zargo/topiatest.properties | 1 - .../src/it/generate/only-zargo/pom.xml | 19 +- .../only-zargo/src/main/xmi/topiatest.properties | 1 - .../only-zargo/src/main/zargo/topiatest.properties | 1 - .../src/it/generate/only-zargo/verify.groovy | 1 - .../org/nuiton/eugene/plugin/GenerateMojo.java | 84 ++- .../nuiton/eugene/plugin/SmartGenerateMojo.java | 60 --- .../plugin/writer/BaseChainedFileWriter.java | 151 +----- .../writer/BaseChainedFileWriterToMemoryModel.java | 46 +- .../plugin/writer/ModelChainedFileWriter.java | 365 ------------- .../eugene/plugin/writer/XmiChainedFileWriter.java | 21 +- eugene-plantuml-templates/pom.xml | 2 +- eugene-yaml-templates/pom.xml | 2 +- eugene/pom.xml | 9 +- .../java/org/nuiton/eugene/EugeneStereoTypes.java | 26 - .../org/nuiton/eugene/ModelPropertiesUtil.java | 415 -------------- .../main/java/org/nuiton/eugene/ModelReader.java | 56 -- .../org/nuiton/eugene/java/JavaGeneratorUtil.java | 43 +- .../eugene/models/object/ObjectModelGenerator.java | 6 +- .../eugene/models/object/ObjectModelReader.java | 600 --------------------- .../object/reader/AbstractObjectModelReader.java | 7 +- .../eugene/models/state/StateModelGenerator.java | 20 - .../eugene/models/stereotype/package-info.java | 2 +- .../eugene/models/tagvalue/package-info.java | 2 +- .../nuiton/eugene/writer/ChainedFileWriter.java | 53 +- .../writer/ChainedFileWriterConfiguration.java | 16 - .../nuiton/eugene/writer/ChainedWriterEngine.java | 13 +- .../eugene/writer/DefaultChainedWriterEngine.java | 368 ++++--------- .../FileGrabber.java} | 27 +- .../eugene/writer/FileGrabberFromClassPath.java | 307 +++++++++++ .../eugene/writer/FileGrabberFromDirectory.java | 155 ++++++ .../org/nuiton/eugene/writer/WriterReport.java | 26 + .../org/nuiton/eugene/EugeneStereotypesTest.java | 6 +- pom.xml | 27 +- 60 files changed, 932 insertions(+), 2440 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 126d69928b8a31ff9cd6eb35aad44c8b128937a5 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:13:42 2015 +0000 [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 258c577..6b4387a 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-1</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-maven-plugin/pom.xml b/eugene-maven-plugin/pom.xml index b2e453f..d036493 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-1</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-plantuml-templates/pom.xml b/eugene-plantuml-templates/pom.xml index 8dfbcd3..9e4d8fa 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-1</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene-yaml-templates/pom.xml b/eugene-yaml-templates/pom.xml index 972d714..cd7c55d 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-1</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene/pom.xml b/eugene/pom.xml index 1bee9d5..cc1d897 100644 --- a/eugene/pom.xml +++ b/eugene/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-1</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/pom.xml b/pom.xml index 4f61314..4e1974b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-1</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 9ad1cbefe78d051430bfbced8c6c2e64d9b25bcc Merge: 126d699 7a08899 Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:13:42 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' README.txt | 21 +++++++++++++++++++++ .../java/org/nuiton/eugene/writer/FileGrabber.java | 22 ++++++++++++++++++++++ .../eugene/writer/FileGrabberFromClassPath.java | 22 ++++++++++++++++++++++ .../eugene/writer/FileGrabberFromDirectory.java | 22 ++++++++++++++++++++++ 4 files changed, 87 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 ce9de887b975b38942bf628ae44f0a704bb4fb7e Author: Maven Release <maven-release@codelutin.com> Date: Sun May 24 16:13:43 2015 +0000 [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 6b4387a..258c577 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-1</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 d036493..b2e453f 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-1</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 9e4d8fa..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-1</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 cd7c55d..972d714 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-1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/eugene/pom.xml b/eugene/pom.xml index cc1d897..1bee9d5 100644 --- a/eugene/pom.xml +++ b/eugene/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> diff --git a/pom.xml b/pom.xml index 4e1974b..4f61314 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>eugene</artifactId> - <version>3.0-alpha-1</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