[felix-utils] 01/03: Merge tag 'upstream/1.6.0'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Apr 9 11:02:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository felix-utils.
commit 7596a97196331cb593292a7cf2252adb1a8104e1
Merge: e80b37e 528f03a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Apr 9 12:30:41 2014 +0200
Merge tag 'upstream/1.6.0'
Upstream version 1.6.0
doc/changelog.txt | 38 ++-
pom.xml | 33 +-
.../felix/utils/extender/AbstractExtender.java | 333 +++++++++++++++++++++
.../org/apache/felix/utils/extender/Extension.java | 36 +++
.../felix/utils/extender/SimpleExtension.java | 70 +++++
.../org/apache/felix/utils/manifest/Parser.java | 10 +-
.../utils/properties/InterpolationHelper.java | 167 +++++++++--
.../apache/felix/utils/properties/Properties.java | 254 +++++++++++++---
.../utils/service/BaseManagedServiceFactory.java | 208 +++++++++++++
.../utils/properties/InterpolationHelperTest.java | 108 +++++--
.../felix/utils/properties/PropertiesTest.java | 150 ++++++++++
11 files changed, 1288 insertions(+), 119 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/felix-utils.git
More information about the pkg-java-commits
mailing list