This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to branch master in repository sisu-guice.
commit cb35bca026522928a411f72387fdcf682eeff8c8 Merge: 7e4e259 cf29d3b Author: Eugene Zhukov <[email protected]> Date: Thu Apr 24 11:08:29 2014 +0000 Merge tag 'upstream/3.2.1+dfsg' Upstream version 3.2.1+dfsg Conflicts: .gitignore PATCHES/GUICE_759_upgrade_to_asm5.patch PATCHES/GUICE_799_fix_osgi_metadata.patch PATCHES/SISUFY.patch build.xml core/pom.xml extensions/assistedinject/pom.xml extensions/grapher/pom.xml extensions/jmx/pom.xml extensions/jndi/pom.xml extensions/multibindings/pom.xml extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java extensions/multibindings/test/com/google/inject/multibindings/SpiUtils.java extensions/persist/pom.xml extensions/pom.xml extensions/servlet/pom.xml extensions/spring/pom.xml extensions/struts2/pom.xml extensions/throwingproviders/pom.xml pom.xml .gitignore | 2 +- PATCHES/GUICE_745_getpathinfo_not_decoded.patch | 34 +- PATCHES/GUICE_759_upgrade_to_asm5.patch | 57 - PATCHES/GUICE_799_fix_osgi_metadata.patch | 20 +- PATCHES/SISUFY.patch | 127 +- build.properties | 5 +- build.xml | 49 +- common.xml | 2 +- compareBuilds.sh | 4 +- core/pom.xml | 32 +- core/src/com/google/inject/Key.java | 25 +- .../inject/internal/AbstractBindingProcessor.java | 2 +- .../google/inject/internal/InheritingState.java | 9 +- .../com/google/inject/internal/InjectorImpl.java | 50 +- .../com/google/inject/internal/RehashableKeys.java | 6 +- core/src/com/google/inject/internal/State.java | 6 +- .../src/com/google/inject/internal/WeakKeySet.java | 141 +- .../google/inject/internal/util/LineNumbers.java | 6 +- core/src/com/google/inject/spi/ProviderLookup.java | 21 +- core/test/com/google/inject/AllTests.java | 2 + .../com/google/inject/OptionalBindingTest.java | 3 + .../com/google/inject/ProvisionExceptionTest.java | 3 + .../google/inject/internal/RehashableKeysTest.java | 9 + .../com/google/inject/internal/WeakKeySetTest.java | 578 + extensions/assistedinject/pom.xml | 2 +- extensions/grapher/pom.xml | 2 +- .../inject/grapher/graphviz/GraphvizGrapher.java | 2 +- .../grapher/AbstractInjectorGrapherTest.java | 7 +- extensions/jmx/pom.xml | 2 +- extensions/jndi/pom.xml | 2 +- extensions/multibindings/pom.xml | 2 +- .../com/google/inject/multibindings/Element.java | 3 +- .../com/google/inject/multibindings/MapBinder.java | 110 +- .../google/inject/multibindings/Multibinder.java | 21 +- .../multibindings/MultibindingsTargetVisitor.java | 12 +- .../inject/multibindings/OptionalBinder.java | 542 + .../multibindings/OptionalBinderBinding.java | 75 + .../google/inject/multibindings/RealElement.java | 49 +- .../com/google/inject/multibindings/AllTests.java | 1 + .../com/google/inject/multibindings/Collector.java | 44 + .../google/inject/multibindings/MapBinderTest.java | 94 +- .../inject/multibindings/MultibinderTest.java | 69 +- .../inject/multibindings/OptionalBinderTest.java | 944 ++ .../com/google/inject/multibindings/SpiUtils.java | 432 +- .../inject/multibindings/WeakKeySetUtils.java | 68 + extensions/persist/pom.xml | 2 +- extensions/pom.xml | 22 +- extensions/servlet/pom.xml | 2 +- .../google/inject/servlet/ServletDefinition.java | 37 +- .../inject/servlet/ServletDefinitionPathsTest.java | 4 + extensions/spring/pom.xml | 2 +- extensions/struts2/pom.xml | 2 +- extensions/testlib/build.properties | 7 + extensions/testlib/build.xml | 20 + extensions/{throwingproviders => testlib}/pom.xml | 6 +- .../google/inject/testing/fieldbinder/Bind.java | 40 + .../testing/fieldbinder/BoundFieldModule.java | 363 + .../testing/fieldbinder/BoundFieldModuleTest.java | 671 ++ extensions/testlib/testlib.iml | 23 + extensions/throwingproviders/pom.xml | 2 +- lib/build/guice-4.0.xml | 11409 +++++++++++++++++++ pom.xml | 8 +- uploadApiDiffs.sh | 2 +- uploadJavadocs.sh | 8 +- 64 files changed, 15936 insertions(+), 370 deletions(-) diff --cc extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java index f5f1a24,c5b752e..3480b2a --- a/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java +++ b/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java @@@ -42,8 -43,8 +43,9 @@@ import com.google.inject.Key import com.google.inject.Module; import com.google.inject.Provider; import com.google.inject.TypeLiteral; +import com.google.inject.internal.Errors; import com.google.inject.binder.LinkedBindingBuilder; + import com.google.inject.internal.Errors; import com.google.inject.multibindings.Multibinder.RealMultibinder; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.Dependency; diff --cc extensions/pom.xml index 5777223,0efd256..8c5583a --- a/extensions/pom.xml +++ b/extensions/pom.xml @@@ -55,6 -56,16 +56,19 @@@ <scope>test</scope> </dependency> <!-- ++<<<<<<< HEAD ++======= + | Some extension tests depend on guava test libs which are not inherited + | from test scope. + --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava-testlib</artifactId> + <version>16.0.1</version> + <scope>test</scope> + </dependency> + <!-- ++>>>>>>> upstream/3.2.1+dfsg | Some extension tests depend on cglib which is not embedded | in an execution that doesn't include package. --> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-guice.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
