[libxstream-java] 04/06: Merge tag 'upstream/1.4.10'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Jun 20 08:23:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libxstream-java.
commit 8ca8edd01ecdc4197642a33aa9313a1f179ee41e
Merge: 90ee8aa e1a339d
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jun 20 10:19:56 2017 +0200
Merge tag 'upstream/1.4.10'
Upstream version 1.4.10
.travis.yml | 10 +-
BUILD.txt | 5 +-
README.md | 6 +-
pom.xml | 72 +-
xstream-benchmark/pom.xml | 8 +-
xstream-distribution/pom.xml | 6 +-
.../src/content/CVE-2013-7285.html | 82 +
.../src/content/CVE-2016-3674.html | 83 +
.../src/content/CVE-2017-7957.html | 78 +
.../src/content/annotations-tutorial.html | 18 +-
xstream-distribution/src/content/benchmarks.html | 114 +-
xstream-distribution/src/content/changes.html | 2701 +++++++++++---------
xstream-distribution/src/content/converters.html | 299 ++-
xstream-distribution/src/content/download.html | 24 +-
xstream-distribution/src/content/faq.html | 77 +-
xstream-distribution/src/content/index.html | 13 +-
xstream-distribution/src/content/news.html | 26 +-
xstream-distribution/src/content/security.html | 91 +-
xstream-distribution/src/content/team.html | 5 +-
xstream-distribution/src/content/website.xml | 8 +-
xstream-hibernate/pom.xml | 17 +-
xstream-jmh/pom.xml | 29 +-
xstream-jmh/src/application/bin/xstream-jmh.cmd | 2 +-
xstream-jmh/src/application/bin/xstream-jmh.sh | 2 +-
.../benchmark/jmh/ConverterTypeBenchmark.java | 10 +-
.../xstream/benchmark/jmh/NameCoderBenchmark.java | 10 +-
.../xstream/benchmark/jmh/ParserBenchmark.java | 12 +-
.../benchmark/jmh/StringConverterBenchmark.java | 7 +-
xstream-jmh/src/reference/converterType.txt | 6 +-
xstream-jmh/src/reference/nameCoder.txt | 10 +-
xstream-jmh/src/reference/parsers.txt | 72 +-
xstream-jmh/src/reference/stringConverter.txt | 12 +-
xstream/pom.xml | 45 +-
.../src/java/com/thoughtworks/xstream/XStream.java | 376 ++-
.../java/com/thoughtworks/xstream/XStreamer.java | 4 +-
.../converters/extended/ISO8601DateConverter.java | 16 +-
.../ISO8601GregorianCalendarConverter.java | 130 +-
.../extended/ISO8601SqlTimestampConverter.java | 4 +-
.../xstream/converters/extended/PathConverter.java | 15 +-
.../converters/extended/SqlTimestampConverter.java | 67 +-
.../xstream/converters/javabean/BeanProvider.java | 6 +-
.../converters/javabean/JavaBeanConverter.java | 4 +-
.../converters/javabean/PropertyDictionary.java | 19 +-
.../converters/reflection/ReflectionConverter.java | 8 +-
.../SunLimitedUnsafeReflectionProvider.java | 22 +-
.../time/AbstractChronoLocalDateConverter.java | 77 +
.../converters/time/ChronologyConverter.java | 51 +
.../xstream/converters/time/DurationConverter.java | 43 +
.../converters/time/HijrahDateConverter.java | 66 +
.../xstream/converters/time/InstantConverter.java | 43 +
.../converters/time/JapaneseDateConverter.java | 49 +
.../converters/time/JapaneseEraConverter.java | 45 +
.../converters/time/LocalDateConverter.java | 44 +
.../converters/time/LocalDateTimeConverter.java | 65 +
.../converters/time/LocalTimeConverter.java | 65 +
.../converters/time/MinguoDateConverter.java | 49 +
.../xstream/converters/time/MonthDayConverter.java | 43 +
.../converters/time/OffsetDateTimeConverter.java | 66 +
.../converters/time/OffsetTimeConverter.java | 67 +
.../xstream/converters/time/PeriodConverter.java | 43 +
.../converters/time/SystemClockConverter.java | 66 +
.../converters/time/ThaiBuddhistDateConverter.java | 49 +
.../converters/time/ValueRangeConverter.java | 91 +
.../converters/time/WeekFieldsConverter.java | 94 +
.../xstream/converters/time/YearConverter.java | 42 +
.../converters/time/YearMonthConverter.java | 43 +
.../xstream/converters/time/ZoneIdConverter.java | 56 +
.../converters/time/ZonedDateTimeConverter.java | 70 +
.../xstream/converters/time/package.html | 13 +
.../xstream/core/DefaultConverterLookup.java | 38 +-
.../java/com/thoughtworks/xstream/core/JVM.java | 15 +-
.../core/util/ISO8601JavaTimeConverter.java | 291 +++
.../core/util/ISO8601JodaTimeConverter.java | 125 +
.../xstream/core/util/SerializationMembers.java | 11 +-
.../xstream/io/HierarchicalStreamReader.java | 19 +-
.../xstream/io/xml/Dom4JXmlWriter.java | 7 +-
.../xstream/mapper/AnnotationMapper.java | 8 +-
.../thoughtworks/xstream/mapper/DefaultMapper.java | 6 +-
.../xstream/mapper/ElementIgnoringMapper.java | 67 +
.../xstream/mapper/FieldAliasingMapper.java | 48 +-
.../xstream/mapper/ImplicitCollectionMapper.java | 27 +-
.../com/thoughtworks/xstream/mapper/Mapper.java | 9 +-
.../thoughtworks/xstream/mapper/MapperWrapper.java | 167 +-
.../xstream/security/PrimitiveTypePermission.java | 8 +-
.../thoughtworks/acceptance/CollectionsTest.java | 6 +-
.../thoughtworks/acceptance/ConcurrencyTest.java | 7 +-
.../acceptance/Concurrent15TypesTest.java | 16 +-
.../thoughtworks/acceptance/EncodingTestSuite.java | 78 +-
.../acceptance/Extended17TypesTest.java | 28 +-
.../thoughtworks/acceptance/ExtendedTypesTest.java | 17 +-
.../thoughtworks/acceptance/OmitFieldsTest.java | 4 +-
.../acceptance/SecurityManagerTest.java | 6 +-
.../acceptance/SecurityVulnerabilityTest.java | 26 +-
.../thoughtworks/acceptance/Time18TypesTest.java | 1094 ++++++++
.../thoughtworks/acceptance/WriteReplaceTest.java | 254 +-
.../com/thoughtworks/acceptance/XStreamerTest.java | 7 +-
.../thoughtworks/acceptance/XmlFriendlyTest.java | 10 +-
.../XStream12AnnotationCompatibilityTest.java | 10 +-
.../collections/PropertiesConverterTest.java | 44 +-
.../converters/enums/EnumConverterTest.java | 4 +-
.../converters/enums/EnumCustomConverterTest.java | 4 +-
.../converters/enums/EnumMapConverterTest.java | 3 +-
.../xstream/converters/enums/EnumMapperTest.java | 4 +-
.../converters/enums/EnumSetConverterTest.java | 4 +-
.../enums/EnumToStringConverterTest.java | 4 +-
.../converters/extended/FontConverterTest.java | 6 +-
.../extended/GregorianCalendarConverterTest.java | 3 +-
.../ISO8601GregorianCalendarConverter17Test.java | 4 +-
.../ISO8601GregorianCalendarConverterTest.java | 300 ++-
.../extended/ISO8601SqlTimestampConverterTest.java | 14 +-
.../converters/javabean/JavaBeanConverterTest.java | 56 +-
.../reflection/ReflectionConverterTest.java | 17 +-
.../reflection/SerializableConverterTest.java | 27 +-
.../xstream/io/DriverEndToEndTestSuite.java | 93 +-
.../io/json/JettisonMappedXmlDriverTest.java | 9 +-
.../xstream/io/xml/JDom2AcceptanceTest.java | 4 +-
.../xstream/io/xml/JDomAcceptanceTest.java | 4 +-
.../xstream/io/xml/StaxDriverTest.java | 3 +-
.../mapper/ImplicitCollectionMapperTest.java | 5 +-
.../persistence/FilePersistenceStrategyTest.java | 71 +-
.../persistence/FileStreamStrategyTest.java | 70 +-
121 files changed, 6924 insertions(+), 2209 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxstream-java.git
More information about the pkg-java-commits
mailing list