[protobuf-java-format] branch master updated (90a5f75 -> 38aee9f)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a change to branch master
in repository protobuf-java-format.

      from  90a5f75   Merge tag 'upstream/1.2'
      adds  a20e30c   Imported Upstream version 1.3
       new  880087d   Merge tag 'upstream/1.3'
       new  7adf7a8   Removed 01-protobuf-compatibility.patch (fixed upstream)
       new  df18bb3   New dependency on libjackson2-core-java
       new  99239f8   Refreshed debian/copyright
       new  f0b8572   Removed the dependency on libjackson-json-java
       new  a1e8cdb   New build dependency on libmockito-java
       new  38aee9f   Upload to unstable

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                                         |    3 +
 README.md                                          |   40 +
 RELEASE-NOTES.md                                   |    5 +
 debian/changelog                                   |   10 +
 debian/control                                     |    3 +-
 debian/copyright                                   |    3 +-
 debian/maven.rules                                 |    1 +
 debian/patches/01-protobuf-compatibility.patch     |   12 -
 debian/patches/series                              |    1 -
 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 +
 33 files changed, 1802 insertions(+), 4733 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 README.md
 create mode 100644 RELEASE-NOTES.md
 delete mode 100644 debian/patches/01-protobuf-compatibility.patch
 delete mode 100644 debian/patches/series
 create mode 100644 src/main/java/com/googlecode/protobuf/format/AbstractCharBasedFormatter.java
 create mode 100644 src/main/java/com/googlecode/protobuf/format/FormatFactory.java
 copy src/main/java/com/googlecode/protobuf/format/{SmileFormat.java => JsonJacksonFormat.java} (78%)
 create mode 100644 src/main/java/com/googlecode/protobuf/format/ProtobufFormatter.java
 create mode 100644 src/main/java/com/googlecode/protobuf/format/XmlJavaxFormat.java
 create mode 100644 src/main/java/com/googlecode/protobuf/format/util/TextUtils.java
 delete mode 100644 src/test/java/com/googlecode/protobuf/format/CouchDBFormatTest.java
 delete mode 100644 src/test/java/com/googlecode/protobuf/format/JavaPropsFormatTest.java
 create mode 100644 src/test/java/com/googlecode/protobuf/format/JsonJacksonFormatTest.java
 delete mode 100644 src/test/java/com/googlecode/protobuf/format/SmileFormatTest.java
 delete mode 100644 src/test/java/com/googlecode/protobuf/format/TestUtil.java
 delete mode 100644 src/test/java/com/googlecode/protobuf/format/XmlFormatTest.java
 create mode 100644 src/test/resources/expectations/JsonFormatTest/test1.json
 create mode 100644 src/test/resources/expectations/JsonJacksonFormatTest/prettyprint.json

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