[sisu-guice] 01/05: Merge tag 'upstream/3.2.4'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository sisu-guice.

commit 25cc7dfad1b82a22897a80d90542cb329d64e5dc
Merge: 31abd21 34795ca
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 3 09:15:28 2014 +0200

    Merge tag 'upstream/3.2.4'
    
    Upstream version 3.2.4

 PATCHES/GUICE_799_fix_osgi_metadata.patch          | 279 ---------------------
 PATCHES/SISUFY.patch                               |  18 +-
 core/pom.xml                                       |   2 +-
 .../inject/internal/ProviderMethodsModule.java     |   4 +-
 .../inject/internal/ScopeBindingProcessor.java     |  11 +-
 .../src/com/google/inject/internal/WeakKeySet.java |  13 +-
 core/test/com/google/inject/ScopesTest.java        |  13 +
 extensions/assistedinject/pom.xml                  |   2 +-
 extensions/grapher/pom.xml                         |   2 +-
 extensions/jmx/pom.xml                             |   2 +-
 extensions/jndi/pom.xml                            |   2 +-
 extensions/multibindings/pom.xml                   |   2 +-
 .../com/google/inject/multibindings/MapBinder.java |  18 +-
 .../google/inject/multibindings/Multibinder.java   |  24 +-
 extensions/persist/pom.xml                         |   2 +-
 extensions/pom.xml                                 |   2 +-
 extensions/servlet/pom.xml                         |   2 +-
 extensions/spring/pom.xml                          |   2 +-
 extensions/struts2/pom.xml                         |   2 +-
 extensions/testlib/pom.xml                         |   2 +-
 .../google/inject/testing/fieldbinder/Bind.java    |   8 +
 .../testing/fieldbinder/BoundFieldModule.java      |  68 +++--
 .../testing/fieldbinder/BoundFieldModuleTest.java  |  43 ++++
 extensions/throwingproviders/pom.xml               |   2 +-
 .../CheckedProviderMethodsModule.java              |   4 +-
 pom.xml                                            |   4 +-
 26 files changed, 174 insertions(+), 359 deletions(-)

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