[libxbean-java] 01/02: Merge tag 'upstream/4.2'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository libxbean-java.

commit e05e690909573e40b9ef3995d40a0785f5145cff
Merge: 6d73940 59d4942
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon May 4 14:44:43 2015 +0200

    Merge tag 'upstream/4.2'
    
    Upstream version 4.2
    
    # gpg: Signature made Mon 04 May 2015 14:44:40 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 maven-xbean-plugin/pom.xml                         |  2 +-
 pom.xml                                            |  8 +--
 xbean-asm-util/pom.xml                             |  2 +-
 xbean-asm5-shaded/pom.xml                          |  2 +-
 xbean-blueprint/pom.xml                            | 56 ++++++++++++++---
 .../context/impl/XBeanNamespaceHandler.java        | 29 +++++----
 .../blueprint/context/BeerUsingBlueprintTest.java  | 11 ++--
 .../blueprint/context/BlueprintTestSupport.java    | 73 +++++++++-------------
 .../xbean/blueprint/context/ComponentTest.java     |  2 +-
 .../xbean/blueprint/context/FlatMapTest.java       | 69 ++++++++++----------
 .../xbean/blueprint/context/KegXBeanTest.java      | 28 +++++----
 .../blueprint/context/SoupUsingXBeanTest.java      |  6 +-
 .../xbean/blueprint/context/beer-xbean-ns.xml      |  2 +-
 .../apache/xbean/blueprint/context/soup-xbean.xml  |  6 +-
 xbean-bundleutils/pom.xml                          |  4 +-
 xbean-classloader/pom.xml                          |  2 +-
 xbean-classpath/pom.xml                            |  2 +-
 xbean-finder-shaded/pom.xml                        |  4 +-
 xbean-finder/pom.xml                               |  2 +-
 .../org/apache/xbean/finder/AnnotationFinder.java  | 55 +++++++++++++---
 .../java/org/apache/xbean/finder/ClassLoaders.java | 14 ++---
 .../apache/xbean/finder/archive/JarArchive.java    | 41 ++++++------
 .../apache/xbean/finder/ClassFinderDepthTest.java  | 33 +++++++---
 xbean-naming/pom.xml                               |  2 +-
 xbean-reflect/pom.xml                              |  2 +-
 xbean-spring/pom.xml                               |  2 +-
 xbean-telnet/pom.xml                               |  2 +-
 27 files changed, 269 insertions(+), 192 deletions(-)

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