[protobuf-java-format] 01/07: Merge tag 'upstream/1.3'

[Emmanuel Bourg]

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 880087d00b1371d2178b3cdde2c1969df336cd08
Merge: 90a5f75 a20e30c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 3 22:08:41 2016 +0200

    Merge tag 'upstream/1.3'
    
    Upstream version 1.3

 .gitignore                                         |    3 +
 README.md                                          |   40 +
 RELEASE-NOTES.md                                   |    5 +
 pom.xml                                            |   74 +-
 .../format/AbstractCharBasedFormatter.java         |   77 +
 .../googlecode/protobuf/format/CouchDBFormat.java  |   67 +-
 .../googlecode/protobuf/format/FormatFactory.java  |   44 +
 .../com/googlecode/protobuf/format/HtmlFormat.java |  137 +-
 .../protobuf/format/JavaPropsFormat.java           |  203 +-
 .../com/googlecode/protobuf/format/JsonFormat.java |  232 +-
 .../{SmileFormat.java => JsonJacksonFormat.java}   |  165 +-
 .../protobuf/format/ProtobufFormatter.java         |  156 ++
 .../googlecode/protobuf/format/SmileFormat.java    |  552 +---
 .../com/googlecode/protobuf/format/XmlFormat.java  |  189 +-
 .../googlecode/protobuf/format/XmlJavaxFormat.java |  643 +++++
 .../googlecode/protobuf/format/util/HexUtils.java  |    2 +-
 .../googlecode/protobuf/format/util/TextUtils.java |  449 ++++
 .../protobuf/format/CouchDBFormatTest.java         |   30 -
 .../protobuf/format/JavaPropsFormatTest.java       |   80 -
 .../googlecode/protobuf/format/JsonFormatTest.java |  167 +-
 .../protobuf/format/JsonJacksonFormatTest.java     |   34 +
 .../protobuf/format/SmileFormatTest.java           |  215 --
 .../com/googlecode/protobuf/format/TestUtil.java   | 2807 --------------------
 .../googlecode/protobuf/format/XmlFormatTest.java  |  129 -
 .../expectations/JsonFormatTest/test1.json         |    1 +
 .../JsonJacksonFormatTest/prettyprint.json         |    3 +
 src/test/resources/proto/unittest.proto            |    1 +
 27 files changed, 1787 insertions(+), 4718 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/protobuf-java-format.git