[jmock2] 03/05: Merge tag 'upstream/2.8.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 jmock2.

commit ecc1556d651caf97ae4edd8bd5b59625b161e186
Merge: 8329053 422189f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 23 10:17:12 2017 +0200

    Merge tag 'upstream/2.8.3'
    
    Upstream version 2.8.3

 .gitignore                                         |   1 +
 .travis.yml                                        |   6 +
 README.md                                          | 140 ++++++++++++---------
 jmock-example/pom.xml                              |   4 +-
 jmock-junit3/pom.xml                               |   2 +-
 jmock-junit4/pom.xml                               |   2 +-
 jmock-legacy/pom.xml                               |   2 +-
 jmock/pom.xml                                      |   4 +-
 .../PrimitiveParameterTypesAcceptanceTests.java    |  26 ++--
 .../test/unit/internal/FailingExampleTestCase.java |  10 +-
 .../test/unit/internal/VerifyingTestCaseTests.java |   4 +-
 .../jmock/test/unit/support/MockExpectation.java   |  12 +-
 pom.xml                                            |   9 +-
 settings.xml                                       |  12 ++
 testjar/pom.xml                                    |   2 +-
 15 files changed, 142 insertions(+), 94 deletions(-)

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