This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository snakeyaml.
commit bd47148d0ecaacb0187f713a90d3999c10fbcf66 Merge: d5df83c 34ffbf8 Author: Markus Koschany <a...@debian.org> Date: Wed Mar 7 00:16:19 2018 +0100 Update upstream source from tag 'upstream/1.20' Update to upstream version '1.20' with Debian dir a321510279c97e978197f23f87938061cac998b2 .gitignore | 9 - bitbucket-pipelines.yml | 4 +- docker-run-jdk9.sh | 3 +- pom.xml | 76 +- src/changes/changes.xml | 33 +- src/etc/announcement.msg | 8 +- .../java/org/yaml/snakeyaml/TypeDescription.java | 22 +- .../java/org/yaml/snakeyaml/composer/Composer.java | 4 +- .../yaml/snakeyaml/constructor/Constructor.java | 8 +- .../constructor/DuplicateKeyException.java} | 14 +- .../snakeyaml/constructor/SafeConstructor.java | 14 +- .../java/org/yaml/snakeyaml/emitter/Emitter.java | 30 +- src/main/java/org/yaml/snakeyaml/error/Mark.java | 58 +- .../snakeyaml/events/CollectionStartEvent.java | 12 +- .../yaml/snakeyaml/events/DocumentStartEvent.java | 4 - .../yaml/snakeyaml/events/MappingStartEvent.java | 3 +- .../org/yaml/snakeyaml/events/ScalarEvent.java | 18 +- .../yaml/snakeyaml/events/SequenceStartEvent.java | 3 +- .../yaml/snakeyaml/introspector/PropertyUtils.java | 37 +- .../org/yaml/snakeyaml/nodes/CollectionNode.java | 16 +- .../java/org/yaml/snakeyaml/nodes/MappingNode.java | 9 +- src/main/java/org/yaml/snakeyaml/nodes/Node.java | 24 +- src/main/java/org/yaml/snakeyaml/nodes/NodeId.java | 4 +- .../java/org/yaml/snakeyaml/nodes/ScalarNode.java | 18 +- .../org/yaml/snakeyaml/nodes/SequenceNode.java | 5 +- src/main/java/org/yaml/snakeyaml/nodes/Tag.java | 11 +- .../java/org/yaml/snakeyaml/parser/ParserImpl.java | 17 +- .../org/yaml/snakeyaml/reader/StreamReader.java | 237 ++-- .../snakeyaml/representer/BaseRepresenter.java | 40 +- .../yaml/snakeyaml/representer/Representer.java | 15 +- .../snakeyaml/representer/SafeRepresenter.java | 39 +- .../java/org/yaml/snakeyaml/scanner/Scanner.java | 2 +- .../org/yaml/snakeyaml/scanner/ScannerImpl.java | 16 +- .../java/org/yaml/snakeyaml/tokens/AliasToken.java | 5 - .../org/yaml/snakeyaml/tokens/AnchorToken.java | 5 - .../org/yaml/snakeyaml/tokens/DirectiveToken.java | 9 - .../org/yaml/snakeyaml/tokens/ScalarToken.java | 15 +- .../java/org/yaml/snakeyaml/tokens/TagToken.java | 5 - src/main/java/org/yaml/snakeyaml/tokens/Token.java | 32 - .../java/org/yaml/snakeyaml/util/ArrayUtils.java | 8 +- src/patches/android/PropertyUtils.patch | 53 +- src/test/java/examples/AnyObjectExampleTest.java | 8 +- src/test/java/examples/CustomBeanResolverTest.java | 2 +- src/test/java/examples/CustomMapExampleTest.java | 6 +- src/test/java/examples/DiceExampleTest.java | 4 +- src/test/java/examples/IgnoreTagsExampleTest.java | 2 +- src/test/java/examples/LoadExampleTest.java | 6 +- .../java/examples/SafeConstructorExampleTest.java | 2 +- .../java/examples/collections/TypeSafeMapTest.java | 16 +- .../java/examples/resolver/CustomResolverTest.java | 2 +- src/test/java/org/pyyaml/CanonicalParser.java | 8 +- src/test/java/org/pyyaml/CanonicalScanner.java | 2 +- src/test/java/org/pyyaml/PyEmitterTest.java | 4 +- src/test/java/org/pyyaml/PyImportTest.java | 4 +- src/test/java/org/pyyaml/PyMarkTest.java | 2 +- src/test/java/org/pyyaml/PyReaderTest.java | 5 +- src/test/java/org/pyyaml/PyRecursiveTest.java | 4 +- src/test/java/org/pyyaml/PyTokensTest.java | 74 +- .../java/org/yaml/snakeyaml/Chapter2_1Test.java | 10 +- .../java/org/yaml/snakeyaml/Chapter2_2Test.java | 4 +- .../java/org/yaml/snakeyaml/Chapter2_4Test.java | 34 +- .../java/org/yaml/snakeyaml/Chapter2_5Test.java | 8 +- .../java/org/yaml/snakeyaml/Example2_24Test.java | 8 +- .../yaml/snakeyaml/JavaBeanWithNullValuesTest.java | 4 +- .../yaml/snakeyaml/composer/ComposerImplTest.java | 9 - .../constructor/AbstractConstructTest.java | 6 +- .../snakeyaml/constructor/BeanConstructorTest.java | 24 +- .../org/yaml/snakeyaml/constructor/MyWheel.java | 4 +- .../java/org/yaml/snakeyaml/constructor/Wheel.java | 2 +- .../org/yaml/snakeyaml/emitter/EmitterTest.java | 2 +- .../yaml/snakeyaml/emitter/EventConstructor.java | 7 +- .../java/org/yaml/snakeyaml/error/MarkTest.java | 9 +- .../snakeyaml/error/MarkedYAMLExceptionTest.java | 8 +- .../org/yaml/snakeyaml/events/ScalarEventTest.java | 6 +- .../yaml/snakeyaml/generics/ObjectValuesTest.java | 4 +- .../java/org/yaml/snakeyaml/immutable/Code2.java | 2 +- .../java/org/yaml/snakeyaml/immutable/Code4.java | 2 +- .../snakeyaml/immutable/ImmutablesRepresenter.java | 9 +- .../snakeyaml/immutable/ShapeImmutableTest.java | 12 +- .../primitives/ImmutablePrimitivesRepresenter.java | 3 +- .../primitives/ImmutablePrimitivesTest.java | 8 +- .../yaml/snakeyaml/issues/issue11/YamlMapTest.java | 2 +- .../issues/issue115/ParameterizedJavaBeanTest.java | 6 +- .../issues/issue115/ParameterizedTest.java | 6 +- .../snakeyaml/issues/issue127/NullAliasTest.java | 3 +- .../issue137/SupplementaryCharactersTest.java | 37 + .../snakeyaml/issues/issue139/MergeValueTest.java | 6 +- .../snakeyaml/issues/issue143/GenericMapTest.java | 2 +- .../issues/issue171/CustomRepresenter.java | 3 +- .../snakeyaml/issues/issue183/NumberBeanTest.java | 2 +- .../issues/issue29/FlexibleScalarStyleTest.java | 4 +- .../FlexibleScalarStylesInJavaBeanTest.java | 5 +- .../issues/issue337/DuplicateKeyTest.java | 28 +- .../issue374/NumberAsJavaBeanPropertyTest.java | 8 +- .../issue383/RepresenterConfigurationTest.java | 10 +- .../ReportPositionForDuplicateKeyTest.java | 48 + .../issues/issue61/GenericMapBeanTest.java | 4 +- .../issue73/DumpSetAsSequenceExampleTest.java | 2 +- .../snakeyaml/issues/issue9/BeanConstructor.java | 2 +- .../org/yaml/snakeyaml/javabeans/LongTest.java | 4 +- .../java/org/yaml/snakeyaml/json/JsonTest.java | 10 +- .../org/yaml/snakeyaml/nodes/MappingNodeTest.java | 4 +- .../java/org/yaml/snakeyaml/nodes/NodeTest.java | 11 +- .../org/yaml/snakeyaml/nodes/NodeTupleTest.java | 9 +- .../org/yaml/snakeyaml/nodes/ScalarNodeTest.java | 5 +- .../org/yaml/snakeyaml/nodes/SequenceNodeTest.java | 6 +- .../java/org/yaml/snakeyaml/nodes/TagTest.java | 11 - .../java/org/yaml/snakeyaml/nodes/TagsTest.java | 2 +- .../org/yaml/snakeyaml/parser/ParserImplTest.java | 19 +- .../org/yaml/snakeyaml/reader/ReaderBomTest.java | 19 +- .../yaml/snakeyaml/reader/ReaderStringTest.java | 26 +- .../yaml/snakeyaml/representer/RepresentTest.java | 2 +- .../snakeyaml/representer/SafeRepresenterTest.java | 22 +- .../yaml/snakeyaml/scanner/ScannerImplTest.java | 9 +- .../yaml/snakeyaml/serializer/SerializerTest.java | 4 +- .../org/yaml/snakeyaml/tokens/AliasTokenTest.java | 10 +- .../org/yaml/snakeyaml/tokens/AnchorTokenTest.java | 8 +- .../yaml/snakeyaml/tokens/BlockEndTokenTest.java | 8 +- .../yaml/snakeyaml/tokens/BlockEntryTokenTest.java | 2 +- .../tokens/BlockSequenceStartTokenTest.java | 2 +- .../yaml/snakeyaml/tokens/DirectiveTokenTest.java | 30 +- .../snakeyaml/tokens/DocumentEndTokenTest.java | 2 +- .../snakeyaml/tokens/DocumentStartTokenTest.java | 2 +- .../yaml/snakeyaml/tokens/FlowEntryTokenTest.java | 2 +- .../tokens/FlowMappingStartTokenTest.java | 2 +- .../tokens/FlowSequenceStartTokenTest.java | 2 +- .../snakeyaml/tokens/StreamStartTokenTest.java | 2 +- .../org/yaml/snakeyaml/tokens/TagTokenTest.java | 12 +- .../org/yaml/snakeyaml/types/FloatTagTest.java | 32 +- .../java/org/yaml/snakeyaml/types/IntTagTest.java | 32 +- .../org/yaml/snakeyaml/types/MergeTagTest.java | 18 +- .../java/org/yaml/snakeyaml/types/OmapTagTest.java | 6 +- .../java/org/yaml/snakeyaml/types/SeqTagTest.java | 10 +- .../org/yaml/snakeyaml/types/ValueTagTest.java | 2 +- .../org/yaml/snakeyaml/util/ArrayStackTest.java | 4 +- .../issues/issue310/Java8OptionalTest.java} | 25 +- .../{OptionalTest.java => OptionalTesting.java} | 19 +- .../issue310/DeepThrowableCauseMatcher.java} | 31 +- .../issues/issue310/Java9OptionalTest.java | 71 + src/test/resources/issues/emoji.yaml | 1470 ++++++++++++++++++++ 140 files changed, 2453 insertions(+), 973 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/snakeyaml.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits