branch develop updated (b6cb0e6 -> b6dd4bd)
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 b6cb0e6 fixes #3549: Migrates to git (fix jrst url) new 926398a fixes #3628: Dependencies are not merged in method org.nuiton.eugene.models.object.xml.ObjectModelImpl#mergeClassifiers new 17fb904 fixes #3629: Updates to nuitonpom 1.8.1 new b6dd4bd fixes #3629: Updates to nuitonpom 1.8.1 (regression in plexus-component-metadata:1.6:generate-metadata) The 3 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 b6dd4bde9444fd311273c7deef208d60d3e9dde6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 23:02:37 2015 +0100 fixes #3629: Updates to nuitonpom 1.8.1 (regression in plexus-component-metadata:1.6:generate-metadata) commit 17fb90467c5a7198443ad90464f7ff02584d78f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 22:43:31 2015 +0100 fixes #3629: Updates to nuitonpom 1.8.1 commit 926398aa8c837e72c44ad7c08068c64af5750d97 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 22:42:20 2015 +0100 fixes #3628: Dependencies are not merged in method org.nuiton.eugene.models.object.xml.ObjectModelImpl#mergeClassifiers Summary of changes: .../eugene/models/object/xml/ObjectModelImpl.java | 6 ++++++ .../eugene/writer/DefaultChainedWriterEngine.java | 17 ++++++++--------- pom.xml | 2 +- 3 files changed, 15 insertions(+), 10 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 926398aa8c837e72c44ad7c08068c64af5750d97 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 22:42:20 2015 +0100 fixes #3628: Dependencies are not merged in method org.nuiton.eugene.models.object.xml.ObjectModelImpl#mergeClassifiers --- .../java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java index 0ed334a..f9578f9 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java @@ -483,6 +483,12 @@ public class ObjectModelImpl implements ObjectModel { initialClazzifier.operations.add(operation); } } + for (it = additionalClazzifier.getDependencies().iterator(); it.hasNext();) { + ObjectModelDependencyImpl dependency = (ObjectModelDependencyImpl) it.next(); + if (!contains(initialClazzifier.getDependencies(), dependency)) { + initialClazzifier.dependencies.add(dependency); + } + } for (it = additionalClazzifier.getComments().iterator(); it.hasNext();) { String comment = (String) it.next(); if (!initialClazzifier.comments.contains(comment)) { -- 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 17fb90467c5a7198443ad90464f7ff02584d78f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 22:43:31 2015 +0100 fixes #3629: Updates to nuitonpom 1.8.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2fc05f4..c195ec3 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>1.5</version> + <version>1.8.1</version> </parent> <artifactId>eugene</artifactId> -- 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 b6dd4bde9444fd311273c7deef208d60d3e9dde6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 27 23:02:37 2015 +0100 fixes #3629: Updates to nuitonpom 1.8.1 (regression in plexus-component-metadata:1.6:generate-metadata) --- .../eugene/writer/DefaultChainedWriterEngine.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java b/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java index 4e6c845..cb262f9 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java @@ -498,8 +498,7 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { */ public enum ModelFileWriterEntryType { - ONLY_PROTOCOL_PATTERN(Pattern.compile("^([a-zA-Z]+)$")) { - + ONLY_PROTOCOL_PATTERN("^([a-zA-Z]+)$") { @Override public ChainedFileWriter getWriter(ChainedWriterEngine engine, String include, @@ -551,7 +550,7 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { } }, - NO_PROTOCOL_PATTERN_WITH_CLASSPATH(Pattern.compile("^classpath:([^:]+):([^:]+)$")) { + NO_PROTOCOL_PATTERN_WITH_CLASSPATH("^classpath:([^:]+):([^:]+)$") { @Override public ChainedFileWriter getWriter(ChainedWriterEngine engine, String include, @@ -604,7 +603,7 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { } }, - NO_PROTOCOL_PATTERN(Pattern.compile("^([^:]+):([^:]+)$")) { + NO_PROTOCOL_PATTERN("^([^:]+):([^:]+)$") { @Override public ChainedFileWriter getWriter(ChainedWriterEngine engine, String include, @@ -657,7 +656,7 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { } }, - FULL_PATTERN_WITH_CLASSPATH(Pattern.compile("^classpath:(\\w+):([^:]+):([^:]+)$")) { + FULL_PATTERN_WITH_CLASSPATH("^classpath:(\\w+):([^:]+):([^:]+)$") { @Override public ChainedFileWriter getWriter(ChainedWriterEngine engine, String include, @@ -699,7 +698,7 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { String inputPath = matcher.group(2); String includes = matcher.group(3); - //TODO tchemit 2010-09-22 Should be able to do a pattern research + //TODO tchemit 2010-09-22 Should be able to do a pattern research ChainedFileWriterEntry writerEntry = new ChainedFileWriterEntry( inputPath, includes, @@ -708,7 +707,7 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { return writerEntry; } }, - FULL_PATTERN(Pattern.compile("^(\\w+):([^:]+):([^:]+)$")) { + FULL_PATTERN("^(\\w+):([^:]+):([^:]+)$") { @Override public ChainedFileWriter getWriter(ChainedWriterEngine engine, String include, @@ -761,8 +760,8 @@ public class DefaultChainedWriterEngine implements ChainedWriterEngine { private final Pattern pattern; - ModelFileWriterEntryType(Pattern pattern) { - this.pattern = pattern; + ModelFileWriterEntryType(String pattern) { + this.pattern = Pattern.compile(pattern); } public Pattern getPattern() { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm