[protobuf-java-format] 02/02: Merge tag 'upstream/1.2'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri May 27 07:00:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository protobuf-java-format.
commit 90a5f75a39ec9924e9bc5bc66524af98109294bb
Merge: 6c166cf c2a7713
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri May 27 08:58:27 2016 +0200
Merge tag 'upstream/1.2'
Upstream version 1.2
LICENSE.txt | 27 +
pom.xml | 193 ++
.../googlecode/protobuf/format/CouchDBFormat.java | 156 ++
.../com/googlecode/protobuf/format/HtmlFormat.java | 703 +++++
.../protobuf/format/JavaPropsFormat.java | 1342 ++++++++++
.../com/googlecode/protobuf/format/JsonFormat.java | 1607 +++++++++++
.../googlecode/protobuf/format/SmileFormat.java | 607 +++++
.../com/googlecode/protobuf/format/XmlFormat.java | 1337 ++++++++++
.../googlecode/protobuf/format/util/HexUtils.java | 72 +
src/main/resources/LICENSE.txt | 27 +
.../protobuf/format/CouchDBFormatTest.java | 30 +
.../protobuf/format/JavaPropsFormatTest.java | 80 +
.../googlecode/protobuf/format/JsonFormatTest.java | 144 +
.../protobuf/format/SmileFormatTest.java | 215 ++
.../com/googlecode/protobuf/format/TestUtil.java | 2807 ++++++++++++++++++++
.../googlecode/protobuf/format/XmlFormatTest.java | 129 +
.../resources/json_format_unknown_fields_data.txt | 1 +
src/test/resources/proto/unittest.proto | 630 +++++
src/test/resources/proto/unittest_couchdb.proto | 14 +
src/test/resources/proto/unittest_import.proto | 61 +
.../resources/proto/unittest_multi_nested.proto | 24 +
src/test/resources/xml_format_unittest_data.txt | 1 +
.../xml_format_unittest_data_preformat.txt | 210 ++
23 files changed, 10417 insertions(+)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/protobuf-java-format.git
More information about the pkg-java-commits
mailing list