This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository modello.
commit 23236c55b514b066bc56f5b5dee37e0ce6bfd6a0 Merge: 61b7acd 1c14ef7 Author: Emmanuel Bourg <[email protected]> Date: Thu May 18 15:47:39 2017 +0200 Merge tag 'upstream/1.9.1' Upstream version 1.9.1 .travis.yml | 23 + LICENSE.txt | 22 + README.md | 8 +- modello-core/pom.xml | 2 +- .../java/org/codehaus/modello/model/ModelType.java | 2 + .../java/org/codehaus/modello/model/Version.java | 18 +- .../modello/plugin/AbstractModelloGenerator.java | 2 +- .../modello/core/DefaultModelloCoreTest.java | 7 + .../src/test/resources/models/recursion.mdo | 47 + modello-plugins/modello-plugin-converters/pom.xml | 2 +- modello-plugins/modello-plugin-dom4j/pom.xml | 2 +- .../modello/plugin/dom4j/Dom4jWriterGenerator.java | 3 +- modello-plugins/modello-plugin-jackson/pom.xml | 2 +- modello-plugins/modello-plugin-java/pom.xml | 2 +- .../modello/plugin/java/JavaModelloGenerator.java | 10 +- .../modello/plugin/java/javasource/JArrayType.java | 2 +- .../modello/plugin/java/javasource/JClass.java | 16 +- .../plugin/java/javasource/JCollectionType.java | 3 +- .../modello/plugin/java/javasource/JComment.java | 2 + .../modello/plugin/java/javasource/JCompUnit.java | 8 +- .../plugin/java/javasource/JComponentizedType.java | 2 +- .../plugin/java/javasource/JConstructor.java | 2 + .../plugin/java/javasource/JDocComment.java | 1 + .../plugin/java/javasource/JDocDescriptor.java | 1 + .../modello/plugin/java/javasource/JInterface.java | 1 + .../modello/plugin/java/javasource/JMapType.java | 3 +- .../modello/plugin/java/javasource/JNamedMap.java | 9 +- .../modello/plugin/java/javasource/JParameter.java | 2 +- .../plugin/java/javasource/JSourceCode.java | 2 +- .../modello/plugin/java/javasource/JStructure.java | 6 +- .../modello/plugin/java/javasource/JType.java | 2 +- .../modello/plugin/java/AbstractPrincipal.java | 3 +- .../plugin/java/BuilderJavaGeneratorTest.java | 4 +- .../codehaus/modello/plugin/java/Permission.java | 3 +- .../org/codehaus/modello/plugin/java/Role.java | 3 +- .../modello/plugin/java/TmpJavaGeneratorTest.java | 4 +- .../plugin/java/ToStringJavaGeneratorTest.java | 4 +- modello-plugins/modello-plugin-jdom/pom.xml | 2 +- .../verifiers/features/JDOMFeaturesVerifier.java | 6 +- modello-plugins/modello-plugin-jsonschema/pom.xml | 2 +- modello-plugins/modello-plugin-sax/pom.xml | 2 +- modello-plugins/modello-plugin-snakeyaml/pom.xml | 2 +- modello-plugins/modello-plugin-stax/pom.xml | 2 +- .../src/test/resources/boolean.mdo | 6 +- .../src/test/resources/maven.mdo | 2 +- .../src/test/resources/noAdder.mdo | 6 +- .../src/test/resources/version-in-field.mdo | 4 +- .../src/test/resources/version-in-namespace.mdo | 4 +- .../version-in-namespace.xml | 4 +- .../stax-version-reader-delegate/input-4.0.0.xml | 4 +- .../stax-version-reader-delegate/input-4.0.1.xml | 4 +- .../wrong-version-in-namespace.xml | 4 +- .../verifiers/stax/expected-default-extend.xml | 2 +- .../src/test/verifiers/stax/expected.xml | 2 +- modello-plugins/modello-plugin-xdoc/pom.xml | 13 +- .../modello/plugin/xdoc/XdocGenerator.java | 17 +- .../modello/plugin/xdoc/XdocGeneratorTest.java | 35 +- .../src/test/resources/html4.expected.xml | 44 + .../src/test/resources/html4.mdo | 38 + .../src/test/resources/settings.mdo | 4 +- modello-plugins/modello-plugin-xml/pom.xml | 2 +- modello-plugins/modello-plugin-xpp3/pom.xml | 2 +- .../modello-plugin-xpp3/src/it/maven-model/pom.xml | 43 - .../src/it/maven-model/src/main/mdo/maven.mdo | 2998 -------------------- .../org/codehaus/modello/xpp3/Xpp3ParsingTest.java | 33 - .../test/models/model-with-missing-elements.xml | 7 - .../src/test/models/model-with-wrong-root-tag.xml | 7 - .../modello/plugin/xpp3/Xpp3ReaderGenerator.java | 58 +- .../modello/plugin/xpp3/Xpp3WriterGenerator.java | 17 + .../xml/xpp3/StandaloneReadXpp3GeneratorTest.java | 17 + .../src/test/resources/boolean.mdo | 6 +- modello-plugins/modello-plugin-xsd/pom.xml | 2 +- .../codehaus/modello/plugin/xsd/XsdGenerator.java | 6 +- .../src/test/resources/features-invalid.xml | 4 +- modello-plugins/pom.xml | 2 +- pom.xml | 126 +- src/main/mdo/modello.mdo | 8 +- src/site/resources/modello-deps.png | Bin 21896 -> 44563 bytes src/site/resources/xsd/modello-1.0.0.xsd | 706 +++++ src/site/resources/xsd/modello-1.1.0.xsd | 757 +++++ src/site/resources/xsd/modello-1.4.0.xsd | 851 ++++++ src/site/resources/xsd/modello-1.8.0.xsd | 868 ++++++ src/site/site.xml | 28 +- src/site/xdoc/index.xml | 38 +- src/site/xdoc/modello-deps.odg | Bin 13063 -> 22910 bytes 85 files changed, 3725 insertions(+), 3305 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/modello.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
