[sisu-guice] branch master updated (8541f45 -> e5bba7b)

Eugene Zhukov eugene-guest at moszumanska.debian.org
Wed Jan 28 15:57:37 UTC 2015


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

eugene-guest pushed a change to branch master
in repository sisu-guice.

      from  8541f45   Revert "+dfsg suffix added back"
      adds  03f64e1   Imported Upstream version 3.2.5
       new  1cc7eed   Merge tag 'upstream/3.2.5'
       new  e5bba7b   Prepare for upload 3.2.5

The 2 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:
 .gitattributes                                     |   14 +
 .gitignore                                         |    3 +
 .../GUICE_183_fine_grained_singleton_lock.patch    |  101 +-
 PATCHES/GUICE_350_robust_system_get_property.patch |   68 --
 PATCHES/GUICE_492_slf4j_logger_injection.patch     |   32 +-
 PATCHES/GUICE_618_extensible_filter_pipeline.patch | 1029 +++++++++++++++++++-
 .../GUICE_618_followup_pipeline_experiment.patch   |  836 ----------------
 ...GUICE_695_persistence_properties_provider.patch |   95 --
 PATCHES/GUICE_697_add_missing_headers.patch        |  319 ------
 .../GUICE_718_configurable_annotation_check.patch  |   45 -
 PATCHES/GUICE_745_getpathinfo_not_decoded.patch    |   58 --
 PATCHES/SISUFY.patch                               |  189 +++-
 bom/pom.xml                                        |  108 ++
 build.xml                                          |    1 -
 core/pom.xml                                       |    2 +-
 core/src/com/google/inject/Scopes.java             |   59 +-
 .../inject/internal/AbstractBindingProcessor.java  |   20 -
 .../com/google/inject/internal/BytecodeGen.java    |   20 +-
 .../google/inject/internal/InheritingState.java    |    7 +
 .../com/google/inject/internal/InternalFlags.java  |   87 +-
 .../com/google/inject/internal/Nullability.java    |    2 +-
 .../internal/ProviderInstanceBindingImpl.java      |   30 +-
 .../internal/ProvisionListenerStackCallback.java   |    6 +-
 core/src/com/google/inject/internal/Scoping.java   |    6 +-
 .../com/google/inject/internal/SingletonScope.java |   71 ++
 core/src/com/google/inject/internal/State.java     |   10 +
 .../google/inject/spi/ProvidesMethodBinding.java   |    2 +-
 .../inject/spi/ProvidesMethodTargetVisitor.java    |    2 +-
 .../com/google/inject/ProvisionListenerTest.java   |   85 ++
 core/test/com/google/inject/ScopesTest.java        |  163 +++-
 .../com/google/inject/internal/WeakKeySetTest.java |    7 +-
 debian/changelog                                   |    7 +
 debian/maven.rules                                 |    6 +-
 debian/patches/allow_maven2.diff                   |   24 +-
 examples/examples.iml                              |   22 -
 extensions/assistedinject/assistedinject.iml       |   23 -
 extensions/assistedinject/pom.xml                  |    2 +-
 extensions/grapher/grapher.iml                     |   16 -
 extensions/grapher/pom.xml                         |    2 +-
 extensions/jmx/jmx.iml                             |   14 -
 extensions/jmx/pom.xml                             |    2 +-
 extensions/jndi/jndi.iml                           |   13 -
 extensions/jndi/pom.xml                            |    2 +-
 extensions/multibindings/multibindings.iml         |   14 -
 extensions/multibindings/pom.xml                   |    2 +-
 .../com/google/inject/multibindings/Indexer.java   |    2 +-
 .../com/google/inject/multibindings/MapBinder.java |   33 +-
 .../google/inject/multibindings/Multibinder.java   |   40 +-
 .../inject/multibindings/OptionalBinder.java       |  239 ++++-
 .../google/inject/multibindings/MapBinderTest.java |   73 +-
 .../inject/multibindings/MultibinderTest.java      |  126 ++-
 .../inject/multibindings/OptionalBinderTest.java   |  256 ++++-
 .../inject/multibindings/RealElementTest.java      |    2 +-
 .../com/google/inject/multibindings/SpiUtils.java  |  216 +++-
 extensions/persist/persist.iml                     |   34 -
 extensions/persist/pom.xml                         |   10 +-
 .../inject/persist/jpa/JpaPersistModule.java       |   28 +-
 .../inject/persist/jpa/JpaPersistService.java      |    8 +-
 extensions/persist/test/META-INF/persistence.xml   |   14 +
 .../EnsureJpaCanTakeObjectsInPropertiesTest.java   |  110 +++
 .../inject/persist/jpa/JpaPersistServiceTest.java  |    4 +-
 .../inject/persist/jpa/JpaWorkManagerTest.java     |    7 +-
 extensions/pom.xml                                 |    2 +-
 extensions/service/service.iml                     |   14 -
 extensions/servlet/pom.xml                         |    2 +-
 extensions/servlet/servlet.iml                     |   41 -
 .../inject/servlet/AbstractFilterPipeline.java     |   20 +-
 .../inject/servlet/AbstractServletPipeline.java    |   50 +-
 .../google/inject/servlet/FilterDefinition.java    |    8 +-
 .../com/google/inject/servlet/FilterPipeline.java  |   19 +-
 .../src/com/google/inject/servlet/GuiceFilter.java |    2 +-
 .../inject/servlet/ManagedFilterPipeline.java      |    8 +-
 .../inject/servlet/ManagedServletPipeline.java     |    2 +-
 .../google/inject/servlet/ServletDefinition.java   |    9 +-
 .../com/google/inject/servlet/ServletScopes.java   |   13 +-
 .../com/google/inject/servlet/UriPatternType.java  |    9 +-
 .../ServletPipelineRequestDispatcherTest.java      |   44 +
 extensions/spring/pom.xml                          |    2 +-
 extensions/spring/spring.iml                       |   50 -
 extensions/struts2/example/struts2-example.iml     |  141 ---
 extensions/struts2/pom.xml                         |    2 +-
 extensions/struts2/struts2-plugin.iml              |  140 ---
 extensions/testlib/pom.xml                         |    2 +-
 extensions/testlib/testlib.iml                     |   23 -
 extensions/throwingproviders/pom.xml               |    2 +-
 extensions/throwingproviders/throwingproviders.iml |   23 -
 guice.iml                                          |  110 ---
 guice.ipr                                          |  624 ------------
 jdk8-tests/pom.xml                                 |   71 ++
 .../inject/jdk8/DefaultMethodInterceptionTest.java |  223 +++++
 .../jdk8/Java8LanguageFeatureBindingTest.java      |  168 ++++
 lib/build/header-definitions.xml                   |   15 +
 lib/build/header.txt                               |   13 +
 pom.xml                                            |   46 +-
 94 files changed, 3502 insertions(+), 3224 deletions(-)
 create mode 100644 .gitattributes
 delete mode 100644 PATCHES/GUICE_350_robust_system_get_property.patch
 delete mode 100644 PATCHES/GUICE_618_followup_pipeline_experiment.patch
 delete mode 100644 PATCHES/GUICE_695_persistence_properties_provider.patch
 delete mode 100644 PATCHES/GUICE_697_add_missing_headers.patch
 delete mode 100644 PATCHES/GUICE_718_configurable_annotation_check.patch
 delete mode 100644 PATCHES/GUICE_745_getpathinfo_not_decoded.patch
 create mode 100644 bom/pom.xml
 create mode 100644 core/src/com/google/inject/internal/SingletonScope.java
 delete mode 100644 examples/examples.iml
 delete mode 100644 extensions/assistedinject/assistedinject.iml
 delete mode 100644 extensions/grapher/grapher.iml
 delete mode 100644 extensions/jmx/jmx.iml
 delete mode 100644 extensions/jndi/jndi.iml
 delete mode 100644 extensions/multibindings/multibindings.iml
 delete mode 100644 extensions/persist/persist.iml
 create mode 100644 extensions/persist/test/com/google/inject/persist/jpa/EnsureJpaCanTakeObjectsInPropertiesTest.java
 delete mode 100644 extensions/service/service.iml
 delete mode 100644 extensions/servlet/servlet.iml
 delete mode 100644 extensions/spring/spring.iml
 delete mode 100644 extensions/struts2/example/struts2-example.iml
 delete mode 100644 extensions/struts2/struts2-plugin.iml
 delete mode 100644 extensions/testlib/testlib.iml
 delete mode 100644 extensions/throwingproviders/throwingproviders.iml
 delete mode 100644 guice.iml
 delete mode 100644 guice.ipr
 create mode 100644 jdk8-tests/pom.xml
 create mode 100644 jdk8-tests/test/com/google/inject/jdk8/DefaultMethodInterceptionTest.java
 create mode 100644 jdk8-tests/test/com/google/inject/jdk8/Java8LanguageFeatureBindingTest.java
 create mode 100644 lib/build/header-definitions.xml
 create mode 100644 lib/build/header.txt

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



More information about the pkg-java-commits mailing list