[bnd] 01/06: Merge tag 'upstream/2.4.1'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository bnd.

commit 5f9a65f8075266f6199ae0d46c9df093f0e4c9c8
Merge: 52068b2 da12a3a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 17 10:02:52 2015 +0100

    Merge tag 'upstream/2.4.1'
    
    Upstream version 2.4.1

 .travis.yml                                        |   4 +-
 aQute.libg/bnd.bnd                                 |   2 +-
 aQute.libg/src/aQute/lib/converter/Converter.java  |  11 ++
 aQute.libg/src/aQute/lib/tag/Tag.java              |  59 ++------
 .../test/aQute/lib/converter/ConverterTest.java    |  13 ++
 biz.aQute.bnd.annotation/build.gradle              |   1 +
 biz.aQute.bnd.gradle/bnd.bnd                       |   2 +-
 biz.aQute.bnd.gradle/build.gradle                  |  10 +-
 biz.aQute.bnd/bnd.bnd                              |   2 +-
 biz.aQute.bnd/build.gradle                         |   1 +
 biz.aQute.bndlib.tests/src/test/MavenTest.java     |  67 ++++++++-
 biz.aQute.bndlib.tests/src/test/VerifierTest.java  |  26 +++-
 biz.aQute.bndlib/bnd.bnd                           |   2 +-
 biz.aQute.bndlib/build.gradle                      |   1 +
 .../src/aQute/bnd/build/ProjectLauncher.java       |   2 +
 .../src/aQute/bnd/maven/PomResource.java           | 133 +++++++++++++----
 biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java   |  12 +-
 biz.aQute.bndlib/src/aQute/bnd/osgi/Constants.java |   3 +-
 biz.aQute.bndlib/src/aQute/bnd/osgi/Verifier.java  |   2 +-
 .../launcher/plugin/ProjectLaunchImplTest.java     |  33 ++---
 biz.aQute.resolve/bnd.bnd                          |   2 +-
 .../src/biz/aQute/resolve/ResolverLogger.java      | 158 ++++++++++++++-------
 .../test/biz/aQute/resolve/ResolverLoggerTest.java |  20 +++
 build.gradle                                       |  19 ++-
 cnf/build.bnd                                      |  25 +++-
 cnf/gradle/maven-artifacts.gradle                  |  59 ++++++++
 gradle.properties                                  |  15 +-
 org.osgi.impl.bundle.repoindex.ant/bnd.bnd         |   2 +-
 org.osgi.impl.bundle.repoindex.cli/bnd.bnd         |   2 +-
 org.osgi.impl.bundle.repoindex.cli/build.gradle    |   1 +
 org.osgi.impl.bundle.repoindex.lib/bnd.bnd         |   2 +-
 .../service/indexer/impl/known-bundles.properties  |   6 +-
 org.osgi.impl.bundle.repoindex.test/bnd.bnd        |   5 +
 .../org/example/tests/cli/TestCommandLine.java     |  34 +++--
 settings.gradle                                    |  50 +++----
 35 files changed, 560 insertions(+), 226 deletions(-)

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