[felix-bundlerepository] 02/04: Merge tag 'upstream/2.0.4'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository felix-bundlerepository.

commit 72a34b3155ed302de877e4904579e97fb7b6d31a
Merge: 593f60a 9df0a9b
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon May 4 13:44:16 2015 +0200

    Merge tag 'upstream/2.0.4'
    
    Upstream version 2.0.4
    
    # gpg: Signature made Mon 04 May 2015 13:44:12 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]

 doc/changelog.txt                                  |  14 ++-
 pom.xml                                            |  10 +-
 .../impl/LazyLocalResourceImpl.java                | 120 +++++++++++++++++++++
 .../bundlerepository/impl/LocalRepositoryImpl.java |  34 +++---
 .../bundlerepository/impl/LocalResourceImpl.java   |  54 +++-------
 .../bundlerepository/impl/ResourceComparator.java  |  10 +-
 .../felix/bundlerepository/impl/ResourceImpl.java  |  74 ++++++++++++-
 .../impl/OSGiRepositoryImplTest.java               |  32 ++++++
 .../impl/OSGiRepositoryXMLTest.java                |   3 +
 .../bundlerepository/impl/RepositoryAdminTest.java |  13 ++-
 .../bundlerepository/impl/RepositoryImplTest.java  |   8 +-
 .../bundlerepository/impl/ResolverImplTest.java    |  16 ++-
 .../bundlerepository/impl/ResourceImplTest.java    |  85 +++++++++++++++
 .../bundlerepository/impl/StaxParserTest.java      |  17 +--
 14 files changed, 400 insertions(+), 90 deletions(-)

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