[guice] 01/05: Merge tag 'upstream/4.0'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Nov 19 18:26:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository guice.
commit 2c92a751aacf2686e81c1eedcb793731cf99a77a
Merge: d8121b2 b992e7c
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Nov 19 11:00:18 2015 +0100
Merge tag 'upstream/4.0'
Upstream version 4.0
.gitattributes | 14 +
.gitignore | 3 +
README.md | 4 +-
bom/pom.xml | 113 +
build.properties | 2 +
build.xml | 14 +-
core/pom.xml | 2 +-
core/src/com/google/inject/Binder.java | 38 +-
core/src/com/google/inject/PrivateModule.java | 1 +
core/src/com/google/inject/Scopes.java | 68 +-
.../google/inject/binder/LinkedBindingBuilder.java | 1 +
.../com/google/inject/internal/Annotations.java | 15 +-
.../google/inject/internal/BindingProcessor.java | 4 +-
.../inject/internal/BoundProviderFactory.java | 5 +-
.../com/google/inject/internal/BytecodeGen.java | 13 +-
.../inject/internal/ConstructionContext.java | 17 +-
.../inject/internal/ConstructorBindingImpl.java | 4 +-
.../inject/internal/ConstructorInjector.java | 13 +-
.../google/inject/internal/CycleDetectingLock.java | 302 +
.../google/inject/internal/DelayedInitialize.java | 16 +-
.../internal/DelegatingInvocationHandler.java | 29 +-
core/src/com/google/inject/internal/Errors.java | 48 +
.../google/inject/internal/InheritingState.java | 25 +-
.../com/google/inject/internal/InjectorImpl.java | 64 +-
.../com/google/inject/internal/InjectorShell.java | 20 +
.../google/inject/internal/InternalContext.java | 83 +-
.../InternalFactoryToInitializableAdapter.java | 7 +-
.../com/google/inject/internal/InternalFlags.java | 120 +-
.../google/inject/internal/LookupProcessor.java | 2 +-
.../ModuleAnnotatedMethodScannerProcessor.java | 22 +-
core/src/com/google/inject/internal/MoreTypes.java | 55 +-
.../com/google/inject/internal/Nullability.java | 16 +
.../inject/internal/ProvidedByInternalFactory.java | 7 +-
.../internal/ProviderInstanceBindingImpl.java | 30 +-
.../inject/internal/ProviderInternalFactory.java | 15 +-
.../com/google/inject/internal/ProviderMethod.java | 83 +-
.../inject/internal/ProviderMethodsModule.java | 127 +-
.../internal/ProvisionListenerStackCallback.java | 6 +-
.../com/google/inject/internal/SingletonScope.java | 343 +
core/src/com/google/inject/internal/State.java | 18 +
.../com/google/inject/internal/package-info.java | 3 +-
.../google/inject/spi/DefaultElementVisitor.java | 4 +
core/src/com/google/inject/spi/Dependency.java | 3 +-
.../com/google/inject/spi/DependencyAndSource.java | 1 +
core/src/com/google/inject/spi/ElementSource.java | 18 +
core/src/com/google/inject/spi/ElementVisitor.java | 10 +
core/src/com/google/inject/spi/Elements.java | 165 +-
core/src/com/google/inject/spi/InjectionPoint.java | 14 +
.../inject/spi/ModuleAnnotatedMethodScanner.java | 55 +
.../spi/ModuleAnnotatedMethodScannerBinding.java | 59 +
core/src/com/google/inject/spi/ModuleSource.java | 76 +-
.../google/inject/spi/ProviderInstanceBinding.java | 5 +-
core/src/com/google/inject/spi/ProviderLookup.java | 24 +-
.../google/inject/spi/ProvidesMethodBinding.java | 30 +-
.../inject/spi/ProvidesMethodTargetVisitor.java | 16 +
.../com/google/inject/spi/ProvisionListener.java | 6 +-
core/src/com/google/inject/spi/Toolable.java | 16 +
core/src/com/google/inject/spi/package-info.java | 3 +-
core/src/com/google/inject/util/Modules.java | 27 +-
core/test/com/google/inject/AllTests.java | 2 +
core/test/com/google/inject/Asserts.java | 42 +
core/test/com/google/inject/JitBindingsTest.java | 180 +-
core/test/com/google/inject/KeyTest.java | 43 +
.../com/google/inject/ProvisionListenerTest.java | 85 +
core/test/com/google/inject/ScopesTest.java | 440 +-
.../inject/internal/CycleDetectingLockTest.java | 101 +
.../com/google/inject/internal/WeakKeySetTest.java | 27 +-
.../google/inject/internal/WeakKeySetUtils.java | 42 -
.../spi/ModuleAnnotatedMethodScannerTest.java | 394 +
.../com/google/inject/spi/ProviderMethodsTest.java | 195 +-
.../com/google/inject/util/OverrideModuleTest.java | 52 +-
.../googlecode/guice/bundle/OSGiTestActivator.java | 258 +-
extensions/assistedinject/.gitignore | 1 +
extensions/assistedinject/pom.xml | 2 +-
.../inject/assistedinject/FactoryProvider2.java | 183 +-
.../google/inject/assistedinject/package-info.java | 4 +-
.../assistedinject/FactoryProvider2Test.java | 86 +
extensions/dagger-adapter/build.properties | 8 +
extensions/dagger-adapter/build.xml | 21 +
extensions/dagger-adapter/pom.xml | 24 +
.../google/inject/daggeradapter/DaggerAdapter.java | 90 +
.../inject/daggeradapter/DaggerMethodScanner.java | 75 +
.../inject/daggeradapter/DaggerAdapterTest.java | 99 +
extensions/grapher/pom.xml | 2 +-
.../inject/grapher/AbstractInjectorGrapher.java | 6 +-
.../src/com/google/inject/grapher/Alias.java | 1 +
.../com/google/inject/grapher/AliasCreator.java | 1 +
.../src/com/google/inject/grapher/BindingEdge.java | 1 +
.../inject/grapher/DefaultRootKeySetCreator.java | 1 +
.../com/google/inject/grapher/DependencyEdge.java | 1 +
.../src/com/google/inject/grapher/Edge.java | 1 +
.../src/com/google/inject/grapher/EdgeCreator.java | 1 +
.../google/inject/grapher/ImplementationNode.java | 2 +-
.../com/google/inject/grapher/InjectorGrapher.java | 5 +-
.../com/google/inject/grapher/InstanceNode.java | 1 +
.../com/google/inject/grapher/InterfaceNode.java | 2 +-
.../src/com/google/inject/grapher/Node.java | 1 +
.../src/com/google/inject/grapher/NodeCreator.java | 1 +
.../src/com/google/inject/grapher/NodeId.java | 7 +-
.../google/inject/grapher/RootKeySetCreator.java | 1 +
.../grapher/TransitiveDependencyVisitor.java | 3 +-
.../inject/grapher/graphviz/GraphvizEdge.java | 2 +
.../inject/grapher/graphviz/GraphvizGrapher.java | 1 +
.../inject/grapher/graphviz/GraphvizNode.java | 6 +-
extensions/jmx/.gitignore | 1 +
extensions/jmx/pom.xml | 2 +-
.../com/google/inject/tools/jmx/package-info.java | 4 +-
extensions/jndi/pom.xml | 2 +-
.../src/com/google/inject/jndi/package-info.java | 4 +-
extensions/mini/.gitignore | 1 +
extensions/multibindings/.gitignore | 1 +
extensions/multibindings/pom.xml | 2 +-
.../google/inject/multibindings/ClassMapKey.java} | 23 +-
.../com/google/inject/multibindings/Indexer.java | 2 +-
.../com/google/inject/multibindings/MapBinder.java | 103 +-
.../com/google/inject/multibindings/MapKey.java | 60 +
.../google/inject/multibindings/Multibinder.java | 81 +-
.../inject/multibindings/MultibindingsScanner.java | 194 +
.../inject/multibindings/OptionalBinder.java | 272 +-
.../inject/multibindings/ProvidesIntoMap.java | 59 +
.../inject/multibindings/ProvidesIntoOptional.java | 66 +
.../inject/multibindings/ProvidesIntoSet.java} | 45 +-
.../google/inject/multibindings/StringMapKey.java} | 23 +-
.../google/inject/multibindings/package-info.java | 4 +-
.../com/google/inject/multibindings/AllTests.java | 1 +
.../google/inject/multibindings/MapBinderTest.java | 84 +-
.../inject/multibindings/MultibinderTest.java | 211 +-
.../inject/multibindings/OptionalBinderTest.java | 259 +-
.../inject/multibindings/ProvidesIntoTest.java | 373 +
.../inject/multibindings/RealElementTest.java | 2 +-
.../com/google/inject/multibindings/SpiUtils.java | 216 +-
extensions/persist/pom.xml | 10 +-
.../google/inject/persist/finder/package-info.java | 18 +-
.../inject/persist/jpa/JpaPersistModule.java | 22 +-
.../inject/persist/jpa/JpaPersistService.java | 6 +-
.../google/inject/persist/jpa/package-info.java | 18 +-
.../com/google/inject/persist/package-info.java | 4 +-
extensions/persist/test/META-INF/persistence.xml | 14 +
.../EnsureJpaCanTakeObjectsInPropertiesTest.java | 110 +
.../inject/persist/jpa/JpaWorkManagerTest.java | 7 +-
extensions/pom.xml | 4 +-
.../com/google/inject/service/AsyncService.java | 9 +-
extensions/servlet/pom.xml | 2 +-
.../inject/servlet/ManagedServletPipeline.java | 32 +-
.../google/inject/servlet/ScopingException.java | 1 +
.../src/com/google/inject/servlet/ScopingOnly.java | 1 +
.../google/inject/servlet/ServletDefinition.java | 8 +
.../com/google/inject/servlet/ServletScopes.java | 16 +-
.../com/google/inject/servlet/ServletUtils.java | 16 +-
.../com/google/inject/servlet/package-info.java | 4 +-
.../inject/servlet/ServletDefinitionPathsTest.java | 9 +
.../ServletPipelineRequestDispatcherTest.java | 44 +
extensions/spring/.gitignore | 1 +
extensions/spring/pom.xml | 2 +-
.../src/com/google/inject/spring/package-info.java | 4 +-
extensions/struts2/.gitignore | 1 +
extensions/struts2/pom.xml | 2 +-
extensions/testlib/pom.xml | 2 +-
extensions/throwingproviders/pom.xml | 2 +-
.../throwingproviders/CheckedProvideUtils.java | 16 +-
.../throwingproviders/CheckedProviderMethod.java | 12 +-
.../CheckedProviderMethodsModule.java | 9 +-
.../CheckedProviderWithDependencies.java | 16 +-
.../inject/throwingproviders/CheckedProvides.java | 9 +-
.../inject/throwingproviders/ThrowingInject.java | 1 +
.../throwingproviders/ThrowingProviderBinder.java | 118 +-
.../inject/throwingproviders/package-info.java | 4 +-
.../throwingproviders/CheckedProviderTest.java | 88 +-
.../throwingproviders/ThrowingProviderTest.java | 74 +-
jdk8-tests/pom.xml | 71 +
.../inject/jdk8/DefaultMethodInterceptionTest.java | 223 +
.../jdk8/Java8LanguageFeatureBindingTest.java | 168 +
latest-api-diffs/3.0.xml | 14898 +++++++++----------
lib/build/header-definitions.xml | 15 +
lib/build/header.txt | 13 +
pom.xml | 65 +-
176 files changed, 14532 insertions(+), 8537 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guice.git
More information about the pkg-java-commits
mailing list