[bnd] 01/01: Imported Debian patch 1.50.0-9

Markus Koschany apo-guest at moszumanska.debian.org
Fri Jun 5 22:07:30 UTC 2015


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

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

commit 8b7f327145b1d281b55506b9bb761870086ab73e
Merge: 415936d 2e6d6c7
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Jun 5 23:55:15 2015 +0200

    Imported Debian patch 1.50.0-9

 README                                             |   78 +-
 aQute.libg/.classpath                              |    1 +
 aQute.libg/.project                                |    6 -
 aQute.libg/.settings/org.eclipse.jdt.core.prefs    |  351 +-
 aQute.libg/.settings/org.eclipse.jdt.ui.prefs      |   61 -
 aQute.libg/bnd.bnd                                 |    9 +-
 aQute.libg/src/aQute/configurable/Config.java      |   17 -
 .../src/aQute/configurable/Configurable.java       |  312 -
 aQute.libg/src/aQute/configurable/packageinfo      |    1 -
 aQute.libg/src/aQute/lib/base64/Base64.java        |  100 +-
 aQute.libg/src/aQute/lib/base64/packageinfo        |    2 +-
 aQute.libg/src/aQute/lib/codec/Codec.java          |   10 -
 aQute.libg/src/aQute/lib/codec/HCodec.java         |   77 -
 .../aQute/lib/collections/EnumerationIterator.java |   42 -
 aQute.libg/src/aQute/lib/collections/ExtList.java  |   56 -
 .../src/aQute/lib/collections/IteratorList.java    |   12 -
 .../src/aQute/lib/collections/LineCollection.java  |    5 +-
 aQute.libg/src/aQute/lib/collections/Logic.java    |   12 +-
 aQute.libg/src/aQute/lib/collections/MultiMap.java |  162 +-
 .../src/aQute/lib/collections/SortedList.java      |  438 --
 aQute.libg/src/aQute/lib/collections/packageinfo   |    2 +-
 aQute.libg/src/aQute/lib/converter/Converter.java  |  526 --
 .../src/aQute/lib/converter/TypeReference.java     |   13 -
 aQute.libg/src/aQute/lib/converter/packageinfo     |    1 -
 aQute.libg/src/aQute/lib/data/AllowNull.java       |   11 -
 aQute.libg/src/aQute/lib/data/Data.java            |   80 -
 aQute.libg/src/aQute/lib/data/Numeric.java         |   15 -
 aQute.libg/src/aQute/lib/data/Validator.java       |   13 -
 aQute.libg/src/aQute/lib/data/packageinfo          |    1 -
 aQute.libg/src/aQute/lib/filter/Filter.java        |  662 +-
 aQute.libg/src/aQute/lib/getopt/Arguments.java     |    8 -
 aQute.libg/src/aQute/lib/getopt/CommandLine.java   |  475 --
 .../src/aQute/lib/getopt/CommandLineMessages.java  |   25 -
 aQute.libg/src/aQute/lib/getopt/Description.java   |    8 -
 .../src/aQute/lib/getopt/OptionArgument.java       |    8 -
 aQute.libg/src/aQute/lib/getopt/Options.java       |   15 -
 aQute.libg/src/aQute/lib/getopt/packageinfo        |    1 -
 aQute.libg/src/aQute/lib/hex/Hex.java              |   47 +-
 aQute.libg/src/aQute/lib/index/Index.java          |   73 +-
 aQute.libg/src/aQute/lib/io/IO.java                |  385 +-
 .../src/aQute/lib/io/LimitedInputStream.java       |   40 +-
 aQute.libg/src/aQute/lib/io/packageinfo            |    2 +-
 aQute.libg/src/aQute/lib/json/ArrayHandler.java    |   40 -
 aQute.libg/src/aQute/lib/json/BooleanHandler.java  |   34 -
 .../src/aQute/lib/json/ByteArrayHandler.java       |   80 -
 .../src/aQute/lib/json/CharacterHandler.java       |   35 -
 .../src/aQute/lib/json/CollectionHandler.java      |   57 -
 aQute.libg/src/aQute/lib/json/DateHandler.java     |   32 -
 aQute.libg/src/aQute/lib/json/Decoder.java         |  186 -
 aQute.libg/src/aQute/lib/json/Encoder.java         |  149 -
 aQute.libg/src/aQute/lib/json/EnumHandler.java     |   26 -
 aQute.libg/src/aQute/lib/json/FileHandler.java     |   41 -
 aQute.libg/src/aQute/lib/json/Handler.java         |   34 -
 aQute.libg/src/aQute/lib/json/JSONCodec.java       |  492 --
 aQute.libg/src/aQute/lib/json/MapHandler.java      |   95 -
 aQute.libg/src/aQute/lib/json/NumberHandler.java   |   73 -
 aQute.libg/src/aQute/lib/json/ObjectHandler.java   |  153 -
 aQute.libg/src/aQute/lib/json/SpecialHandler.java  |   41 -
 aQute.libg/src/aQute/lib/json/StringHandler.java   |  152 -
 aQute.libg/src/aQute/lib/json/packageinfo          |    1 -
 aQute.libg/src/aQute/lib/justif/Justif.java        |  128 -
 aQute.libg/src/aQute/lib/justif/packageinfo        |    1 -
 .../src/aQute/lib/putjar/DirectoryInputStream.java |  544 +-
 aQute.libg/src/aQute/lib/settings/Settings.java    |  251 -
 aQute.libg/src/aQute/lib/settings/packageinfo      |    1 -
 aQute.libg/src/aQute/lib/tag/Tag.java              |  123 +-
 aQute.libg/src/aQute/libg/asn1/BER.java            |  924 +--
 aQute.libg/src/aQute/libg/asn1/PDU.java            |  211 +-
 aQute.libg/src/aQute/libg/asn1/Types.java          |  117 +-
 aQute.libg/src/aQute/libg/cafs/CAFS.java           |  152 +-
 .../src/aQute/libg/classdump/ClassDumper.java      | 1328 ++--
 .../libg/classloaders/URLClassLoaderWrapper.java   |   19 +-
 aQute.libg/src/aQute/libg/classloaders/packageinfo |    1 -
 aQute.libg/src/aQute/libg/clauses/Clauses.java     |   22 +-
 aQute.libg/src/aQute/libg/clauses/Selector.java    |   55 +-
 aQute.libg/src/aQute/libg/command/Command.java     |  219 +-
 aQute.libg/src/aQute/libg/command/packageinfo      |    2 +-
 aQute.libg/src/aQute/libg/cryptography/Crypto.java |   53 +-
 aQute.libg/src/aQute/libg/cryptography/Digest.java |   31 +-
 .../src/aQute/libg/cryptography/Digester.java      |   45 +-
 aQute.libg/src/aQute/libg/cryptography/Key.java    |    2 +
 aQute.libg/src/aQute/libg/cryptography/MD5.java    |   41 +-
 aQute.libg/src/aQute/libg/cryptography/RSA.java    |   18 +-
 aQute.libg/src/aQute/libg/cryptography/SHA1.java   |   37 +-
 aQute.libg/src/aQute/libg/cryptography/SHA256.java |   49 -
 aQute.libg/src/aQute/libg/cryptography/Signer.java |   33 +-
 .../src/aQute/libg/cryptography/Verifier.java      |   25 +-
 aQute.libg/src/aQute/libg/cryptography/packageinfo |    2 +-
 aQute.libg/src/aQute/libg/dumpzip/DumpZip.java     |    9 +
 .../aQute/{lib/codec => libg/dumpzip}/packageinfo  |    0
 aQute.libg/src/aQute/libg/filecheck/FileCheck.java |   12 +
 .../src/aQute/libg/filecheck}/packageinfo          |    0
 .../src/aQute/libg/fileiterator/FileIterator.java  |   65 +-
 .../src/aQute/libg/filelock/DirectoryLock.java     |   13 +-
 aQute.libg/src/aQute/libg/filelock/packageinfo     |    1 -
 aQute.libg/src/aQute/libg/filerepo/FileRepo.java   |  106 +
 .../src/aQute/libg/filerepo}/packageinfo           |    0
 aQute.libg/src/aQute/libg/filters/AndFilter.java   |   30 -
 aQute.libg/src/aQute/libg/filters/Filter.java      |   14 -
 .../src/aQute/libg/filters/LiteralFilter.java      |   16 -
 aQute.libg/src/aQute/libg/filters/NotFilter.java   |   19 -
 aQute.libg/src/aQute/libg/filters/Operator.java    |   17 -
 aQute.libg/src/aQute/libg/filters/OrFilter.java    |   30 -
 .../src/aQute/libg/filters/SimpleFilter.java       |   33 -
 aQute.libg/src/aQute/libg/filters/packageinfo      |    1 -
 aQute.libg/src/aQute/libg/forker/Forker.java       |   44 +-
 aQute.libg/src/aQute/libg/generics/Create.java     |   83 +-
 aQute.libg/src/aQute/libg/glob/Glob.java           |  166 +-
 aQute.libg/src/aQute/libg/glob/packageinfo         |    1 -
 aQute.libg/src/aQute/libg/gzip/GZipUtils.java      |   57 -
 aQute.libg/src/aQute/libg/gzip/packageinfo         |    1 -
 aQute.libg/src/aQute/libg/header/OSGiHeader.java   |  145 +
 .../src/aQute/libg/header}/packageinfo             |    0
 aQute.libg/src/aQute/libg/log/Logger.java          |   15 +-
 aQute.libg/src/aQute/libg/map/MAP.java             |   31 +-
 aQute.libg/src/aQute/libg/map/packageinfo          |    1 -
 .../src/aQute/libg/qtokens/QuotedTokenizer.java    |   54 +-
 aQute.libg/src/aQute/libg/reporter/Message.java    |    5 -
 aQute.libg/src/aQute/libg/reporter/Reporter.java   |   15 +
 .../src/aQute/libg/reporter/ReporterAdapter.java   |  304 -
 .../src/aQute/libg/reporter/ReporterMessages.java  |   97 -
 aQute.libg/src/aQute/libg/reporter/packageinfo     |    2 +-
 aQute.libg/src/aQute/libg/sax/ContentFilter.java   |    3 +-
 .../src/aQute/libg/sax/ContentFilterImpl.java      |   27 +-
 aQute.libg/src/aQute/libg/sax/SAXElement.java      |   13 +-
 aQute.libg/src/aQute/libg/sax/SAXUtil.java         |   27 +-
 .../libg/sax/filters/ElementSelectionFilter.java   |   37 +-
 .../aQute/libg/sax/filters/MergeContentFilter.java |   28 +-
 aQute.libg/src/aQute/libg/sed/Domain.java          |    9 -
 aQute.libg/src/aQute/libg/sed/Replacer.java        |    2 +-
 aQute.libg/src/aQute/libg/sed/ReplacerAdapter.java |  935 ---
 aQute.libg/src/aQute/libg/sed/Sed.java             |  147 +-
 aQute.libg/src/aQute/libg/sed/packageinfo          |    2 +-
 aQute.libg/src/aQute/libg/tarjan/Tarjan.java       |   68 +-
 .../src/aQute/libg/tuple/ComparablePair.java       |   14 -
 aQute.libg/src/aQute/libg/tuple/Pair.java          |   78 +-
 aQute.libg/src/aQute/libg/version/Version.java     |  164 +
 .../src/aQute/libg/version/VersionRange.java       |   85 +
 .../aQute/{lib/codec => libg/version}/packageinfo  |    0
 aQute.libg/src/aQute/libg/xslt/Transform.java      |   63 +-
 .../src/aQute/service/reporter/Messages.java       |   14 -
 aQute.libg/src/aQute/service/reporter/Report.java  |   53 -
 .../src/aQute/service/reporter/Reporter.java       |  130 -
 aQute.libg/src/aQute/service/reporter/packageinfo  |    1 -
 aQute.libg/src/test/CommandTest.java               |   95 -
 aQute.libg/src/test/ConverterTest.java             |  395 -
 aQute.libg/src/test/ExecuteTest.java               |   23 -
 aQute.libg/src/test/GlobTest.java                  |   29 -
 aQute.libg/src/test/HexTest.java                   |   95 -
 aQute.libg/src/test/JSONTest.java                  |  707 --
 aQute.libg/src/test/JustifTest.java                |   25 -
 aQute.libg/src/test/ReplacerTest.java              |  520 --
 aQute.libg/src/test/SettingsTest.java              |   36 -
 aQute.libg/src/test/TestCAFS.java                  |  113 +-
 aQute.libg/src/test/TestDirectoryInputStream.java  |   25 +-
 aQute.libg/src/test/TestForker.java                |   29 +-
 aQute.libg/src/test/TestGzipUtils.java             |   21 -
 aQute.libg/src/test/TestIndex.java                 |  115 +-
 aQute.libg/src/test/TestSAXFilters.java            |   85 +-
 aQute.libg/src/test/TestTarjan.java                |   47 +-
 aQute.libg/src/test/unzipped.dat                   |    1 -
 aQute.libg/src/test/zipped.dat                     |  Bin 55 -> 0 bytes
 biz.aQute.bnd/.classpath                           |    3 +
 biz.aQute.bnd/.project                             |    9 +-
 biz.aQute.bnd/.settings/org.eclipse.jdt.core.prefs |  351 +-
 biz.aQute.bnd/.settings/org.eclipse.jdt.ui.prefs   |   61 -
 biz.aQute.bnd/META-INF/MANIFEST.MF                 |   38 +
 biz.aQute.bnd/annotation.bnd                       |    2 +-
 biz.aQute.bnd/biz.aQute.bnd.bnd                    |   35 +-
 biz.aQute.bnd/bnd.bnd                              |   49 +-
 biz.aQute.bnd/bnd/embedded-repo.bnd                |    2 -
 biz.aQute.bnd/build.properties                     |    4 +
 biz.aQute.bnd/icons/active.gif                     |  Bin 0 -> 914 bytes
 biz.aQute.bnd/icons/bundle.gif                     |  Bin 0 -> 914 bytes
 biz.aQute.bnd/icons/export-package.gif             |  Bin 0 -> 972 bytes
 biz.aQute.bnd/icons/fragment.gif                   |  Bin 0 -> 164 bytes
 biz.aQute.bnd/icons/host.gif                       |  Bin 0 -> 129 bytes
 biz.aQute.bnd/icons/import-package.gif             |  Bin 0 -> 233 bytes
 biz.aQute.bnd/icons/importing-bundle.gif           |  Bin 0 -> 230 bytes
 biz.aQute.bnd/icons/installed.gif                  |  Bin 0 -> 179 bytes
 biz.aQute.bnd/icons/inuse.gif                      |  Bin 0 -> 352 bytes
 biz.aQute.bnd/icons/logo16x16.gif                  |  Bin 0 -> 360 bytes
 biz.aQute.bnd/icons/mini-logo.gif                  |  Bin 0 -> 914 bytes
 biz.aQute.bnd/icons/module.gif                     |  Bin 0 -> 164 bytes
 biz.aQute.bnd/icons/property.gif                   |  Bin 0 -> 93 bytes
 biz.aQute.bnd/icons/registered.gif                 |  Bin 0 -> 349 bytes
 biz.aQute.bnd/icons/resolved.gif                   |  Bin 0 -> 132 bytes
 .../icons/run.gif                                  |  Bin
 biz.aQute.bnd/icons/test.gif                       |  Bin 0 -> 335 bytes
 biz.aQute.bnd/icons/unknown.gif                    |  Bin 0 -> 79 bytes
 biz.aQute.bnd/installers/MacOs/bnd                 |    3 -
 .../installers/MacOs/bnd.pmdoc/01biz-contents.xml  |    1 -
 biz.aQute.bnd/installers/MacOs/bnd.pmdoc/01biz.xml |    1 -
 .../installers/MacOs/bnd.pmdoc/02bnd-contents.xml  |    1 -
 biz.aQute.bnd/installers/MacOs/bnd.pmdoc/02bnd.xml |    1 -
 biz.aQute.bnd/installers/MacOs/bnd.pmdoc/index.xml |    1 -
 biz.aQute.bnd/installers/MacOs/build               |    4 -
 biz.aQute.bnd/plugin.xml                           |  243 +
 biz.aQute.bnd/schema.xml                           |   34 -
 biz.aQute.bnd/src/aQute/bnd/ant/AntMessages.java   |   17 -
 biz.aQute.bnd/src/aQute/bnd/ant/BaseTask.java      |  254 +-
 biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java       |  168 +-
 biz.aQute.bnd/src/aQute/bnd/ant/DeployTask.java    |   85 +-
 biz.aQute.bnd/src/aQute/bnd/ant/EclipseTask.java   |  171 +-
 .../src/aQute/bnd/ant/ExpandPropertiesTask.java    |   13 +-
 biz.aQute.bnd/src/aQute/bnd/ant/PackageTask.java   |   67 -
 biz.aQute.bnd/src/aQute/bnd/ant/PrepareTask.java   |  153 +-
 .../src/aQute/bnd/ant/ProjectBuildOrderTask.java   |   62 -
 biz.aQute.bnd/src/aQute/bnd/ant/ProjectTask.java   |   62 +-
 biz.aQute.bnd/src/aQute/bnd/ant/ReleaseTask.java   |   58 -
 biz.aQute.bnd/src/aQute/bnd/ant/TestTask.java      |   93 -
 biz.aQute.bnd/src/aQute/bnd/ant/WrapTask.java      |  158 +-
 biz.aQute.bnd/src/aQute/bnd/ant/taskdef.properties |    4 -
 .../src/aQute/bnd/classpath/BndContainer.java      |  107 +
 .../bnd/classpath/BndContainerInitializer.java     |   97 +
 .../src/aQute/bnd/classpath/BndContainerPage.java  |  252 +
 .../src/aQute/bnd/classpath/ModelListener.java     |    8 +
 .../src/aQute/bnd/classpath/messages.properties    |   11 +
 .../src/aQute/bnd/jareditor/JarConfiguration.java  |    7 +
 .../aQute/bnd/jareditor/JarDocumentProvider.java   |  108 +
 .../src/aQute/bnd/jareditor/JarEditor.java         |   17 +
 .../src/aQute/bnd/junit/OSGiArgumentsTab.java      |  129 +
 .../aQute/bnd/junit/OSGiJUnitLaunchShortcut.java   |   15 +
 .../OSGiJUnitLauncherConfigurationDelegate.java    |  135 +
 .../src/aQute/bnd/junit/OSGiJUnitTabGroup.java     |   25 +
 .../src/aQute/bnd/launch/LaunchDelegate.java       |   44 +
 .../src/aQute/bnd/launch/LaunchTabGroup.java       |   21 +
 biz.aQute.bnd/src/aQute/bnd/launch/Shortcut.java   |  109 +
 biz.aQute.bnd/src/aQute/bnd/libsync/LibSync.java   |  106 +
 .../src/aQute/bnd/main/BaselineCommands.java       |  430 --
 biz.aQute.bnd/src/aQute/bnd/main/BndMessages.java  |   28 -
 biz.aQute.bnd/src/aQute/bnd/main/DiffCommand.java  |  221 -
 biz.aQute.bnd/src/aQute/bnd/main/PatchCommand.java |  137 -
 biz.aQute.bnd/src/aQute/bnd/main/RepoCommand.java  |  473 --
 biz.aQute.bnd/src/aQute/bnd/main/bnd.java          | 4302 +++++------
 biz.aQute.bnd/src/aQute/bnd/main/schema.xsl        |  346 -
 .../src/aQute/bnd/plugin/ActionWrapper.java        |   29 +
 biz.aQute.bnd/src/aQute/bnd/plugin/Activator.java  |  225 +
 biz.aQute.bnd/src/aQute/bnd/plugin/Central.java    |  268 +
 .../src/aQute/bnd/plugin/builder/BndBuilder.java   |  134 +
 .../src/aQute/bnd/plugin/builder/BndNature.java    |   80 +
 .../bnd/plugin/builder/ToggleNatureAction.java     |   96 +
 .../bnd/plugin/editors/BndCompletionProcessor.java |   46 +
 .../src/aQute/bnd/plugin/editors/BndHover.java     |  117 +
 .../bnd/plugin/editors/BndMultiPageEditor.java     |  237 +
 .../editors/BndMultiPageEditorContributor.java     |  103 +
 .../src/aQute/bnd/plugin/editors/BndScanner.java   |   76 +
 .../editors/BndSourceViewerConfiguration.java      |  129 +
 .../aQute/bnd/plugin/editors/BndTextEditor.java    |   19 +
 .../src/aQute/bnd/plugin/editors/MacroRule.java    |   58 +
 .../src/aQute/bnd/plugin/popup/Scripts.java        |  139 +
 .../src/aQute/bnd/plugin/popup/SubMenu.java        |   74 +
 .../aQute/bnd/plugin/popup/actions/AddToRepo.java  |  101 +
 .../bnd/plugin/popup/actions/InstallBundle.java    |  127 +
 .../aQute/bnd/plugin/popup/actions/MakeBundle.java |  168 +
 .../bnd/plugin/popup/actions/VerifyBundle.java     |   86 +
 .../aQute/bnd/plugin/popup/actions/WrapBundle.java |   60 +
 .../bnd/plugin/popup/actions/repo/RepoDialog.java  |  158 +
 .../src/biz/aqute/bnd/eclipse/popup/Refresh.java   |   42 +
 biz.aQute.bnd/src/bnd.java                         |    5 -
 biz.aQute.bnd/src/swing2swt/layout/AWTLayout.java  |   66 +
 biz.aQute.bnd/src/swing2swt/layout/GridLayout.java |  172 +
 biz.aQute.bnd/src/test/TestBuild.java              |   15 +-
 biz.aQute.bnd/test.bnd                             |    4 -
 biz.aQute.bndlib.tests/.classpath                  |    6 -
 biz.aQute.bndlib.tests/.project                    |   23 -
 .../.settings/org.eclipse.core.resources.prefs     |    3 -
 .../.settings/org.eclipse.core.runtime.prefs       |    3 -
 .../.settings/org.eclipse.jdt.core.prefs           |  361 -
 .../.settings/org.eclipse.jdt.ui.prefs             |   61 -
 biz.aQute.bndlib.tests/bnd.bnd                     |   13 -
 biz.aQute.bndlib.tests/bnd/ondemand.bnd            |    1 -
 biz.aQute.bndlib.tests/build.xml                   |    4 -
 .../jar/AnnotationWithJSR14.jclass                 |  Bin 350 -> 0 bytes
 .../jar/AstNodeToScriptVisitor.jclass              |  Bin 44070 -> 0 bytes
 .../jar/DeploymentAdminPermission.1.jclass         |  Bin 1782 -> 0 bytes
 biz.aQute.bndlib.tests/jar/WithAnnotations.jclass  |  Bin 517 -> 0 bytes
 biz.aQute.bndlib.tests/jar/mandatorynoversion.bnd  |    2 -
 biz.aQute.bndlib.tests/jar/mina.bar                |  Bin 349672 -> 0 bytes
 biz.aQute.bndlib.tests/jar/minax.bnd               |    4 -
 biz.aQute.bndlib.tests/jar/rox.bnd                 |    4 -
 biz.aQute.bndlib.tests/src/DefaultPackage.java     |    3 -
 .../src/UPPERCASEPACKAGE/MyClass.java              |    5 -
 biz.aQute.bndlib.tests/src/test/AnalyzerTest.java  |  679 --
 .../src/test/AnnotationsTest.java                  |  133 -
 .../src/test/AttributesTest.java                   |  148 -
 biz.aQute.bndlib.tests/src/test/BuilderTest.java   | 1923 -----
 biz.aQute.bndlib.tests/src/test/CalltreeTest.java  |  168 -
 .../src/test/ClassParserTest.java                  |  355 -
 .../src/test/ClassReferenceTest.java               |   45 -
 biz.aQute.bndlib.tests/src/test/ClasspathTest.java |   72 -
 biz.aQute.bndlib.tests/src/test/ClazzTest.java     |   68 -
 biz.aQute.bndlib.tests/src/test/CompareTest.java   |  128 -
 .../src/test/ComponentTests.java                   |   18 -
 .../src/test/CorruptManifest.java                  |   49 -
 .../src/test/DescriptorsTest.java                  |   23 -
 .../src/test/DownloadBlockerTest.java              |   63 -
 .../src/test/ExportHeaderTest.java                 |   71 -
 biz.aQute.bndlib.tests/src/test/FileRepoTests.java |   14 -
 biz.aQute.bndlib.tests/src/test/FilterTest.java    |   12 -
 .../src/test/IncludeHeaderTest.java                |  142 -
 biz.aQute.bndlib.tests/src/test/InlineTest.java    |   24 -
 .../src/test/InstructionTest.java                  |   58 -
 biz.aQute.bndlib.tests/src/test/JarSignerTest.java |   90 -
 biz.aQute.bndlib.tests/src/test/JarTest.java       |   68 -
 biz.aQute.bndlib.tests/src/test/JobsService.clazz  |  Bin 5636 -> 0 bytes
 biz.aQute.bndlib.tests/src/test/LauncherTest.java  |  168 -
 biz.aQute.bndlib.tests/src/test/MacroTest.java     |  609 --
 biz.aQute.bndlib.tests/src/test/MakeTest.java      |  117 -
 biz.aQute.bndlib.tests/src/test/ManifestTest.java  |  190 -
 biz.aQute.bndlib.tests/src/test/MavenTest.java     |  335 -
 biz.aQute.bndlib.tests/src/test/MergeTest.java     |   78 -
 biz.aQute.bndlib.tests/src/test/MetatypeTests.java |   15 -
 biz.aQute.bndlib.tests/src/test/NativeHeader.java  |   67 -
 biz.aQute.bndlib.tests/src/test/NoUsesTest.java    |  122 -
 biz.aQute.bndlib.tests/src/test/PackTest.java      |   18 -
 .../src/test/ParseHeaderTest.java                  |  128 -
 biz.aQute.bndlib.tests/src/test/Parser.jclass      |  Bin 160951 -> 0 bytes
 biz.aQute.bndlib.tests/src/test/PluginTest.java    |   89 -
 biz.aQute.bndlib.tests/src/test/ProcessorTest.java |   43 -
 biz.aQute.bndlib.tests/src/test/ProjectTest.java   |  479 --
 .../src/test/PropertiesTest.java                   |  124 -
 .../src/test/RepoBuilderTest.java                  |   60 -
 biz.aQute.bndlib.tests/src/test/RepoTreeTest.java  |   59 -
 biz.aQute.bndlib.tests/src/test/ResourcesTest.java |  325 -
 .../src/test/SemanticVersioningTests.java          |   15 -
 biz.aQute.bndlib.tests/src/test/Simple.jclass      |  Bin 542 -> 0 bytes
 biz.aQute.bndlib.tests/src/test/SpringTest.java    |   87 -
 biz.aQute.bndlib.tests/src/test/Test.jclass        |  Bin 845 -> 0 bytes
 biz.aQute.bndlib.tests/src/test/Test2.jclass       |  Bin 333 -> 0 bytes
 biz.aQute.bndlib.tests/src/test/TestAttrs.java     |   20 -
 biz.aQute.bndlib.tests/src/test/TestBndBook.java   |   29 -
 .../src/test/TestQuotedTokenizer.java              |   72 -
 biz.aQute.bndlib.tests/src/test/TestSelfBuild.java |   21 -
 .../src/test/TestSignatures.java                   |   94 -
 biz.aQute.bndlib.tests/src/test/UsesTest.java      |   88 -
 biz.aQute.bndlib.tests/src/test/VerifierTest.java  |  242 -
 .../src/test/VersionPolicyTest.java                |  278 -
 .../src/test/WithAnnotations.jclass                |  Bin 517 -> 0 bytes
 .../src/test/WorkspaceRepositoryTest.java          |   85 -
 biz.aQute.bndlib.tests/src/test/WorkspaceTest.java |   26 -
 biz.aQute.bndlib.tests/src/test/XDbCmpXView.clazz  |  Bin 83410 -> 0 bytes
 .../src/test/activator/Activator.java              |   13 -
 .../src/test/activator/Activator11.java            |   14 -
 .../src/test/activator/Activator2.java             |   11 -
 .../src/test/activator/Activator3.java             |   11 -
 .../src/test/activator/ActivatorPackage.java       |   11 -
 .../src/test/activator/ActivatorPrivate.java       |   13 -
 .../activator/inherits/InheritedActivator.java     |   11 -
 .../test/annotation/AnnotationWithRefToAny.java    |   10 -
 .../src/test/annotation/any/Any.java               |    5 -
 .../src/test/baseline/BaselineTest.java            |  100 -
 .../src/test/classreference/ClassReference.java    |    8 -
 .../src/test/component/BNDAnnotationTest.java      |  882 ---
 .../src/test/component/ComponentOrderingTest.java  |   36 -
 .../src/test/component/ComponentTest.java          |  493 --
 .../src/test/component/DSAnnotationTest.java       | 1133 ---
 .../src/test/deployer/FileRepoTest.java            |  223 -
 biz.aQute.bndlib.tests/src/test/diff/DiffTest.java |  144 -
 .../src/test/genericinterf/a/A.java                |   12 -
 .../src/test/genericinterf/b/B.java                |    5 -
 .../src/test/genericinterf/c/C.java                |    5 -
 biz.aQute.bndlib.tests/src/test/generics.clazz     |  Bin 420 -> 0 bytes
 biz.aQute.bndlib.tests/src/test/lib/NanoHTTPD.java |  987 ---
 biz.aQute.bndlib.tests/src/test/make/MD5.java      |   44 -
 .../src/test/metatype/MetatypeTest.java            | 1161 ---
 .../src/test/packageinfo/Dummy.java                |    3 -
 .../src/test/packageinfo/ref/DummyRef.java         |    7 -
 .../src/test/privateimport/PrivateImport.java      |   40 -
 .../src/test/properties/PropertiesTest.java        |   53 -
 .../src/test/refer/RefersToEventAdmin.java         |    7 -
 .../src/test/refer/RefersToHttp.java               |    7 -
 .../src/test/refer/RefersToMeasurement.java        |    7 -
 .../src/test/referApi/APIReferrer.java             |   48 -
 biz.aQute.bndlib.tests/src/test/signatures/Z.java  |   77 -
 biz.aQute.bndlib.tests/src/test/top/Top.java       |    3 -
 .../src/test/uses/annotation/UsesAnnotation.java   |   14 -
 .../uses/annotation/annotation/Annotation.java     |    9 -
 .../src/test/uses/constructor/UsesConstructor.java |   17 -
 .../src/test/uses/exception/UsesException.java     |   11 -
 .../src/test/uses/extend/UsesExtend.java           |   15 -
 .../src/test/uses/field/UsesField.java             |   12 -
 .../uses/generic/extend/UsesGenericExtend.java     |   15 -
 .../src/test/uses/generic/implement/Marker.java    |    5 -
 .../generic/implement/UsesGenericImplement.java    |   12 -
 .../test/uses/generic/param/UsesGenericParam.java  |   15 -
 .../uses/generic/rvalue/UsesGenericRValue.java     |   20 -
 .../src/test/uses/implement/UsesImplement.java     |    9 -
 .../src/test/uses/multi/UsesMulti.java             |   16 -
 .../src/test/uses/order/UsesOrderingTest.java      |   56 -
 .../src/test/uses/param/UsesParam.java             |   17 -
 .../src/test/uses/rvalue/UsesRValue.java           |   18 -
 .../src/test/versionpolicy/api/EventAdmin.java     |    8 -
 .../src/test/versionpolicy/api/EventHandler.java   |    8 -
 .../src/test/versionpolicy/api/package-info.java   |    6 -
 .../versionpolicy/implemented/Implemented.java     |    8 -
 .../versionpolicy/implmajor/MajorImplemented.java  |   10 -
 .../test/versionpolicy/uses/EventHandlerImpl.java  |   10 -
 .../src/test/versionpolicy/uses/Uses.java          |    7 -
 biz.aQute.bndlib.tests/test/a space/cnf/build.bnd  |    7 -
 .../test/a space/cnf/ext/defaults.bnd              |   29 -
 biz.aQute.bndlib.tests/test/a space/test/bnd.bnd   |    8 -
 .../test/a space/test/src/test/placeholder         |    0
 biz.aQute.bndlib.tests/test/beasymock.bar          |  Bin 3831 -> 0 bytes
 .../test/eclipse/plugins/beasymock.bar             |  Bin 3831 -> 0 bytes
 .../activation/1.0.2/activation-1.0.2.pom          |   13 -
 .../activation/1.0.2/activation-1.0.2.pom.sha1     |    1 -
 .../aQute/bndlib/0.0.145/bndlib-0.0.145.jar.sha1   |    1 -
 .../biz/aQute/bndlib/0.0.145/bndlib-0.0.145.pom    |   22 -
 .../aQute/bndlib/0.0.145/bndlib-0.0.145.pom.sha1   |    1 -
 .../biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom    |   22 -
 .../aQute/bndlib/0.0.203/bndlib-0.0.203.pom.sha1   |    1 -
 .../aQute/bndlib/0.0.227/bndlib-0.0.227.jar.sha1   |    1 -
 .../biz/aQute/bndlib/0.0.227/bndlib-0.0.227.pom    |   22 -
 .../aQute/bndlib/0.0.227/bndlib-0.0.227.pom.sha1   |    1 -
 .../aQute/bndlib/0.0.236/bndlib-0.0.236.jar.sha1   |    1 -
 .../biz/aQute/bndlib/0.0.236/bndlib-0.0.236.pom    |   22 -
 .../aQute/bndlib/0.0.238/bndlib-0.0.238.jar.sha1   |    1 -
 .../biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom    |   22 -
 .../aQute/bndlib/0.0.238/bndlib-0.0.238.pom.sha1   |    1 -
 .../aQute/bndlib/0.0.255/bndlib-0.0.255.jar.sha1   |    1 -
 .../biz/aQute/bndlib/0.0.255/bndlib-0.0.255.pom    |   22 -
 .../aQute/bndlib/0.0.255/bndlib-0.0.255.pom.sha1   |    1 -
 .../dom4j/dom4j/1.6.1/dom4j-1.6.1.jar.sha1         |    1 -
 .../maven-repo/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom   |  221 -
 .../dom4j/dom4j/1.6.1/dom4j-1.6.1.pom.sha1         |    1 -
 .../junit/junit/3.8.1/junit-3.8.1.jar.sha1         |    1 -
 .../maven-repo/junit/junit/3.8.1/junit-3.8.1.pom   |   29 -
 .../junit/junit/3.8.1/junit-3.8.1.pom.sha1         |    1 -
 .../test/maven-repo/junit/junit/3.8/junit-3.8.pom  |   26 -
 .../maven-repo/junit/junit/3.8/junit-3.8.pom.sha1  |    1 -
 .../maven-repo/junit/junit/4.4/junit-4.4.jar.sha1  |    1 -
 .../test/maven-repo/junit/junit/4.4/junit-4.4.pom  |   36 -
 .../maven-repo/junit/junit/4.4/junit-4.4.pom.sha1  |    1 -
 .../1.0.0/javax.servlet-1.0.0.jar.sha1             |    1 -
 .../javax.servlet/1.0.0/javax.servlet-1.0.0.pom    |  125 -
 .../1.0.0/javax.servlet-1.0.0.pom.sha1             |    1 -
 .../1.0.0/maven-obr-plugin-1.0.0.jar.sha1          |    1 -
 .../1.0.0/maven-obr-plugin-1.0.0.pom               |   56 -
 .../1.0.0/maven-obr-plugin-1.0.0.pom.sha1          |    1 -
 .../1.0.8/maven-scr-plugin-1.0.8.jar.sha1          |    1 -
 .../1.0.8/maven-scr-plugin-1.0.8.pom               |  101 -
 .../1.0.8/maven-scr-plugin-1.0.8.pom.sha1          |    1 -
 .../maven-scr-plugin/maven-metadata-central.xml    |   20 -
 .../maven-metadata-central.xml.sha1                |    1 -
 .../0.9.0-SNAPSHOT/maven-metadata-local.xml        |   11 -
 ...org.apache.felix.fileinstall-0.9.0-SNAPSHOT.pom |   62 -
 .../maven-metadata-local.xml                       |   11 -
 .../1.1.0-SNAPSHOT/maven-metadata-local.xml        |   11 -
 .../org.apache.felix.framework-1.1.0-SNAPSHOT.pom  |   63 -
 .../maven-metadata-local.xml                       |   11 -
 .../1.0.0/org.osgi.compendium-1.0.0.jar.sha1       |    1 -
 .../1.0.0/org.osgi.compendium-1.0.0.pom            |   79 -
 .../1.0.0/org.osgi.compendium-1.0.0.pom.sha1       |    1 -
 .../1.0.0/org.osgi.core-1.0.0.jar.md5              |    1 -
 .../org.osgi.core/1.0.0/org.osgi.core-1.0.0.pom    |   56 -
 .../1.0.0/org.osgi.core-1.0.0.pom.md5              |    1 -
 .../org.osgi.core-1.1.0-20070713.230200-1.pom      |   56 -
 .../org.osgi.core-1.1.0-20070713.230200-1.pom.sha1 |    1 -
 .../maven-metadata-apache.snapshots.xml            |   12 -
 .../maven-metadata-apache.snapshots.xml.sha1       |    1 -
 .../org.osgi.core-1.1.0-20070713.230200-1.jar.sha1 |    1 -
 .../org.osgi.core-1.1.0-20070713.230200-1.pom      |   56 -
 .../org.osgi.core-1.1.0-20070713.230200-1.pom.sha1 |    1 -
 .../org.osgi.core-1.1.0-SNAPSHOT.pom               |   56 -
 .../1.0.0/org.osgi.foundation-1.0.0.jar.sha1       |    1 -
 .../1.0.0/org.osgi.foundation-1.0.0.pom            |   39 -
 .../1.0.0/org.osgi.foundation-1.0.0.pom.sha1       |    1 -
 .../1.0.0/org.osgi.service.obr-1.0.0.jar.md5       |    1 -
 .../1.0.0/org.osgi.service.obr-1.0.0.pom           |   49 -
 .../1.0.0/org.osgi.service.obr-1.0.0.pom.md5       |    1 -
 .../1.0.1/org.osgi.service.obr-1.0.1.jar.sha1      |    1 -
 .../1.0.1/org.osgi.service.obr-1.0.1.pom           |   49 -
 .../1.0.1/org.osgi.service.obr-1.0.1.pom.sha1      |    1 -
 .../test/w o r k s p a c e/cnf/build.bnd           |    3 -
 .../test/w o r k s p a c e/cnf/ext/extension.bnd   |    3 -
 .../test/ws-repo-test/cnf/build.bnd                |    9 -
 .../test/ws-repo-test/p5/bnd.bnd                   |    1 -
 biz.aQute.bndlib.tests/test/ws/bug194/bnd.bnd      |    1 -
 biz.aQute.bndlib.tests/test/ws/build-all/bnd.bnd   |    0
 .../test/ws/bump-included/bnd.bnd                  |    1 -
 .../test/ws/bump-included/include.txt              |    3 -
 biz.aQute.bndlib.tests/test/ws/bump-sub/a.bnd      |    3 -
 biz.aQute.bndlib.tests/test/ws/bump-sub/b.bnd      |    3 -
 biz.aQute.bndlib.tests/test/ws/bump-sub/bnd.bnd    |    1 -
 biz.aQute.bndlib.tests/test/ws/cnf/build.bnd       |    9 -
 .../test/ws/cnf/repo/libtest/libtest-1.0.0.lib     |    4 -
 biz.aQute.bndlib.tests/test/ws/p-stale-dep/bnd.bnd |    3 -
 biz.aQute.bndlib.tests/test/ws/p-stale/bnd.bnd     |    3 -
 biz.aQute.bndlib.tests/test/ws/p1/bnd.bnd          |    4 -
 biz.aQute.bndlib.tests/test/ws/p1/p1a.bndrun       |    1 -
 biz.aQute.bndlib.tests/test/ws/p1/p1b.bndrun       |    1 -
 .../test/ws/p2/Resources/more/resource6.txt        |    1 -
 .../test/ws/p2/Resources/more/resource7.txt        |    1 -
 .../test/ws/p2/Resources/more/resource8.res        |    1 -
 .../test/ws/p2/Resources/resource1.res             |    1 -
 .../test/ws/p2/Resources/resource2.res             |    1 -
 .../test/ws/p2/Resources/resource3.txt             |    1 -
 .../test/ws/p2/Resources/resource4.txt             |    1 -
 .../test/ws/p2/Resources/resource5.asc             |    1 -
 .../test/ws/p2/Resources/stuff/resource9.res       |    1 -
 .../test/ws/p2/Resources/text.txt                  |    1 -
 biz.aQute.bndlib.tests/test/ws/p2/bnd.bnd          |    3 -
 biz.aQute.bndlib.tests/test/ws/p3/bnd.bnd          |    4 -
 biz.aQute.bndlib.tests/test/ws/p4-sub/a.bnd        |    2 -
 biz.aQute.bndlib.tests/test/ws/p4-sub/b.bnd        |    2 -
 biz.aQute.bndlib.tests/test/ws/p4-sub/bnd.bnd      |    3 -
 biz.aQute.bndlib.tests/test/ws/p4-sub/c.bnd        |    5 -
 biz.aQute.bndlib.tests/test/ws/p5/bnd.bnd          |    3 -
 biz.aQute.bndlib.tests/test/ws/p5/src/pkg1/.keep   |    1 -
 .../test/ws/p5/src/pkg2/package-info.java          |    6 -
 .../test/ws/p5/src/pkg3/package-info.java          |    5 -
 .../test/ws/p5/src/pkg4/package-info.java          |    5 -
 .../test/ws/p5/src/pkg5/package-info.java          |    6 -
 .../test/ws/p5/src/pkg5/packageinfo                |    1 -
 .../test/ws/p5/src/pkg6/package-info.java          |    4 -
 .../test/ws/p5/src/pkg6/packageinfo                |    1 -
 .../test/ws/p5/src/pkg7/package-info.java          |    4 -
 biz.aQute.bndlib/.project                          |    6 -
 .../.settings/org.eclipse.jdt.core.prefs           |  353 +-
 .../.settings/org.eclipse.jdt.ui.prefs             |   61 -
 biz.aQute.bndlib/bnd.bnd                           |   54 +-
 .../bnd/makesondemand.bnd                          |    0
 biz.aQute.bndlib/bnd/ondemand.bnd                  |    1 +
 .../1.0.4/_maven.repositories                      |    0
 ...rg.apache.commons.logging-1.0.4.jar.lastUpdated |    0
 ...ource.org.apache.commons.logging-1.0.4.jar.sha1 |    0
 ...ringsource.org.apache.commons.logging-1.0.4.pom |    0
 ...rg.apache.commons.logging-1.0.4.pom.lastUpdated |    0
 ...ource.org.apache.commons.logging-1.0.4.pom.sha1 |    0
 ...ource.org.apache.commons.logging-1.1.1.jar.sha1 |    0
 ...ringsource.org.apache.commons.logging-1.1.1.pom |    0
 ...ource.org.apache.commons.logging-1.1.1.pom.sha1 |    0
 .../compilerversions/compile.sh                    |    0
 .../compilerversions/compilerversions.bnd          |    0
 .../compilerversions/download_bundle.gif           |  Bin
 .../compilerversions/src/eclipse_1_1/ClassRef.java |    0
 .../compilerversions/src/eclipse_1_2/ClassRef.java |    0
 .../compilerversions/src/eclipse_1_3/ClassRef.java |    0
 .../compilerversions/src/eclipse_1_4/ClassRef.java |    0
 .../compilerversions/src/eclipse_1_5/ClassRef.java |    0
 .../compilerversions/src/eclipse_1_6/ClassRef.java |    0
 .../src/eclipse_jsr14/ClassRef.java                |    0
 .../compilerversions/src/sun_1_1/ClassRef.java     |    0
 .../compilerversions/src/sun_1_2/ClassRef.java     |    0
 .../compilerversions/src/sun_1_3/ClassRef.java     |    0
 .../compilerversions/src/sun_1_4/ClassRef.java     |    0
 .../compilerversions/src/sun_1_5/ClassRef.java     |    0
 .../compilerversions/src/sun_1_6/ClassRef.java     |    0
 .../compilerversions/src/sun_jsr14/ClassRef.java   |    0
 biz.aQute.bndlib/img/bnd-64.png                    |  Bin 2921 -> 0 bytes
 biz.aQute.bndlib/src/DefaultPackage.java           |    4 +
 .../src/aQute/bnd/annotation/ConsumerType.java     |   17 +-
 .../src/aQute/bnd/annotation/Export.java           |   28 +-
 .../src/aQute/bnd/annotation/ProviderType.java     |   64 +-
 .../src/aQute/bnd/annotation/UsePolicy.java        |   20 +
 .../src/aQute/bnd/annotation/Version.java          |    5 +-
 .../aQute/bnd/annotation/component/Activate.java   |    4 +-
 .../aQute/bnd/annotation/component/Attribute.java  |   10 +
 .../aQute/bnd/annotation/component/Component.java  |   10 +-
 .../annotation/component/ConfigurationPolicy.java  |    2 +-
 .../aQute/bnd/annotation/component/Deactivate.java |    2 +-
 .../aQute/bnd/annotation/component/Modified.java   |    2 +-
 .../aQute/bnd/annotation/component/Reference.java  |   36 +-
 .../bnd/annotation/metatype/Configurable.java      |  173 +-
 .../src/aQute/bnd/annotation/metatype/Meta.java    |   29 +-
 .../bnd/build/CircularDependencyException.java     |    8 +-
 .../src/aQute/bnd/build/Container.java             |  115 +-
 .../src/aQute/bnd/build/DownloadBlocker.java       |  111 -
 biz.aQute.bndlib/src/aQute/bnd/build/Project.java  | 1159 ++-
 .../src/aQute/bnd/build/ProjectBuilder.java        |  246 +-
 .../src/aQute/bnd/build/ProjectLauncher.java       |  199 +-
 .../src/aQute/bnd/build/ProjectMessages.java       |   48 -
 .../src/aQute/bnd/build/ProjectTester.java         |   22 +-
 .../src/aQute/bnd/build/ReflectAction.java         |   27 +-
 .../src/aQute/bnd/build/ScriptAction.java          |   20 +-
 .../src/aQute/bnd/build/Workspace.java             |  186 +-
 .../src/aQute/bnd/build/WorkspaceRepository.java   |  191 -
 .../src/aQute/bnd/build/model/BndEditModel.java    |  828 ---
 biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java |   61 -
 .../build/model/clauses/ComponentSvcReference.java |  102 -
 .../bnd/build/model/clauses/ExportedPackage.java   |   41 -
 .../bnd/build/model/clauses/HeaderClause.java      |  153 -
 .../bnd/build/model/clauses/ImportPattern.java     |   29 -
 .../bnd/build/model/clauses/ServiceComponent.java  |  249 -
 .../bnd/build/model/clauses/VersionedClause.java   |   27 -
 .../src/aQute/bnd/build/model/clauses/packageinfo  |    1 -
 .../model/conversions/ClauseListConverter.java     |   31 -
 .../model/conversions/CollectionFormatter.java     |   47 -
 .../bnd/build/model/conversions/Converter.java     |    5 -
 .../model/conversions/DefaultBooleanFormatter.java |   26 -
 .../build/model/conversions/DefaultFormatter.java  |    9 -
 .../bnd/build/model/conversions/EEConverter.java   |   11 -
 .../bnd/build/model/conversions/EEFormatter.java   |    9 -
 .../bnd/build/model/conversions/EnumConverter.java |   27 -
 .../bnd/build/model/conversions/EnumFormatter.java |   53 -
 .../model/conversions/HeaderClauseConverter.java   |   13 -
 .../model/conversions/HeaderClauseFormatter.java   |   11 -
 .../conversions/HeaderClauseListConverter.java     |   11 -
 .../bnd/build/model/conversions/MapFormatter.java  |   18 -
 .../conversions/NewlineEscapedStringFormatter.java |   33 -
 .../bnd/build/model/conversions/NoopConverter.java |    7 -
 .../model/conversions/PropertiesConverter.java     |   13 -
 .../conversions/PropertiesEntryFormatter.java      |   26 -
 .../model/conversions/RequirementFormatter.java    |   25 -
 .../conversions/RequirementListConverter.java      |   32 -
 .../model/conversions/SimpleListConverter.java     |   41 -
 .../model/conversions/StringEntryConverter.java    |   11 -
 .../conversions/VersionedClauseConverter.java      |   11 -
 .../src/aQute/bnd/build/model/packageinfo          |    1 -
 biz.aQute.bndlib/src/aQute/bnd/build/packageinfo   |    2 +-
 .../src/aQute/bnd/compatibility/Access.java        |    1 -
 .../aQute/bnd/compatibility/GenericParameter.java  |   17 +-
 .../src/aQute/bnd/compatibility/GenericType.java   |   19 +-
 .../src/aQute/bnd/compatibility/Kind.java          |    2 +-
 .../bnd/compatibility/ParseSignatureBuilder.java   |   83 +-
 .../bnd/compatibility/RuntimeSignatureBuilder.java |   72 +-
 .../src/aQute/bnd/compatibility/Scope.java         |   43 +-
 .../bnd/compatibility/SignatureGenerator.java      |  125 +
 .../src/aQute/bnd/compatibility/Signatures.java    |  364 +-
 .../src/aQute/bnd/component/AnnotationReader.java  |  385 +-
 .../src/aQute/bnd/component/ComponentDef.java      |  216 +-
 .../src/aQute/bnd/component/DSAnnotations.java     |   43 +-
 .../src/aQute/bnd/component/HeaderReader.java      |  504 --
 .../src/aQute/bnd/component/ReferenceDef.java      |  108 +-
 .../src/aQute/bnd/component/TagResource.java       |   33 -
 .../src/aQute/bnd/concurrent/MultiBuilder.java     |  115 +
 .../src/aQute/bnd/differ/Baseline.java             |  287 -
 .../src/aQute/bnd/differ/DiffImpl.java             |  243 -
 .../src/aQute/bnd/differ/DiffPluginImpl.java       |  192 -
 biz.aQute.bndlib/src/aQute/bnd/differ/Element.java |  145 -
 .../src/aQute/bnd/differ/JavaElement.java          |  647 --
 .../src/aQute/bnd/differ/RepositoryElement.java    |   23 -
 biz.aQute.bndlib/src/aQute/bnd/differ/packageinfo  |    1 -
 .../src/aQute/bnd/filerepo/FileRepo.java           |  109 -
 biz.aQute.bndlib/src/aQute/bnd/header/Attrs.java   |  343 -
 .../src/aQute/bnd/header/OSGiHeader.java           |  134 -
 .../src/aQute/bnd/header/Parameters.java           |  211 -
 biz.aQute.bndlib/src/aQute/bnd/header/packageinfo  |    1 -
 biz.aQute.bndlib/src/aQute/bnd/help/Errors.java    |    5 +
 biz.aQute.bndlib/src/aQute/bnd/help/Syntax.java    |  842 ++-
 biz.aQute.bndlib/src/aQute/bnd/help/packageinfo    |    2 +-
 biz.aQute.bndlib/src/aQute/bnd/make/Make.java      |  162 +-
 biz.aQute.bndlib/src/aQute/bnd/make/MakeBnd.java   |   98 +-
 biz.aQute.bndlib/src/aQute/bnd/make/MakeCopy.java  |   57 +-
 .../aQute/bnd/make/calltree/CalltreeResource.java  |  285 +-
 .../make/component/ComponentAnnotationReader.java  |  126 +-
 .../aQute/bnd/make/component/ServiceComponent.java |  436 +-
 .../src/aQute/bnd/make/coverage/Coverage.java      |  146 +-
 .../aQute/bnd/make/coverage/CoverageResource.java  |  140 +-
 .../aQute/bnd/make/metatype/MetaTypeReader.java    |  168 +-
 .../aQute/bnd/make/metatype/MetatypePlugin.java    |   18 +-
 .../src/aQute/bnd/maven/BsnToMavenPath.java        |    2 +-
 .../src/aQute/bnd/maven/MavenCommand.java          |  245 +-
 .../src/aQute/bnd/maven/MavenDependencyGraph.java  |   39 +-
 .../src/aQute/bnd/maven/MavenDeploy.java           |  127 +-
 .../src/aQute/bnd/maven/MavenDeployCmd.java        |   59 +-
 .../src/aQute/bnd/maven/MavenGroup.java            |   29 +-
 .../src/aQute/bnd/maven/MavenRepository.java       |  122 +-
 .../src/aQute/bnd/maven/PomFromManifest.java       |   32 +-
 .../src/aQute/bnd/maven/PomParser.java             |   42 +-
 .../src/aQute/bnd/maven/PomResource.java           |   33 +-
 .../src/aQute/bnd/maven/support/CachedPom.java     |    3 +-
 .../src/aQute/bnd/maven/support/Maven.java         |   25 +-
 .../src/aQute/bnd/maven/support/MavenEntry.java    |   54 +-
 .../bnd/maven/support/MavenRemoteRepository.java   |   72 +-
 .../src/aQute/bnd/maven/support/Pom.java           |  124 +-
 .../src/aQute/bnd/maven/support/ProjectPom.java    |  101 +-
 .../src/aQute/bnd/maven/support/packageinfo        |    1 -
 .../src/aQute/bnd/obr/OBRFragment.java             |  300 -
 biz.aQute.bndlib/src/aQute/bnd/osgi/About.java     |   39 -
 .../src/aQute/bnd/osgi/AbstractResource.java       |   56 -
 biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java  | 2644 -------
 .../src/aQute/bnd/osgi/AnalyzerMessages.java       |   13 -
 .../src/aQute/bnd/osgi/Annotation.java             |   82 -
 biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java   | 1527 ----
 biz.aQute.bndlib/src/aQute/bnd/osgi/BundleId.java  |   44 -
 .../src/aQute/bnd/osgi/ClassDataCollector.java     |   83 -
 biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java     | 1737 -----
 .../src/aQute/bnd/osgi/CombinedResource.java       |   34 -
 .../src/aQute/bnd/osgi/CommandResource.java        |   51 -
 biz.aQute.bndlib/src/aQute/bnd/osgi/Constants.java |  325 -
 .../src/aQute/bnd/osgi/Descriptors.java            |  567 --
 biz.aQute.bndlib/src/aQute/bnd/osgi/Domain.java    |  376 -
 .../src/aQute/bnd/osgi/EmbeddedResource.java       |  100 -
 .../src/aQute/bnd/osgi/FileResource.java           |   79 -
 .../src/aQute/bnd/osgi/Instruction.java            |  185 -
 .../src/aQute/bnd/osgi/Instructions.java           |  222 -
 biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java       |  861 ---
 .../src/aQute/bnd/osgi/JarResource.java            |   38 -
 biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java     |  990 ---
 biz.aQute.bndlib/src/aQute/bnd/osgi/OpCodes.java   | 1250 ----
 biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java  |  235 -
 .../src/aQute/bnd/osgi/PreprocessResource.java     |   46 -
 biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java | 1780 -----
 biz.aQute.bndlib/src/aQute/bnd/osgi/Resource.java  |   17 -
 .../src/aQute/bnd/osgi/URLResource.java            |   85 -
 biz.aQute.bndlib/src/aQute/bnd/osgi/Verifier.java  |  915 ---
 .../src/aQute/bnd/osgi/WriteResource.java          |   75 -
 .../src/aQute/bnd/osgi/ZipResource.java            |   84 -
 biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info       |    2 -
 .../aQute/bnd/osgi/eclipse/EclipseClasspath.java   |  238 -
 biz.aQute.bndlib/src/aQute/bnd/osgi/packageinfo    |    1 -
 .../src/aQute/bnd/osgi/resource/CapReq.java        |  103 -
 .../src/aQute/bnd/osgi/resource/CapReqBuilder.java |   97 -
 .../src/aQute/bnd/osgi/resource/Filters.java       |   64 -
 .../aQute/bnd/osgi/resource/ResourceBuilder.java   |   55 -
 .../src/aQute/bnd/osgi/resource/ResourceImpl.java  |   73 -
 .../src/aQute/bnd/osgi/resource/packageinfo        |    1 -
 .../aQute/bnd/properties/BadLocationException.java |   14 -
 .../aQute/bnd/properties/CopyOnWriteTextStore.java |  147 -
 .../src/aQute/bnd/properties/Document.java         |   59 -
 .../src/aQute/bnd/properties/GapTextStore.java     |  419 --
 .../src/aQute/bnd/properties/IDocument.java        |   21 -
 .../src/aQute/bnd/properties/IRegion.java          |    8 -
 .../src/aQute/bnd/properties/ITextStore.java       |   65 -
 .../src/aQute/bnd/properties/Line.java             |   60 -
 .../src/aQute/bnd/properties/LineTracker.java      |  382 -
 .../src/aQute/bnd/properties/LineType.java         |    5 -
 .../aQute/bnd/properties/PropertiesLineReader.java |  125 -
 .../src/aQute/bnd/properties/Region.java           |   22 -
 .../src/aQute/bnd/properties/packageinfo           |    1 -
 .../src/aQute/bnd/repo/eclipse/EclipseRepo.java    |  199 +
 .../src/aQute/bnd/service/Actionable.java          |   48 -
 .../src/aQute/bnd/service/AnalyzerPlugin.java      |   26 +-
 .../src/aQute/bnd/service/BndListener.java         |   35 +-
 .../src/aQute/bnd/service/CommandPlugin.java       |   44 +-
 .../src/aQute/bnd/service/Compiler.java            |    4 +-
 .../aQute/bnd/service/DependencyContributor.java   |    2 +-
 biz.aQute.bndlib/src/aQute/bnd/service/Deploy.java |    8 +-
 .../src/aQute/bnd/service/EclipseJUnitTester.java  |    3 +-
 .../src/aQute/bnd/service/IndexProvider.java       |   12 -
 .../src/aQute/bnd/service/MakePlugin.java          |   27 +-
 .../src/aQute/bnd/service/OBRIndexProvider.java    |   11 +
 .../src/aQute/bnd/service/OBRResolutionMode.java   |    5 +
 biz.aQute.bndlib/src/aQute/bnd/service/Plugin.java |   37 +-
 .../src/aQute/bnd/service/Refreshable.java         |    5 +-
 .../src/aQute/bnd/service/Registry.java            |    1 -
 .../src/aQute/bnd/service/RegistryPlugin.java      |    1 +
 .../aQute/bnd/service/RemoteRepositoryPlugin.java  |   23 +-
 .../bnd/service/RepositoryListenerPlugin.java      |    7 +-
 .../src/aQute/bnd/service/RepositoryPlugin.java    |  195 +-
 .../src/aQute/bnd/service/ResolutionPhase.java     |    5 -
 .../src/aQute/bnd/service/ResourceHandle.java      |   13 +-
 .../src/aQute/bnd/service/Scripter.java            |    2 +-
 .../src/aQute/bnd/service/SignerPlugin.java        |   22 +-
 .../src/aQute/bnd/service/Strategy.java            |    5 -
 .../src/aQute/bnd/service/action/Action.java       |    2 +-
 .../src/aQute/bnd/service/action/NamedAction.java  |    3 +-
 .../src/aQute/bnd/service/diff/Delta.java          |   18 -
 .../src/aQute/bnd/service/diff/Diff.java           |   37 -
 .../src/aQute/bnd/service/diff/Differ.java         |   14 -
 .../src/aQute/bnd/service/diff/Tree.java           |   29 -
 .../src/aQute/bnd/service/diff/Type.java           |   10 -
 .../src/aQute/bnd/service/diff/packageinfo         |    1 -
 biz.aQute.bndlib/src/aQute/bnd/service/packageinfo |    2 +-
 .../bnd/service/repository/MinimalRepository.java  |   24 -
 .../src/aQute/bnd/service/url/TaggedData.java      |   36 -
 .../src/aQute/bnd/service/url/URLConnector.java    |   43 +-
 .../src/aQute/bnd/service/url/packageinfo          |    1 -
 .../src/aQute/bnd/settings/Settings.java           |   62 +
 .../src/aQute/bnd/signing/JartoolSigner.java       |  247 +-
 biz.aQute.bndlib/src/aQute/bnd/signing/Signer.java |  351 +-
 .../src/aQute/bnd/test/BndTestCase.java            |   20 +-
 .../NewlineEscapedStringFormatterTestCase.java     |   16 -
 .../src/aQute/bnd/test/SimpleContext.java          |   16 +-
 biz.aQute.bndlib/src/aQute/bnd/test/XmlTester.java |   16 +-
 .../src/aQute/bnd/version/Version.java             |  167 -
 .../src/aQute/bnd/version/VersionRange.java        |   94 -
 .../src/aQute/lib/deployer/FileInstallRepo.java    |  149 +
 .../src/aQute/lib/deployer/FileRepo.java           |  855 +--
 .../deployer/http/HttpBasicAuthURLConnector.java   |  118 +
 .../aQute/lib/deployer/obr/AbstractBaseOBR.java    |  598 ++
 .../lib/deployer/obr/CachingURLResourceHandle.java |  243 +
 .../src/aQute/lib/deployer/obr/Capability.java     |   93 +
 .../src/aQute/lib/deployer/obr/CapabilityType.java |   31 +
 .../lib/deployer/obr/DefaultURLConnector.java      |   17 +
 .../lib/deployer/obr/IRepositoryListener.java      |   27 +
 .../src/aQute/lib/deployer/obr/LocalOBR.java       |  195 +
 .../src/aQute/lib/deployer/obr/OBR.java            |  119 +
 .../src/aQute/lib/deployer/obr/OBRSAXHandler.java  |  106 +
 .../src/aQute/lib/deployer/obr/Property.java       |   79 +
 .../src/aQute/lib/deployer/obr/Referral.java       |   59 +
 .../src/aQute/lib/deployer/obr/Require.java        |   73 +
 .../src/aQute/lib/deployer/obr/Resource.java       |  240 +
 .../aQute/lib/deployer/obr/StopParseException.java |    7 +
 .../lib/deployer/obr/UniqueResourceFilter.java     |   54 +
 biz.aQute.bndlib/src/aQute/lib/jardiff/Diff.java   |  152 +
 biz.aQute.bndlib/src/aQute/lib/osgi/About.java     |   46 +
 .../src/aQute/lib/osgi/AbstractResource.java       |   50 +
 biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java  | 2301 ++++++
 .../src/aQute/lib/osgi/Annotation.java             |   73 +
 biz.aQute.bndlib/src/aQute/lib/osgi/Builder.java   | 1220 ++++
 .../src/aQute/lib/osgi/ClassDataCollector.java     |   88 +
 biz.aQute.bndlib/src/aQute/lib/osgi/Clazz.java     | 1613 +++++
 biz.aQute.bndlib/src/aQute/lib/osgi/Constants.java |  295 +
 .../src/aQute/lib/osgi/EmbeddedResource.java       |   86 +
 .../src/aQute/lib/osgi/FileResource.java           |   85 +
 .../src/aQute/lib/osgi/Instruction.java            |  130 +
 .../src/aQute/lib/osgi/InstructionFilter.java      |   37 +
 biz.aQute.bndlib/src/aQute/lib/osgi/Jar.java       |  690 ++
 .../src/aQute/lib/osgi/JarResource.java            |   46 +
 biz.aQute.bndlib/src/aQute/lib/osgi/Macro.java     |  967 +++
 biz.aQute.bndlib/src/aQute/lib/osgi/OpCodes.java   | 1196 +++
 .../src/aQute/lib/osgi/PreprocessResource.java     |   37 +
 biz.aQute.bndlib/src/aQute/lib/osgi/Processor.java | 1422 ++++
 biz.aQute.bndlib/src/aQute/lib/osgi/Resource.java  |   11 +
 .../src/aQute/lib/osgi/TagResource.java            |   56 +
 .../src/aQute/lib/osgi/URLResource.java            |   37 +
 biz.aQute.bndlib/src/aQute/lib/osgi/Verifier.java  |  959 +++
 .../src/aQute/lib/osgi/WriteResource.java          |   42 +
 .../src/aQute/lib/osgi/ZipResource.java            |   84 +
 biz.aQute.bndlib/src/aQute/lib/osgi/bnd.info       |    2 +
 .../aQute/lib/osgi/eclipse/EclipseClasspath.java   |  248 +
 biz.aQute.bndlib/src/aQute/lib/osgi/packageinfo    |    1 +
 .../src/aQute/lib/spring/JPAComponent.java         |   26 +-
 .../src/aQute/lib/spring/SpringComponent.java      |   65 +-
 .../src/aQute/lib/spring/SpringXMLType.java        |   30 +-
 biz.aQute.bndlib/src/aQute/lib/spring/XMLType.java |  185 +-
 .../src/aQute/lib/spring/XMLTypeProcessor.java     |   44 +-
 biz.aQute.bndlib/src/aQute/lib/spring/extract.xsl  |   20 +-
 .../src/test/.classpath                            |    0
 .../src/test/.cvsignore                            |    0
 biz.aQute.bndlib/src/test/AnalyzerTest.java        |  540 ++
 biz.aQute.bndlib/src/test/AnnotationsTest.java     |  131 +
 biz.aQute.bndlib/src/test/AttributesTest.java      |  139 +
 biz.aQute.bndlib/src/test/BuilderTest.java         | 1648 +++++
 .../src/test/CachingURLResourceHandleTest.java     |   29 +
 biz.aQute.bndlib/src/test/CalltreeTest.java        |  164 +
 biz.aQute.bndlib/src/test/ClassParserTest.java     |  352 +
 biz.aQute.bndlib/src/test/ClassReferenceTest.java  |   48 +
 biz.aQute.bndlib/src/test/ClasspathTest.java       |   69 +
 biz.aQute.bndlib/src/test/ClazzTest.java           |   21 +
 biz.aQute.bndlib/src/test/CompareTest.java         |  113 +
 biz.aQute.bndlib/src/test/ComponentTest.java       | 1129 +++
 biz.aQute.bndlib/src/test/CorruptManifest.java     |   47 +
 biz.aQute.bndlib/src/test/DSAnnotationTest.java    |  180 +
 biz.aQute.bndlib/src/test/DiffTest.java            |   18 +
 biz.aQute.bndlib/src/test/ExportHeaderTest.java    |   60 +
 biz.aQute.bndlib/src/test/FilterTest.java          |   16 +
 biz.aQute.bndlib/src/test/GlobTest.java            |   29 +
 biz.aQute.bndlib/src/test/GroupsTest.java          |   83 +
 biz.aQute.bndlib/src/test/IncludeHeaderTest.java   |  142 +
 biz.aQute.bndlib/src/test/InlineTest.java          |   25 +
 biz.aQute.bndlib/src/test/JarSignerTest.java       |   90 +
 biz.aQute.bndlib/src/test/JarTest.java             |   69 +
 biz.aQute.bndlib/src/test/LauncherTest.java        |   69 +
 biz.aQute.bndlib/src/test/MacroTest.java           |  480 ++
 biz.aQute.bndlib/src/test/MakeTest.java            |  114 +
 biz.aQute.bndlib/src/test/ManifestTest.java        |  196 +
 biz.aQute.bndlib/src/test/MavenTest.java           |  361 +
 biz.aQute.bndlib/src/test/MergeTest.java           |   70 +
 biz.aQute.bndlib/src/test/MetatypeTest.java        |  902 +++
 biz.aQute.bndlib/src/test/NativeHeader.java        |   59 +
 biz.aQute.bndlib/src/test/NoUsesTest.java          |  127 +
 biz.aQute.bndlib/src/test/PackTest.java            |   19 +
 biz.aQute.bndlib/src/test/ParseHeaderTest.java     |   81 +
 biz.aQute.bndlib/src/test/PluginTest.java          |   55 +
 biz.aQute.bndlib/src/test/ProcessorTest.java       |   46 +
 biz.aQute.bndlib/src/test/ProjectTest.java         |  211 +
 biz.aQute.bndlib/src/test/PropertiesTest.java      |  127 +
 biz.aQute.bndlib/src/test/RepoBuilderTest.java     |   47 +
 biz.aQute.bndlib/src/test/ResourcesTest.java       |  220 +
 biz.aQute.bndlib/src/test/SpringTest.java          |   91 +
 biz.aQute.bndlib/src/test/TestBndBook.java         |   29 +
 biz.aQute.bndlib/src/test/TestEclipseRepo.java     |   21 +
 biz.aQute.bndlib/src/test/TestQuotedTokenizer.java |   61 +
 biz.aQute.bndlib/src/test/TestSelfBuild.java       |   25 +
 biz.aQute.bndlib/src/test/TestSignatures.java      |   82 +
 biz.aQute.bndlib/src/test/VerifierTest.java        |  240 +
 biz.aQute.bndlib/src/test/VersionPolicyTest.java   |  274 +
 biz.aQute.bndlib/src/test/WorkspaceTest.java       |   27 +
 biz.aQute.bndlib/src/test/activator/Activator.java |   13 +
 .../activator/inherits/InheritedActivator.java     |   11 +
 .../src/test/badproperties.prop                    |    0
 .../src/test/beasymock.bnd                         |    0
 .../src/test/bnd.info                              |    0
 .../src/test/classreference/ClassReference.java    |    9 +
 .../src/test/com.acme/bnd.bnd                      |    0
 .../src/test/com.acme/defaultbsn.bnd               |    0
 .../src/test/com.acme/setsbsn.bnd                  |    0
 .../src/test/defaultbsn.bnd                        |    0
 .../src/test/iht/test.prop                         |    0
 .../src/test/include.bnd/bottom.bnd                |    0
 .../src/test/include.bnd/top.bnd                   |    0
 .../src/test/include.mf                            |    0
 .../src/test/includeheadertest.mf                  |    0
 .../src/test/includeheadertest.prop                |    0
 .../src/test/lib/deployer/obr/NanoHTTPD.java       | 1004 +++
 .../src/test/lib/deployer/obr/OBRAllTests.java     |   17 +
 .../src/test/lib/deployer/obr/OBRParseTest.java    |  125 +
 .../src/test/lib/deployer/obr/OBRTest.java         |  189 +
 .../src/test/lib/deployer/obr/fullobr.xml          |  553 ++
 .../src/test/lib/deployer/obr/referralobr.xml      |    6 +
 .../src/test/lib/deployer/obr/testobr.xml          |   99 +
 .../src/test/lib/deployer/obr/unparseable.xml      |   70 +
 biz.aQute.bndlib/src/test/make/MD5.java            |   42 +
 biz.aQute.bndlib/src/test/packageinfo/Dummy.java   |    5 +
 .../src/test/packageinfo/packageinfo               |    0
 .../src/test/packageinfo/ref/DummyRef.java         |    7 +
 .../src/test/privateimport/PrivateImport.java      |   39 +
 .../src/test/refer/RefersToEventAdmin.java         |    7 +
 biz.aQute.bndlib/src/test/refer/RefersToHttp.java  |    7 +
 .../src/test/refer/RefersToMeasurement.java        |    7 +
 .../src/test/resourcesonly/include.mf              |    0
 .../src/test/resourcesonly/simple.mf               |    0
 .../src/test/resourcesonly/top.mf                  |    0
 .../src/test/resourcesonly/variables.mf            |    0
 biz.aQute.bndlib/src/test/signatures/Z.java        |   83 +
 .../src/test/signing/.cvsignore                    |    0
 .../src/test/signing/META-INF/MANIFEST.MF          |    0
 .../src/test/signing/META-INF/test.RSA             |  Bin
 .../src/test/signing/META-INF/test.SF              |    0
 .../src/test/signing/keystore                      |  Bin
 .../src/test/simple.mf                             |    0
 .../src/test/split/A                               |    0
 .../src/test/split/B                               |    0
 .../src/test/split/first                           |    0
 .../src/test/split/last                            |    0
 .../src/test/split/split-a.bnd                     |    0
 .../src/test/split/split-b.bnd                     |    0
 .../src/test/spring-test1.spring                   |    0
 .../src/test/top.mf                                |    0
 biz.aQute.bndlib/src/test/top/Top.java             |    4 +
 .../src/test/top/middle/Middle.java                |    0
 .../src/test/top/middle/bottom/Bottom.java         |    0
 .../src/test/variables.mf                          |    0
 .../src/test/versionpolicy/api/EventAdmin.java     |    8 +
 .../src/test/versionpolicy/api/EventHandler.java   |    9 +
 .../src/test/versionpolicy/api/PrivateImpl.java    |    0
 .../src/test/versionpolicy/api/package-info.java   |    6 +
 .../versionpolicy/implemented/Implemented.java     |    8 +
 .../versionpolicy/implmajor/MajorImplemented.java  |   10 +
 .../src/test/versionpolicy/uses/Uses.java          |    7 +
 biz.aQute.bndlib/test.out                          |   45 +
 .../test/eclipse/bnd.index                         |    0
 .../test/keystore                                  |  Bin
 .../test/redirectws/bnd/build.bnd                  |    0
 .../test/redirectws/bnd/ext/test.bnd               |    0
 .../test/redirectws/wss/ws/cnf                     |    0
 .../test/w o r k s p a c e/cnf/build.bnd           |    2 +
 .../test/w o r k s p a c e/cnf/ext/extension.bnd   |    2 +
 .../test/w o r k s p a c e/p r o j e c t/bnd.bnd   |    0
 .../src => biz.aQute.bndlib}/test/ws/cnf/build.bnd |    0
 .../test/ws}/cnf/repo/libtest/libtest-1.0.0.lib    |    0
 .../test/ws/maven1/bnd.bnd                         |    0
 .../1.6.1/_maven.repositories                      |    0
 ...rce.org.apache.commons.beanutils-1.6.1.jar.sha1 |    0
 ...ngsource.org.apache.commons.beanutils-1.6.1.pom |    0
 ...rce.org.apache.commons.beanutils-1.6.1.pom.sha1 |    0
 .../1.7.0/_maven.repositories                      |    0
 ...ngsource.org.apache.commons.beanutils-1.7.0.pom |    0
 ....apache.commons.beanutils-1.7.0.pom.lastUpdated |    0
 ...rce.org.apache.commons.beanutils-1.7.0.pom.sha1 |    0
 .../1.3.0/_maven.repositories                      |    0
 ...springsource.org.apache.commons.codec-1.3.0.pom |    0
 ....org.apache.commons.codec-1.3.0.pom.lastUpdated |    0
 ...gsource.org.apache.commons.codec-1.3.0.pom.sha1 |    0
 .../2.1.1/_maven.repositories                      |    0
 ...pache.commons.collections-2.1.1.jar.lastUpdated |    0
 ...e.org.apache.commons.collections-2.1.1.jar.sha1 |    0
 ...source.org.apache.commons.collections-2.1.1.pom |    0
 ...pache.commons.collections-2.1.1.pom.lastUpdated |    0
 ...e.org.apache.commons.collections-2.1.1.pom.sha1 |    0
 ...e.org.apache.commons.collections-3.2.0.jar.sha1 |    0
 ...source.org.apache.commons.collections-3.2.0.pom |    0
 ...e.org.apache.commons.collections-3.2.0.pom.sha1 |    0
 .../1.0.4/_maven.repositories                      |    0
 ...rg.apache.commons.logging-1.0.4.jar.lastUpdated |    0
 ...ource.org.apache.commons.logging-1.0.4.jar.sha1 |    0
 ...ringsource.org.apache.commons.logging-1.0.4.pom |    0
 ...rg.apache.commons.logging-1.0.4.pom.lastUpdated |    0
 ...ource.org.apache.commons.logging-1.0.4.pom.sha1 |    0
 ...ource.org.apache.commons.logging-1.1.1.jar.sha1 |    0
 ...ringsource.org.apache.commons.logging-1.1.1.pom |    0
 ...ource.org.apache.commons.logging-1.1.1.pom.sha1 |    0
 ...m.springsource.org.apache.log4j-1.2.15.jar.sha1 |    0
 .../com.springsource.org.apache.log4j-1.2.15.pom   |    0
 ...m.springsource.org.apache.log4j-1.2.15.pom.sha1 |    0
 .../test/ws/maven1/maven-dependencies.txt          |    0
 .../test/ws/maven1/mvndeploy                       |    0
 .../test/ws/maven1/parentpom.xml                   |    0
 .../test/ws/maven1/pom.xml                         |    0
 .../test/ws/maven1/testparentpom.xml               |    0
 .../test/ws/maven1/testpom.xml                     |    0
 .../test/ws/maven2/bnd.bnd                         |    0
 .../test/ws/maven2/parentpom.xml                   |    0
 .../test/ws/maven2/pom.xml                         |    0
 .../test/ws/p-maven-remote/bnd.bnd                 |    0
 .../test/ws}/p1/bnd.bnd                            |    0
 .../test/ws}/p1/p1a.bndrun                         |    0
 .../test/ws}/p1/p1b.bndrun                         |    0
 .../test/ws}/p2/Resources/more/resource6.txt       |    0
 .../test/ws}/p2/Resources/more/resource7.txt       |    0
 .../test/ws}/p2/Resources/more/resource8.res       |    0
 .../test/ws}/p2/Resources/resource1.res            |    0
 .../test/ws}/p2/Resources/resource2.res            |    0
 .../test/ws}/p2/Resources/resource3.txt            |    0
 .../test/ws}/p2/Resources/resource4.txt            |    0
 .../test/ws}/p2/Resources/resource5.asc            |    0
 .../test/ws}/p2/Resources/stuff/resource9.res      |    0
 .../test/ws}/p2/Resources/text.txt                 |    0
 .../test/ws}/p2/bnd.bnd                            |    0
 .../test/ws}/p3/bnd.bnd                            |    0
 .../test/ws}/p4-sub/a.bnd                          |    0
 .../test/ws}/p4-sub/b.bnd                          |    0
 .../test/ws}/p4-sub/bnd.bnd                        |    0
 .../test/ws}/p4-sub/c.bnd                          |    0
 biz.aQute.jpm/.classpath                           |    7 -
 biz.aQute.jpm/.project                             |   23 -
 .../.settings/org.eclipse.core.resources.prefs     |    3 -
 .../.settings/org.eclipse.core.runtime.prefs       |    3 -
 biz.aQute.jpm/.settings/org.eclipse.jdt.core.prefs |  361 -
 biz.aQute.jpm/.settings/org.eclipse.jdt.ui.prefs   |   61 -
 biz.aQute.jpm/bnd.bnd                              |   46 -
 biz.aQute.jpm/bnd/service.bnd                      |    8 -
 biz.aQute.jpm/build.xml                            |    4 -
 biz.aQute.jpm/daemon.bnd                           |    8 -
 biz.aQute.jpm/images/icon.png                      |  Bin 4387 -> 0 bytes
 biz.aQute.jpm/release                              |    1 -
 biz.aQute.jpm/restart.sh                           |    6 -
 biz.aQute.jpm/run.bnd                              |   18 -
 biz.aQute.jpm/src/aQute/daemon/Daemon.java         |   19 -
 biz.aQute.jpm/src/aQute/jpm/lib/ArtifactData.java  |   33 -
 biz.aQute.jpm/src/aQute/jpm/lib/CommandData.java   |   28 -
 .../aQute/jpm/lib/JustAnotherPackageManager.java   |  963 ---
 biz.aQute.jpm/src/aQute/jpm/lib/Service.java       |  169 -
 biz.aQute.jpm/src/aQute/jpm/lib/ServiceData.java   |   20 -
 biz.aQute.jpm/src/aQute/jpm/main/InstallCert.java  |  159 -
 biz.aQute.jpm/src/aQute/jpm/main/Main.java         | 1475 ----
 biz.aQute.jpm/src/aQute/jpm/platform/Linux.java    |   26 -
 biz.aQute.jpm/src/aQute/jpm/platform/MacOS.java    |  100 -
 biz.aQute.jpm/src/aQute/jpm/platform/Platform.java |  162 -
 biz.aQute.jpm/src/aQute/jpm/platform/Service.java  |   11 -
 biz.aQute.jpm/src/aQute/jpm/platform/Unix.java     |  202 -
 biz.aQute.jpm/src/aQute/jpm/platform/Windows.java  |  223 -
 .../src/aQute/jpm/platform/macos/command.sh        |    2 -
 .../src/aQute/jpm/platform/macos/daemon.plist      |   12 -
 .../src/aQute/jpm/platform/macos/launch.sh         |    7 -
 biz.aQute.jpm/src/aQute/jpm/platform/service       |    2 -
 .../src/aQute/jpm/platform/unix/command.sh         |    2 -
 biz.aQute.jpm/src/aQute/jpm/platform/unix/initd.sh |    2 -
 .../src/aQute/jpm/platform/unix/launch.sh          |    7 -
 .../aQute/jpm/platform/windows/WinRegistry.java    |  392 -
 .../src/aQute/jpm/platform/windows/command.sh      |    1 -
 .../src/aQute/jpm/service/ServiceMain.java         |  156 -
 .../aQute/jpm/service/TraceSecurityManager.java    |   68 -
 biz.aQute.jpm/test/test/JPMTest.java               |   98 -
 .../.settings/org.eclipse.jdt.core.prefs           |  355 +-
 biz.aQute.junit/.settings/org.eclipse.jdt.ui.prefs |   61 -
 biz.aQute.junit/bnd.bnd                            |   26 +-
 biz.aQute.junit/src/aQute/junit/Activator.java     |  319 +-
 .../src/aQute/junit/BasicTestReport.java           |   27 +-
 .../src/aQute/junit/JUnitEclipseReport.java        |  245 +-
 .../src/aQute/junit/JunitXmlReport.java            |   65 +-
 biz.aQute.junit/src/aQute/junit/Tag.java           |  134 +-
 biz.aQute.junit/src/aQute/junit/Tee.java           |   15 +-
 biz.aQute.junit/src/aQute/junit/TestReporter.java  |    5 +-
 .../src/aQute/junit/constants/TesterConstants.java |   12 -
 .../src/aQute/junit/plugin/ProjectTesterImpl.java  |   24 +-
 .../src/aQute/junit/runtime/OSGiTestCase.java      |   55 +-
 .../src/aQute/junit/runtime/Operation.java         |   11 +
 .../src/aQute/junit/runtime/VoidOperation.java     |   23 +-
 biz.aQute.launcher/.classpath                      |    3 +
 .../.settings/org.eclipse.jdt.core.prefs           |  358 +-
 .../.settings/org.eclipse.jdt.ui.prefs             |   61 -
 biz.aQute.launcher/bnd.bnd                         |    7 +-
 .../src/aQute/launcher/Launcher.java               |  609 +-
 .../src/aQute/launcher/SimplePermissionPolicy.java |   37 +-
 .../launcher/constants/LauncherConstants.java      |   96 +-
 .../src/aQute/launcher/minifw/Context.java         |  642 +-
 .../src/aQute/launcher/minifw/MiniFramework.java   |   91 +-
 .../aQute/launcher/plugin/ProjectLauncherImpl.java |  168 +-
 biz.aQute.launcher/src/test/MiniFrameworkTest.java |   34 -
 .../src/test/ProjectLaunchImplTest.java            |   43 -
 biz.aQute.launcher/src/test/ws/p1/bnd.bnd          |    3 -
 .../test/test/MiniFrameworkTest.java               |   34 +
 biz.aQute.repository/.classpath                    |    6 -
 biz.aQute.repository/.project                      |   23 -
 .../.settings/org.eclipse.core.resources.prefs     |    3 -
 .../.settings/org.eclipse.core.runtime.prefs       |    3 -
 .../.settings/org.eclipse.jdt.core.prefs           |  361 -
 .../.settings/org.eclipse.jdt.ui.prefs             |   61 -
 biz.aQute.repository/bnd.bnd                       |   85 -
 biz.aQute.repository/build.xml                     |    4 -
 .../src/aQute/bnd/deployer/Constants.java          |    5 -
 .../bnd/deployer/http/DefaultURLConnector.java     |   79 -
 .../deployer/http/HttpBasicAuthURLConnector.java   |  173 -
 .../src/aQute/bnd/deployer/http/HttpsUtil.java     |   43 -
 .../src/aQute/bnd/deployer/obr/Conversions.java    |   28 -
 .../src/aQute/bnd/deployer/obr/LocalOBR.java       |   14 -
 .../src/aQute/bnd/deployer/obr/NexusOBR.java       |  280 -
 .../src/aQute/bnd/deployer/obr/OBR.java            |   36 -
 .../deployer/repository/AbstractIndexedRepo.java   |  702 --
 .../repository/CachingUriResourceHandle.java       |  350 -
 .../bnd/deployer/repository/CapabilityIndex.java   |   61 -
 .../bnd/deployer/repository/FixedIndexedRepo.java  |   99 -
 .../bnd/deployer/repository/LocalIndexedRepo.java  |  353 -
 .../repository/MapToDictionaryAdapter.java         |   64 -
 .../bnd/deployer/repository/NullLogService.java    |   16 -
 .../bnd/deployer/repository/ProtectedStream.java   |   56 -
 .../deployer/repository/ReporterLogService.java    |   42 -
 .../bnd/deployer/repository/api/CheckResult.java   |   51 -
 .../bnd/deployer/repository/api/Decision.java      |    5 -
 .../repository/api/IRepositoryContentProvider.java |   94 -
 .../repository/api/IRepositoryIndexProcessor.java  |   33 -
 .../bnd/deployer/repository/api/Referral.java      |   59 -
 .../aQute/bnd/deployer/repository/api/packageinfo  |    1 -
 .../src/aQute/bnd/deployer/repository/packageinfo  |    1 -
 .../repository/providers/AttributeType.java        |  101 -
 .../providers/KnownBundleAnalyzerPlugin.java       |   47 -
 .../repository/providers/ObrContentProvider.java   |  366 -
 .../bnd/deployer/repository/providers/ObrUtil.java |   44 -
 .../providers/R5RepoContentProvider.java           |  269 -
 .../deployer/repository/providers/ScalarType.java  |   28 -
 biz.aQute.repository/src/test/AllTests.java        |   32 -
 biz.aQute.repository/src/test/helpers/Sed.java     |   48 -
 .../test/http/CachingUriResourceHandlerTest.java   |  141 -
 .../src/test/http/ETaggingResourceHandler.java     |   94 -
 .../src/test/http/HttpConnectorTest.java           |  316 -
 .../src/test/lib/MockRegistry.java                 |   32 -
 biz.aQute.repository/src/test/lib/NanoHTTPD.java   | 1058 ---
 biz.aQute.repository/src/test/obr/OBRTest.java     |  215 -
 .../src/test/r5repository/FindProvidersTest.java   |   90 -
 .../test/repository/FailingGeneratingProvider.java |   38 -
 .../src/test/repository/NonGeneratingProvider.java |   38 -
 .../test/repository/TestAttributeTypeParsing.java  |   23 -
 .../src/test/repository/TestCompressedObrRepo.java |  128 -
 .../src/test/repository/TestFixedIndexedRepo.java  |  152 -
 .../test/repository/TestLocalIndexGeneration.java  |  153 -
 .../src/test/repository/TestLocalIndexedRepo.java  |   67 -
 .../test/repository/TestLocalObrGeneration.java    |   81 -
 .../TestMultipleLocalIndexGeneration.java          |  124 -
 .../src/test/repository/TestObrCapReqParsing.java  |  113 -
 .../src/test/repository/TestObrRecognition.java    |  125 -
 .../src/test/repository/TestObrRepo.java           |  149 -
 .../src/test/repository/TestR5Recognition.java     |   98 -
 biz.aQute.repository/testdata/ambiguous.xml        |    2 -
 biz.aQute.repository/testdata/big_index.xml        | 7186 ------------------
 biz.aQute.repository/testdata/big_index.xml.gz     |  Bin 16657 -> 0 bytes
 biz.aQute.repository/testdata/bree-obr.xml         |   19 -
 biz.aQute.repository/testdata/dummy.dtd            |    2 -
 biz.aQute.repository/testdata/example.keystore     |  Bin 1258 -> 0 bytes
 biz.aQute.repository/testdata/fullobr.xml          |  553 --
 biz.aQute.repository/testdata/http_auth.properties |    3 -
 .../testdata/http_auth_wrong.properties            |    4 -
 .../dummybundle.jar.etag                           |    1 -
 .../dummybundle.jar.sha                            |    1 -
 .../dummybundle.jar.etag                           |    1 -
 .../dummybundle.jar.sha                            |    1 -
 biz.aQute.repository/testdata/index1.xml           |   50 -
 biz.aQute.repository/testdata/index2.xml           | 7655 --------------------
 biz.aQute.repository/testdata/index2.xml.gz        |  Bin 23782 -> 0 bytes
 .../testdata/jetty-users.properties                |    1 -
 biz.aQute.repository/testdata/minir5.xml           |   50 -
 biz.aQute.repository/testdata/xmlWithDtdRef.xml    |    3 -
 biz.aQute.resolve/.classpath                       |    6 -
 biz.aQute.resolve/.project                         |   23 -
 .../.settings/org.eclipse.core.resources.prefs     |    3 -
 .../.settings/org.eclipse.core.runtime.prefs       |    3 -
 .../.settings/org.eclipse.jdt.core.prefs           |  361 -
 .../.settings/org.eclipse.jdt.ui.prefs             |   57 -
 biz.aQute.resolve/bnd.bnd                          |   17 -
 biz.aQute.resolve/build.xml                        |    7 -
 .../src/biz/aQute/resolve/ResolveProcess.java      |  120 -
 .../resolve/internal/BndrunResolveContext.java     |  440 --
 .../internal/FrameworkResourceRepository.java      |  144 -
 .../biz/aQute/resolve/internal/J2SE_1_2.properties |   25 -
 .../biz/aQute/resolve/internal/J2SE_1_3.properties |   41 -
 .../biz/aQute/resolve/internal/J2SE_1_4.properties |   97 -
 .../biz/aQute/resolve/internal/J2SE_1_5.properties |  123 -
 .../biz/aQute/resolve/internal/JRE_1_1.properties  |    1 -
 .../aQute/resolve/internal/JavaSE_1_6.properties   |  160 -
 .../aQute/resolve/internal/JavaSE_1_7.properties   |  163 -
 .../resolve/internal/OSGI_Minimum_1_0.properties   |    0
 .../resolve/internal/OSGI_Minimum_1_1.properties   |    0
 .../resolve/internal/OSGI_Minimum_1_2.properties   |    0
 .../src/biz/aQute/resolve/internal/Utils.java      |   30 -
 .../src/biz/aQute/resolve/packageinfo              |    1 -
 .../src/test/BndrunResolveContextTest.java         |  436 --
 biz.aQute.resolve/src/test/lib/MockRegistry.java   |   34 -
 biz.aQute.resolve/src/test/lib/NullLogService.java |   16 -
 biz.aQute.resolve/src/test/lib/Utils.java          |   54 -
 biz.aQute.resolve/testdata/buildrepo.index.xml     |  238 -
 .../org.apache.felix.framework-4.0.0.index.xml     |   86 -
 .../org.apache.felix.framework-4.0.2.index.xml     |   86 -
 .../testdata/osgi.cmpn-4.3.0.index.xml             |  226 -
 biz.aQute.resolve/testdata/readme.txt              |    3 -
 biz.aQute.resolve/testdata/repo1.index.xml         |   61 -
 biz.aQute.resolve/testdata/repo2.index.xml         |   61 -
 biz.aQute.resolve/testdata/repo3.index.xml         |  225 -
 biz.aQute.resolve/testdata/repo4.index.xml         |  163 -
 build.xml                                          |   47 +-
 cnf/build.bnd                                      |   16 +-
 cnf/build.xml                                      |  141 +-
 cnf/eclipse/bnd(tools).importorder                 |    6 -
 cnf/eclipse/codeformatter.xml                      |  579 --
 cnf/findbugs.exclude.xml                           |   25 -
 cnf/findbugs.include.xml                           |  512 --
 cnf/findbugs/README.txt                            |   20 -
 cnf/findbugs/bin/addMessages                       |   73 -
 cnf/findbugs/bin/computeBugHistory                 |   78 -
 cnf/findbugs/bin/convertXmlToText                  |   73 -
 cnf/findbugs/bin/copyBuggySource                   |   75 -
 cnf/findbugs/bin/defectDensity                     |   77 -
 cnf/findbugs/bin/deprecated/bugHistory             |   75 -
 cnf/findbugs/bin/deprecated/unionBugs              |   78 -
 cnf/findbugs/bin/deprecated/unionResults           |   80 -
 cnf/findbugs/bin/deprecated/updateBugs             |   78 -
 .../bin/experimental/backdateHistoryUsingSource    |   75 -
 cnf/findbugs/bin/experimental/churn                |   75 -
 cnf/findbugs/bin/experimental/obfuscate            |   75 -
 cnf/findbugs/bin/experimental/treemapVisualization |   75 -
 cnf/findbugs/bin/fb                                |  192 -
 cnf/findbugs/bin/fbwrap                            |   84 -
 cnf/findbugs/bin/filterBugs                        |   78 -
 cnf/findbugs/bin/findbugs                          |  199 -
 cnf/findbugs/bin/findbugs-csr                      |   76 -
 cnf/findbugs/bin/findbugs-dbStats                  |   76 -
 cnf/findbugs/bin/findbugs-msv                      |   76 -
 cnf/findbugs/bin/findbugs.bat                      |  240 -
 cnf/findbugs/bin/findbugs2                         |  177 -
 cnf/findbugs/bin/listBugDatabaseInfo               |   75 -
 cnf/findbugs/bin/mineBugHistory                    |   73 -
 cnf/findbugs/bin/printAppVersion                   |   75 -
 cnf/findbugs/bin/printClass                        |   73 -
 cnf/findbugs/bin/rejarForAnalysis                  |   75 -
 cnf/findbugs/bin/setBugDatabaseInfo                |   75 -
 cnf/findbugs/bin/unionBugs                         |   80 -
 cnf/findbugs/bin/xpathFind                         |   75 -
 cnf/findbugs/lib/buggy.icns                        |  Bin 36133 -> 0 bytes
 cnf/findbugs/src/xsl/default.xsl                   |  376 -
 cnf/findbugs/src/xsl/fancy-hist.xsl                | 1197 ---
 cnf/findbugs/src/xsl/fancy.xsl                     |  848 ---
 cnf/findbugs/src/xsl/plain.xsl                     |  306 -
 cnf/findbugs/src/xsl/summary.xsl                   |  252 -
 cnf/scripts/fb_generate_includes.bash              |   33 -
 debian/ant.properties                              |    5 +
 debian/bnd.pod                                     |  120 +-
 debian/bnd.poms                                    |    6 +-
 debian/changelog                                   |   53 +-
 debian/control                                     |   65 +-
 debian/copyright                                   |  289 +-
 debian/git-transform.sh                            |    0
 debian/orig-tar.sh                                 |    3 +-
 debian/patches/FTBFS.patch                         |  342 -
 debian/patches/OSGi-6-methods.patch                |   53 +
 debian/patches/ant-1.9-compatibility.diff          |   30 +
 ...-without-biz.aQute.repository-and-resolve.patch |   48 -
 debian/patches/build_excludes.diff                 |   18 +
 debian/patches/display_bsn_on_missing_bundle.diff  |   29 +
 debian/patches/display_bsn_on_missing_bundle.patch |   29 -
 debian/patches/embedded-repo.patch                 |   23 -
 debian/patches/find_swt_jar.diff                   |   21 +
 debian/patches/findbugs.patch                      |   25 -
 debian/patches/fix-encoding.diff                   |   13 +
 debian/patches/implement-missing-methods.patch     |   72 -
 debian/patches/java8-compatibility.diff            |   74 +
 debian/patches/no-ee.j2se.patch                    |  117 -
 debian/patches/no-osgi.r5.patch                    |   54 -
 debian/patches/no_ee_minimum.diff                  |   50 +
 debian/patches/no_ee_minimum.patch                 |   62 -
 debian/patches/no_felix.diff                       |   20 +
 debian/patches/no_git_during_build.diff            |   19 +
 debian/patches/osgi43_fixes.diff                   |   88 +
 debian/patches/series                              |   20 +-
 debian/pom-annotation.xml                          |   34 +-
 debian/pom-bnd.xml                                 |   63 +-
 debian/pom-bndlib.xml                              |   86 +-
 debian/rules                                       |   32 +-
 demo/.classpath                                    |    1 +
 demo/.settings/org.eclipse.jdt.core.prefs          |  361 +-
 demo/.settings/org.eclipse.jdt.ui.prefs            |   61 -
 demo/bnd.bnd                                       |   11 +-
 demo/src/com/example/demo/Activator.java           |    4 +-
 demo/src/test/TestActivator.java                   |   16 +-
 demo/src/test/TestCase1.java                       |   17 +-
 dist/.classpath                                    |    8 -
 dist/.project                                      |   23 -
 dist/.settings/org.eclipse.jdt.core.prefs          |   12 -
 dist/bnd.bnd                                       |    8 -
 dist/build.xml                                     |    7 -
 dist/src/.empty                                    |    0
 dist/test/.empty                                   |    0
 osgi.r5/.classpath                                 |    6 -
 osgi.r5/.project                                   |   23 -
 osgi.r5/.settings/org.eclipse.core.resources.prefs |    3 -
 osgi.r5/.settings/org.eclipse.core.runtime.prefs   |    3 -
 osgi.r5/.settings/org.eclipse.jdt.core.prefs       |  361 -
 osgi.r5/.settings/org.eclipse.jdt.ui.prefs         |   61 -
 osgi.r5/README.txt                                 |    6 -
 osgi.r5/bnd.bnd                                    |   18 -
 osgi.r5/build.xml                                  |    4 -
 1293 files changed, 43055 insertions(+), 105433 deletions(-)

diff --cc debian/ant.properties
index 0000000,0000000..15c17a0
new file mode 100644
--- /dev/null
+++ b/debian/ant.properties
@@@ -1,0 -1,0 +1,5 @@@
++javac.excludes=**/aQute/bnd/junit/*.java
++# Ensure that source and target are 1.5
++# For backwards compat on Java 7
++ant.build.javac.source=1.5
++ant.build.javac.target=1.5
diff --cc debian/bnd.pod
index 518b0e3,0000000..155db18
mode 100644,000000..100644
--- a/debian/bnd.pod
+++ b/debian/bnd.pod
@@@ -1,101 -1,0 +1,101 @@@
 +=head1 NAME
 +
- bnd - Create and diagnose OSGi bundles.
++bnd - Create and diagnose OSGi R4 bundles.
 +
 +=head1 SYNOPSIS
 +
 +B<bnd> [S<I<general-options>>] [S<I<cmd>>] [S<I<cmd-options>>]
 +
 +B<bnd> [S<I<general-options>>] E<lt>fileE<gt>.jar
 +
 +B<bnd> [S<I<general-options>>] E<lt>fileE<gt>.bnd
 +
 +=head1 DESCRIPTION
 +
- The bnd tool helps you create and diagnose OSGi bundles. The key functions are:
++The bnd tool helps you create and diagnose OSGi R4 bundles. The key functions are:
 +
 + * Show the manifest and JAR contents of a bundle
 + * Wrap a JAR so that it becomes a bundle
 + * Create a Bundle from a specification and a class path
-  * Verify the validity of the manifest entries
++ * Verify the validity of the manifest entries 
 +
 +=head1 GENERAL OPTIONS
 +
 +=over
 +
- =item --failok
++=item -failok
 +
- Same as the property --failok. The current run will create a JAR file even if there were errors.
++Same as the property -failok. The current run will create a JAR file even if there were errors.
 +
- =item --exceptions
++=item -exceptions
 +
 +Will print the exception when the software has ran into a bad exception and bails out. Normally only a message is printed. For debugging or diagnostic reasons, the exception stack trace can be very helpful.
 +
 +=back
 +
 +=head1 COMMANDS
 +
 +=over
 +
- Available commands:
- 
-   baseline          - Compare a newer bundle to a baselined bundle and provide
-                       versioning advice
-   bnd               - The swiss army tool for OSGi
-   build             - Build a project. This will create the jars defined in the
-                       bnd.bnd and sub-builders.
-   buildx            - Build project, is deprecated but here for backward
-                       compatibility
-   bump              - Bumps the version of a project
-   clean             - Clean a project
-   convert           - Converter to different formats
-   create            - Create jar, used to support backward compatible java jar
-                       commands
-   debug             - Show a lot of info about the project you're in
-   deliverables      - Show all deliverables from this workspace. with their
-                       current version and path.
-   diff              - Diff jars
-   digest            - Digests a number of files
-   do                - Execute a file based on its extension. Supported
-                       extensions are: bnd (build), bndrun (run), and jar (print)
-   eclipse           - Show info about the current directory's eclipse project
-   extract           - Extract files from a JAR file, equivalent jar command
-                       x[vf] (syntax supported)
-   grep              - Grep the manifest of bundles/jar files.
-   info              - Show key project variables
-   macro             - Show macro value
-   maven             - Maven bundle command
-   package           - Package a bnd or bndrun file into a single jar that
-                       executes with java -jar <>.jar
-   print             - Printout the JAR
-   project           - Execute a Project action, or if no parms given, show
-                       information about the project
-   release           - Release this project
-   repo              - Manage the repositories
-   run               - Run a project in the OSGi launcher
-   runtests          - Run OSGi tests and create report
-   schema            - Highly specialized function to create an overview of
-                       package deltas in ees
-   select            - Helps finding information in a set of JARs by filtering on
-                       manifest data and printing out selected information.
-   settings          - Set bnd/jpm global variables
-   source            - Merge a binary jar with its sources. It is possible to
-                       specify source path
-   syntax            - Access the internal bnd database of keywords and options
-   test              - Test a project according to an OSGi test
-   type              - List files int a JAR file, equivalent jar command t[vf]
-                       (syntax supported)
-   verify            - Verify jars
-   version           - Show version information about bnd
-   view              - View a resource from a JAR file.
-   wrap              - Wrap a jar
-   xref              - Show a cross references for all classes in a set of jars.
++=item print ( -verify | -manifest | -list | - all ) * E<lt>fileE<gt>.jar +
++
++The print function will take a list of JAR file and print one or more aspect of the JAF riles. The following aspects can be added.
++
++    * -verify - Verify the JAR for consistency with the specification
++      The print will exit with an error if the verify fails.
++    * -manifest - Show the manifest
++    * -list - List the entries in the JAR file
++    * -all - Do all (this is the default. 
++
++C<bnd print -verify *.jar>
++
++=item buildx ( -classpath LIST | -eclipse <lt>fileE<gt> | -noeclipse | -output E<lt>fileE<gt> ) * E<lt>fileE<gt>.bnd +
++
++The build function will assemble a bundle from the bnd specification. The default name of the output bundle is the name of the bnd file with a .jar extension.
++
++    * -classpath - A list of JAR files and/or directories that should
++      be placed on the class path before the calculation starts.
++    * -eclipse - Parse the file as an Eclipse .classpath file, use
++      the information to create an Eclipse's project class path.
++      If this option is used, the default .classpath file is not read
++    * -noeclipse - Do not parse the .classpath file of an Eclipse
++      project.
++    * -output - Override the default output name of the bundle or the
++      directory. If the output is a directory, the name will be
++      derived from the bnd file name. 
++
++C<bnd build -classpath bin -noeclipse -output test.jar xyz.bnd>
++
++=item wrap ( -classpath (<lt>fileE<gt>(','<lt>fileE<gt>)*)-output <lt>fileE|dir<gt> | -properties <lt>fileE<gt> ) *
++-ignoremanifest? <lt>fileE<gt>.jar *
++
++The wrap command takes an existing JAR file and guesses the manifest headers that will make this JAR useful for an OSGi Service Platform. If the output file is not overridden, the name of the input file is used with a .bar extension. The default bnd file for the header calculation is:
++
++ Export-Package: * 
++ Import-Package: <packages inside the target jar>
++
++If the target bundle has a manifest, the headers are merged with the properties.
++
++The defaults can be overridden with a specific properties file.
++
++    * -output - Set the output file or directory
++    * -classpath - Sets the classpath as a comma separated list
++    * -properties - Use a special property file for the manifest
++      calculation.
++    * -ignoremanifest - Do not include the manifest headers from
++      the target bundle 
++
++C<bnd wrap -classpath osgi.jar *.jar>
 +
 +=back
 +
 +=head1 SEE ALSO
 +
- L<https://github.com/bndtools/bnd>
++L<http://www.aqute.biz/Code/Bnd>
++
++=head1 AUTHOR
 +
++Ludovic Claude <ludovic.claude at laposte.net>
 +
++Damien Raude-Morvan <drazzib at debian.org>
 +
diff --cc debian/bnd.poms
index e61290e,0000000..32060f0
mode 100644,000000..100644
--- a/debian/bnd.poms
+++ b/debian/bnd.poms
@@@ -1,3 -1,0 +1,3 @@@
- debian/pom-bnd.xml --has-package-version --java-lib --no-parent
- debian/pom-bndlib.xml --has-package-version --java-lib --no-parent
- debian/pom-annotation.xml --has-package-version --java-lib --no-parent
++debian/pom-bnd.xml --has-package-version --java-lib
++debian/pom-bndlib.xml --has-package-version --java-lib
++debian/pom-annotation.xml --has-package-version --java-lib
diff --cc debian/changelog
index 8c6b5f6,0000000..2c8bb8e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,209 -1,0 +1,170 @@@
- bnd (2.1.0-1) experimental; urgency=medium
++bnd (1.50.0-9) unstable; urgency=medium
 +
 +  * Team upload.
++  * Add OSGi-6-methods.patch.
++    - Fix FTBFS due to OSGi 5/6 transition.
++  * Declare compliance with Debian Policy 3.9.6.
++  * Move packaging to Git.
++  * Tighten build-dependency and dependency on osgi-core and osgi-compendium.
 +
-   [ Miguel Landaeta ]
-   * Moved the package to Git.
-   * Imported Upstream version 2.1.0.
-   * Refresh patches for 2.1.0-1 upload.
- 
-   [ Markus Koschany ]
-   * Update debian/copyright for version 2.1.0.
-   * Drop ant-1.9-compatibility.diff. This patch is obsolete with version 2.1.
-   * Drop already disabled patches.
-     - find_swt_jar.diff
-     - java8-compatibility.diff
-     - osgi43_fixes.diff
-   * Use patch extension instead of diff for patches.
-   * Drop fix-encoding.patch and use upstream values instead.
-   * Drop build_excludes.patch and use upstream values again.
-   * Drop no_felix.patch because bnd builds fine without it.
-   * Drop no_git_during_build.patch because bnd builds fine without it.
-   * Delete debian/ant.properties file because it was not used.
-   * New patches. See patch headers for further comments:
-     - no-ee.j2se.patch
-     - no-osgi.r5.patch
-     - findbugs.patch
-     - embedded-repo.patch
-     - FTBFS.patch
-     - implement-missing-methods.patch
-     - build-without-biz.aQute.repository-and-resolve.patch
-   * debian/control:
-     - Add findbugs to Build-Depends.
-     - Add junit4 to Build-Depends.
-     - Add ant-contrib to Build-Depends.
-     - Tighten build-dependencies of osgi components.
-   * debian/rules:
-     - Fix com.springsource.org.junit symlink.
-     - Symlink ant-contrib.jar to the right place.
-     - Remove biz.aQute.repository in clean target.
-     - Remove biz.aQute.resolve in clean target.
-     - Fix all obsolete tmp paths. Files are now in generated.
-   * wrap-and-sort -sa.
-   * Update bnd.pod for new release. Mention new or different commands.
-     Remove Authors paragraph since all copyright holders are already credited
-     in debian/copyright.
-   * debian/rules: Update clean target. Ensure that bnd can be built twice in a
-     row and remove all class and jar files in subsequent runs.
- 
-  -- Markus Koschany <apo at gambaru.de>  Wed, 03 Jun 2015 20:11:07 +0200
++ -- Markus Koschany <apo at gambaru.de>  Fri, 05 Jun 2015 23:55:15 +0200
 +
 +bnd (1.50.0-8) unstable; urgency=medium
 +
 +  * Added a patch to fix the compilation errors with Java 8
 +  * debian/control:
 +    - Removed the dependency on openjdk-6-jdk
 +    - Standards-Version updated to 3.9.5 (no changes)
 +  * Switch to debhelper level 9
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Tue, 29 Apr 2014 14:05:29 +0200
 +
 +bnd (1.50.0-7) unstable; urgency=low
 +
 +  * Install the Maven artifacts biz.aQute:annotation and biz.aQute:bnd
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Thu, 17 Oct 2013 22:15:13 +0200
 +
 +bnd (1.50.0-6) unstable; urgency=low
 +
 +  [ Emmanuel Bourg ]
 +  * Added a patch to compile with Ant 1.9 (Closes: #712343)
 +  * Fixed the unmappable character errors during the compilation
 +  * debian/watch: Updated to catch the recent releases on Github
 +  * debian/control:
 +    - Updated Standards-Version to 3.9.4 (no changes)
 +    - Use canonical URLs for the Vcs-* fields
 +  * debian/rules: Improved the clean target
 +  * Updated the Maven pom
 +
 +  [ Damien Raude-Morvan ]
 +  * d/rules: Don't fail clean target if there is no things to delete.
 +  * Upload to unstable.
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Fri, 26 Jul 2013 11:28:27 +0200
 +
 +bnd (1.50.0-5) unstable; urgency=low
 +
 +  * d/rules: Fix FTBFS after update to eclipse 3.8.0~rc4-1 (Closes: #682647).
 +  * d/copyright: Update to copyright format 1.0.
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 25 Jul 2012 00:34:41 +0200
 +
 +bnd (1.50.0-4) unstable; urgency=low
 +
 +  * Fix FTBFS after update to eclipse 3.7.2-1 (Closes: #669533).
 +  * Add Jakub Adam to Uploaders.
 +  * Bump Standards-Version to 3.9.3: no changes needed.
 +
 + -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 30 Apr 2012 22:44:59 +0200
 +
 +bnd (1.50.0-3) unstable; urgency=low
 +
 +  * d/rules: Fix broken link with Eclipse JDT during build. (Closes: #655548).
 +  * d/patches/display_bsn_on_missing_bundle.diff: Improve error message when
 +    some bundle is missing.
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 17 Jan 2012 23:16:19 +0100
 +
 +bnd (1.50.0-2) unstable; urgency=low
 +
 +  [ Miguel Landaeta ]
 +  * Team upload.
 +
 +  [ James Page ]
 +  * Fix FTBFS with OpenJDK 7 (LP: #888926) (Closes: #651389):
 +    - d/ant.properties: Set default source/target to 1.5 to ensure
 +      backwards compatibility and avoid Java 7 encoding errors.
 +
 + -- Miguel Landaeta <miguel at miguel.cc>  Thu, 08 Dec 2011 21:41:18 -0430
 +
 +bnd (1.50.0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * d/control: Add Build-Depends on libbindex-java.
 +  * d/{bootstrap,rules}: Add bindex.jar to classpath.
 +  * d/patches/no_git_during_build.diff: Don't try to use GIT during build.
 +  * d/patches/osgi43_fixes.diff: Some fixes for libosgi-core-java >= 4.3.
 +  * d/patches/no_felix.diff: Drop dependency on felix-framework (to remove
 +    dependency cycle).
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 09 Nov 2011 22:39:08 +0100
 +
 +bnd (1.44.0-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Bump Standards-Version to 3.9.2: no changes needed.
 +  * d/copyright: Upgrade to latest DEP-5 version.
 +  * Use upstream build system:
 +    - d/orig-tar.sh: Rework to use github (Closes: #640839).
 +    - d/build.xml, d/build.properties: Drop.
 +    - d/bootstrap.xml: Build a small bnd.jar just for its own bootstrap.
 +    - Rename d/svn-transform.sh to d/git-transform.sh and remove unneeded bits.
 +  * Enable full OSGi and Eclipse modules (Closes: #565749) :
 +    - d/control: Add Build-Depends on libswt-gtk-3-java, eclipse-rcp,
 +      eclipse-jdt and libosgi-core-java
 +    - d/control: Only Suggests: eclipse-rcp, eclipse-jdt
 +
 + -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 26 Oct 2011 00:59:39 +0200
 +
 +bnd (0.0.384-2) unstable; urgency=low
 +
 +  * Team upload.
 +  * Switch to source format 3.0.
 +  * Update Standards-Version: 3.9.1.
 +
 + -- Torsten Werner <twerner at debian.org>  Tue, 30 Aug 2011 19:28:43 +0200
 +
 +bnd (0.0.384-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Exclude the Filter class from the distribution as it has
 +    some copyright issues and it is not used anymore in this
 +    new version of BND
 +  * Update copyright according to upstream changes, all
 +    contentious issues have been cleared.
 +  * Bump up Standards-Version to 3.8.3, no change
 +
 + -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 02 Sep 2009 12:14:20 +0100
 +
 +bnd (0.0.337.2-3) unstable; urgency=low
 +
 +  * Force name of bnd library installed in /usr/share/java
 +    to be bnd.jar instead of bndlib.jar 
 +
 + -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 14 Aug 2009 14:38:12 +0100
 +
 +bnd (0.0.337.2-2) unstable; urgency=low
 +
 +  [Ludovic Claude]
 +  * Add man page for bnd script
 +
 +  [Damien Raude-Morvan]
 +  * Add myself as Uploaders
 +  * Install a "bnd" shell script to execute BND command line interface
 +    - Add debian/bnd.sh script
 +    - Add Depends on java-wrapper, used as helper for launch script
 +  * Add debian/watch
 +  * Remove duplicate Section declaration on first binary package
 +
 + -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 07 Aug 2009 14:12:23 +0100
 +
 +bnd (0.0.337.2-1) experimental; urgency=low
 +
 +  * Create a pseudo new upstream version to reflect the changes in the
 +    source tarball.
 + 
 + -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 04 Aug 2009 20:30:17 +0100
 +
 +bnd (0.0.337.1-2) experimental; urgency=low
 +
 +  * Fix copyright issues
 +  * Don't include the test jars in the source tarball
 +
 + -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 02 Aug 2009 22:48:47 +0100
 +
 +bnd (0.0.337.1-1) experimental; urgency=low
 +
 +  * Initial release. (Closes: #539558)
 +
 + -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 19 Jul 2009 19:48:06 +0100
diff --cc debian/control
index f047ce9,0000000..c1fc635
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,61 -1,0 +1,52 @@@
 +Source: bnd
 +Section: java
 +Priority: optional
 +Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
- Uploaders:
-  Ludovic Claude <ludovic.claude at laposte.net>,
-  Damien Raude-Morvan <drazzib at debian.org>,
-  Jakub Adam <jakub.adam at ktknet.cz>,
-  Emmanuel Bourg <ebourg at apache.org>
- Build-Depends:
-  ant,
-  ant-contrib,
-  ant-optional,
-  cdbs,
-  debhelper (>= 9),
-  default-jdk,
-  eclipse-jdt,
-  eclipse-rcp,
-  findbugs,
-  javahelper,
-  junit,
-  junit4,
-  libbindex-java (>= 2.2+svn101),
-  libosgi-compendium-java (>= 5.0.0),
-  libosgi-core-java (>= 6.0.0),
-  libswt-gtk-3-java,
-  maven-ant-helper,
-  maven-repo-helper
++Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
++           Damien Raude-Morvan <drazzib at debian.org>,
++           Jakub Adam <jakub.adam at ktknet.cz>,
++           Emmanuel Bourg <ebourg at apache.org>
++Build-Depends: ant,
++               ant-optional,
++               cdbs,
++               debhelper (>= 9),
++               default-jdk,
++               eclipse-jdt,
++               eclipse-rcp,
++               javahelper,
++               junit,
++               libbindex-java (>= 2.2+svn101),
++               libosgi-compendium-java (>= 5.0.0),
++               libosgi-core-java (>= 6.0.0),
++               libswt-gtk-3-java,
++               maven-ant-helper,
++               maven-repo-helper
 +Standards-Version: 3.9.6
 +Vcs-Git: git://anonscm.debian.org/pkg-java/bnd.git
 +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/bnd.git
 +Homepage: http://www.aQute.biz/Bnd
 +
 +Package: bnd
 +Architecture: all
- Depends:
-  default-jre-headless | java5-runtime-headless,
-  java-wrappers,
-  libosgi-compendium-java (>= 5.0.0),
-  libosgi-core-java (>= 6.0.0),
-  ${misc:Depends}
- Recommends:
-  libbindex-java (>= 2.2+svn101)
- Suggests:
-  eclipse-jdt,
-  eclipse-rcp
- Description: tool to create and diagnose OSGi bundles
-  The bnd tool helps you create and diagnose OSGi bundles.
++Depends: default-jre-headless | java5-runtime-headless,
++         java-wrappers,
++         libosgi-compendium-java (>= 5.0.0),
++         libosgi-core-java (>= 6.0.0),
++         ${misc:Depends}
++Recommends: libbindex-java (>= 2.2+svn101)
++Suggests: eclipse-jdt, eclipse-rcp
++Description: tool to create and diagnose OSGi R4 bundles
++ The bnd tool helps you create and diagnose OSGi R4 bundles.
 + The key functions are:
 + .
 +   * Show the manifest and JAR contents of a bundle
 +   * Wrap a JAR so that it becomes a bundle
 +   * Create a Bundle from a specification and a class path
 +   * Verify the validity of the manifest entries
 + .
 + The tool is capable of acting as:
 + .
 +   * Command line tool
 +   * Eclipse Plugin
 +   * Maven Plugin
 +   * Ant Plugin
diff --cc debian/copyright
index 79586cd,0000000..15d9a92
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,82 -1,0 +1,301 @@@
 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 +Upstream-Name: BND
 +Upstream-Contact: Peter Kriens, aQute SARL
- Source: https://github.com/bndtools/bnd
++Source: https://github.com/bnd/bnd
 +
 +Files: *
- Copyright: 2006-2013, aQute SARL
++Copyright: 2006-2009, aQute SARL
 +License: Apache-2.0
 +
- Files: cnf/findbugs/*
- Copyright: 2004,2005,  University of Maryland
-            2005,       Chris Nappin
-            2005, 2006, Etienne Giraudy, InStranet Inc
- License: LGPL-2.1+
++Files: biz.aQute.bnd/src/swing2swt/layout/AWTLayout.java
++ biz.aQute.bnd/src/swing2swt/layout/GridLayout.java
++Copyright: 2003, IBM Corporation and others.
++License: IBM-License
 +
- Files: aQute.libg/src/aQute/lib/filter/Filter.java
- Copyright: OSGi Alliance
++Files: aQute.libg/src/aQute/libg/clauses/Selector.java
++ biz.aQute.bndlib/src/aQute/bnd/compatibility/Signatures.java
++Copyright: 2006-2010, OSGi Alliance.
 +License: Apache-2.0
- Comment:
-  This file was originally licensed from Gatespace to OSGi in the year 2000. A
-  member donated this as ASL 2.0 licensed matching BND's default license. See
-  also https://github.com/bndtools/bnd/issues/944 for a clarification from
-  upstream. This license header will be corrected in a future upstream release.
 +
- Files: biz.aQute.bndlib.tests/src/test/lib/NanoHTTPD.java
++Files: biz.aQute.bndlib/src/test/lib/deployer/obr/NanoHTTPD.java
 +Copyright: 2001,2005-2011, Jarno Elonen <elonen at iki.fi>
-            2010,           Konstantinos Togias <info at ktogias.gr>
- License: BSD-3-clause
- 
- Files: biz.aQute.jpm/src/aQute/jpm/main/InstallCert.java
- Copyright: 2006, Sun Microsystems, Inc.
++           2010, Konstantinos Togias <info at ktogias.gr>
 +License: BSD-3-clause
 +
 +Files: debian/*
 +Copyright: 2009, Ludovic Claude <ludovic.claude at laposte.net>
 +           2011, Damien Raude-Morvan <drazzib at debian.org>
-            2015, Miguel Landaeta <nomadium at debian.org>
-            2015, Markus Koschany <apo at gambaru.de>
 +License: Apache-2.0
 +
++Files: biz.aQute.junit/src/aQute/junit/runtime/Operation.java
++ biz.aQute.junit/src/aQute/junit/runtime/OSGiTestCase.java
++ biz.aQute.junit/src/aQute/junit/runtime/VoidOperation.java
++Copyright: 2010, Neil Bartlett.
++License: other
++    Eclipse Public License - v 1.0
++ .
++    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
++    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE
++    PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
++ .
++    1. DEFINITIONS
++ .
++    "Contribution" means:
++ .
++    a) in the case of the initial Contributor, the initial code and documentation
++    distributed under this Agreement, and
++    b) in the case of each subsequent Contributor:
++ .
++    i) changes to the Program, and
++ .
++    ii) additions to the Program;
++ .
++    where such changes and/or additions to the Program originate from and are
++    distributed by that particular Contributor. A Contribution 'originates'
++    from a Contributor if it was added to the Program by such Contributor itself
++    or anyone acting on such Contributor's behalf. Contributions do not include
++    additions to the Program which: (i) are separate modules of software
++    distributed in conjunction with the Program under their own license
++    agreement, and (ii) are not derivative works of the Program.
++ .
++    "Contributor" means any person or entity that distributes the Program.
++ .
++    "Licensed Patents " mean patent claims licensable by a Contributor which are
++    necessarily infringed by the use or sale of its Contribution alone or when
++    combined with the Program.
++ .
++    "Program" means the Contributions distributed in accordance with this
++    Agreement.
++ .
++    "Recipient" means anyone who receives the Program under this Agreement,
++    including all Contributors.
++ .
++    2. GRANT OF RIGHTS
++ .
++    a) Subject to the terms of this Agreement, each Contributor hereby grants
++    Recipient a non-exclusive, worldwide, royalty-free copyright license to
++    reproduce, prepare derivative works of, publicly display, publicly perform,
++    distribute and sublicense the Contribution of such Contributor, if any,
++    and such derivative works, in source code and object code form.
++ .
++    b) Subject to the terms of this Agreement, each Contributor hereby grants
++    Recipient a non-exclusive, worldwide, royalty-free patent license under
++    Licensed Patents to make, use, sell, offer to sell, import and otherwise
++    transfer the Contribution of such Contributor, if any, in source code and
++    object code form. This patent license shall apply to the combination of
++    the Contribution and the Program if, at the time the Contribution is added
++    by the Contributor, such addition of the Contribution causes such
++    combination to be covered by the Licensed Patents. The patent license shall
++    not apply to any other combinations which include the Contribution. No
++    hardware per se is licensed hereunder.
++ .
++    c) Recipient understands that although each Contributor grants the licenses
++    to its Contributions set forth herein, no assurances are provided by any
++    Contributor that the Program does not infringe the patent or other
++    intellectual property rights of any other entity. Each Contributor disclaims
++    any liability to Recipient for claims brought by any other entity based on
++    infringement of intellectual property rights or otherwise. As a condition to
++    exercising the rights and licenses granted hereunder, each Recipient hereby
++    assumes sole responsibility to secure any other intellectual property rights
++    needed, if any. For example, if a third party patent license is required to
++    allow Recipient to distribute the Program, it is Recipient's responsibility
++    to acquire that license before distributing the Program.
++ .
++    d) Each Contributor represents that to its knowledge it has sufficient
++    copyright rights in its Contribution, if any, to grant the copyright license
++    set forth in this Agreement.
++ .
++    3. REQUIREMENTS
++ .
++    A Contributor may choose to distribute the Program in object code form under
++    its own license agreement, provided that:
++ .
++    a) it complies with the terms and conditions of this Agreement; and
++ .
++    b) its license agreement:
++ .
++    i) effectively disclaims on behalf of all Contributors all warranties and
++    conditions, express and implied, including warranties or conditions of title
++    and non-infringement, and implied warranties or conditions of merchantability
++    and fitness for a particular purpose;
++ .
++    ii) effectively excludes on behalf of all Contributors all liability for
++    damages, including direct, indirect, special, incidental and consequential
++    damages, such as lost profits;
++ .
++    iii) states that any provisions which differ from this Agreement are offered
++    by that Contributor alone and not by any other party; and
++ .
++    iv) states that source code for the Program is available from such
++    Contributor, and informs licensees how to obtain it in a reasonable manner on
++    or through a medium customarily used for software exchange.
++ .
++    When the Program is made available in source code form:
++ .
++    a) it must be made available under this Agreement; and
++ .
++    b) a copy of this Agreement must be included with each copy of the Program.
++ .
++    Contributors may not remove or alter any copyright notices contained within
++    the Program.
++ .
++    Each Contributor must identify itself as the originator of its Contribution,
++    if any, in a manner that reasonably allows subsequent Recipients to identify
++    the originator of the Contribution.
++ .
++    4. COMMERCIAL DISTRIBUTION
++ .
++    Commercial distributors of software may accept certain responsibilities with
++    respect to end users, business partners and the like. While this license is
++    intended to facilitate the commercial use of the Program, the Contributor who
++    includes the Program in a commercial product offering should do so in a manner
++    which does not create potential liability for other Contributors. Therefore,
++    if a Contributor includes the Program in a commercial product offering, such
++    Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
++    every other Contributor ("Indemnified Contributor") against any losses,
++    damages and costs (collectively "Losses") arising from claims, lawsuits and
++    other legal actions brought by a third party against the Indemnified
++    Contributor to the extent caused by the acts or omissions of such Commercial
++    Contributor in connection with its distribution of the Program in a commercial
++    product offering. The obligations in this section do not apply to any claims
++    or Losses relating to any actual or alleged intellectual property
++    infringement. In order to qualify, an Indemnified Contributor must:
++    a) promptly notify the Commercial Contributor in writing of such claim, and
++    b) allow the Commercial Contributor to control, and cooperate with the
++    Commercial Contributor in, the defense and any related settlement
++    negotiations. The Indemnified Contributor may participate in any such claim
++    at its own expense.
++ .
++    For example, a Contributor might include the Program in a commercial product
++    offering, Product X. That Contributor is then a Commercial Contributor. If
++    that Commercial Contributor then makes performance claims, or offers
++    warranties related to Product X, those performance claims and warranties are
++    such Commercial Contributor's responsibility alone. Under this section, the
++    Commercial Contributor would have to defend claims against the other
++    Contributors related to those performance claims and warranties, and if a
++    court requires any other Contributor to pay any damages as a result, the
++    Commercial Contributor must pay those damages.
++ .
++    5. NO WARRANTY
++ .
++    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
++    AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
++    EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
++    CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
++    PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
++    appropriateness of using and distributing the Program and assumes all
++    risks associated with its exercise of rights under this Agreement ,
++    including but not limited to the risks and costs of program errors,
++    compliance with applicable laws, damage to or loss of data, programs or
++    equipment, and unavailability or interruption of operations.
++ .
++    6. DISCLAIMER OF LIABILITY
++ .
++    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
++    CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
++    LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
++    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
++    POSSIBILITY OF SUCH DAMAGES.
++ .
++    7. GENERAL
++ .
++    If any provision of this Agreement is invalid or unenforceable under
++    applicable law, it shall not affect the validity or enforceability of the
++    remainder of the terms of this Agreement, and without further action by
++    the parties hereto, such provision shall be reformed to the minimum extent
++    necessary to make such provision valid and enforceable.
++ .
++    If Recipient institutes patent litigation against any entity (including a
++    cross-claim or counterclaim in a lawsuit) alleging that the Program itself
++    (excluding combinations of the Program with other software or hardware)
++    infringes such Recipient's patent(s), then such Recipient's rights granted
++    under Section 2(b) shall terminate as of the date such litigation is filed.
++ .
++    All Recipient's rights under this Agreement shall terminate if it fails to
++    comply with any of the material terms or conditions of this Agreement and
++    does not cure such failure in a reasonable period of time after becoming
++    aware of such noncompliance. If all Recipient's rights under this Agreement
++    terminate, Recipient agrees to cease use and distribution of the Program as
++    soon as reasonably practicable. However, Recipient's obligations under this
++    Agreement and any licenses granted by Recipient relating to the Program
++    shall continue and survive.
++ .
++    Everyone is permitted to copy and distribute copies of this Agreement, but
++    in order to avoid inconsistency the Agreement is copyrighted and may only
++    be modified in the following manner. The Agreement Steward reserves the
++    right to publish new versions (including revisions) of this Agreement from
++    time to time. No one other than the Agreement Steward has the right to
++    modify this Agreement. The Eclipse Foundation is the initial Agreement
++    Steward. The Eclipse Foundation may assign the responsibility to serve as
++    the Agreement Steward to a suitable separate entity. Each new version of
++    the Agreement will be given a distinguishing version number. The Program
++    (including Contributions) may always be distributed subject to the version
++    of the Agreement under which it was received. In addition, after a new
++    version of the Agreement is published, Contributor may elect to distribute
++    the Program (including its Contributions) under the new version. Except as
++    expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
++    rights or licenses to the intellectual property of any Contributor under
++    this Agreement, whether expressly, by implication, estoppel or otherwise.
++    All rights in the Program not expressly granted under this Agreement are
++    reserved.
++ .
++    This Agreement is governed by the laws of the State of New York and the
++    intellectual property laws of the United States of America. No party to
++    this Agreement will bring a legal action under this Agreement more than
++    one year after the cause of action arose. Each party waives its rights to
++    a jury trial in any resulting litigation.
++
 +License: Apache-2.0
 +  On Debian GNU/Linux system you can find the complete text of the
 +  Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
 +
 +License: BSD-3-clause
 +    Redistribution and use in source and binary forms, with or without
 +    modification, are permitted provided that the following conditions
 +    are met:
 + .
 +    Redistributions of source code must retain the above copyright notice,
 +    this list of conditions and the following disclaimer. Redistributions in
 +    binary form must reproduce the above copyright notice, this list of
 +    conditions and the following disclaimer in the documentation and/or other
 +    materials provided with the distribution. The name of the author may not
 +    be used to endorse or promote products derived from this software without
 +    specific prior written permission.
 + .
 +    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 +    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 +    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 +    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 +    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 +    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 +    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 +    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 +    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 +    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 +
- License: LGPL-2.1+
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-  .
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-  .
-  On Debian systems the full license text of the GNU Lesser General Public
-  License 2.1 can be found in /usr/share/common-licenses/LGPL-2.1.
++License: IBM-License
++ (Looks like a BSD license)
++ The sample program(s) is/are owned by International Business Machines
++ Corporation or one of its subsidiaries ("IBM") and is/are copyrighted and
++ licensed, not sold.
++ .
++ You may copy, modify, and distribute this/these sample program(s) in any form
++ without payment to IBM, for any purpose including developing, using, marketing
++ or distributing programs that include or are derivative works of the sample
++ program(s).
++ .
++ The sample program(s) is/are provided to you on an "AS IS" basis, without
++ warranty of any kind.  IBM HEREBY EXPRESSLY DISCLAIMS ALL WARRANTIES, EITHER
++ EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  Some jurisdictions do
++ not allow for the exclusion or limitation of implied warranties, so the above
++ limitations or exclusions may not apply to you.  IBM shall not be liable for
++ any damages you suffer as a result of using, modifying or distributing the
++ sample program(s) or its/their derivatives.
++ .
++ Each copy of any portion of this/these sample program(s) or any derivative
++ work, must include the above copyright notice and disclaimer of warranty.
 +
diff --cc debian/git-transform.sh
index 4b6de2b,0000000..4b6de2b
mode 100755,000000..100644
--- a/debian/git-transform.sh
+++ b/debian/git-transform.sh
diff --cc debian/orig-tar.sh
index a8fdd07,0000000..bf78d35
mode 100755,000000..100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@@ -1,21 -1,0 +1,22 @@@
 +#!/bin/sh -e
 +
 +VERSION=$2
 +TAR=../bnd_$VERSION.orig.tar.gz
 +DIR=bnd-$VERSION
 +GIT_DIR=bnd-git
 +
++DATE=2011-11-04
 +git clone git://github.com/bndtools/bnd.git $GIT_DIR
 +(
 +  cd $GIT_DIR
-   git checkout "${VERSION}.REL"
++  git checkout `git rev-list -n 1 --before="$DATE" master`
 +)
 +
 +# Bnd git cleanup
 +chmod +x debian/git-transform.sh
 +debian/git-transform.sh $GIT_DIR $DIR
 +
 +tar -c -z -f $TAR $DIR
 +rm -rf $DIR
 +rm -rf $GIT_DIR
 +
diff --cc debian/patches/OSGi-6-methods.patch
index 0000000,0000000..0446117
new file mode 100644
--- /dev/null
+++ b/debian/patches/OSGi-6-methods.patch
@@@ -1,0 -1,0 +1,53 @@@
++From: Markus Koschany <apo at gambaru.de>
++Date: Fri, 5 Jun 2015 23:41:41 +0200
++Subject: OSGi 6 methods
++
++Fix FTBFS due to unimplemented methods.
++
++Forwarded: not-needed
++---
++ biz.aQute.launcher/src/aQute/launcher/minifw/Context.java       | 6 ++++++
++ biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java | 9 +++++++++
++ 2 files changed, 15 insertions(+)
++
++diff --git a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
++index a3d872a..07ac65e 100644
++--- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
+++++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
++@@ -357,4 +357,10 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu
++             java.util.Dictionary<java.lang.String,?> properties) {
++         throw new UnsupportedOperationException();
++     }
+++    public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
+++        return null;
+++    }
+++    public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) {
+++        return null;
+++    }
++ }
++diff --git a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
++index 8939ce6..50c4bd2 100644
++--- a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
+++++ b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
++@@ -27,6 +27,9 @@ public class MiniFramework implements Framework, Bundle, BundleContext {
++ 		state = Bundle.ACTIVE;
++ 	}
++ 
+++    public void init(FrameworkListener... listeners) throws BundleException {
+++    }
+++
++ 	public FrameworkEvent waitForStop(long timeout) throws InterruptedException {
++ 		long deadline = System.currentTimeMillis() + timeout;
++ 
++@@ -315,5 +318,11 @@ public class MiniFramework implements Framework, Bundle, BundleContext {
++             java.util.Dictionary<java.lang.String,?> properties) {
++         throw new UnsupportedOperationException();
++     }
+++    public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
+++        return null;
+++    }
++ 
+++    public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) {
+++        return null;
+++    }
++ }
diff --cc debian/patches/ant-1.9-compatibility.diff
index 0000000,0000000..4cf9ed2
new file mode 100644
--- /dev/null
+++ b/debian/patches/ant-1.9-compatibility.diff
@@@ -1,0 -1,0 +1,30 @@@
++Description: Ensures the source compatibility with Ant 1.9.
++ This patch can be removed when upgrading to bnd 2.x.
++Author: Emmanuel Bourg <ebourg at apache.org>
++Forwarded: not-needed
++--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
+++++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
++@@ -1373,7 +1373,7 @@
++ 	}
++ 
++ 	public boolean doWrap(File properties, File bundle, File output, File classpath[], int options,
++-			Map<String, String> additional) throws Exception {
+++			Map<String, Object> additional) throws Exception {
++ 		if (!bundle.exists()) {
++ 			error("No such file: " + bundle.getAbsolutePath());
++ 			return false;
++--- a/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java
+++++ b/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java
++@@ -1527,9 +1527,9 @@
++ 		return sb.toString();
++ 	}
++ 
++-	public void putAll(Map<String, String> additional, boolean force) {
++-		for (Iterator<Map.Entry<String, String>> i = additional.entrySet().iterator(); i.hasNext();) {
++-			Map.Entry<String, String> entry = i.next();
+++	public void putAll(Map<String, Object> additional, boolean force) {
+++		for (Iterator<Map.Entry<String, Object>> i = additional.entrySet().iterator(); i.hasNext();) {
+++			Map.Entry<String, Object> entry = i.next();
++ 			if (force || getProperties().get(entry.getKey()) == null)
++ 				setProperty((String) entry.getKey(), (String) entry.getValue());
++ 		}
diff --cc debian/patches/build_excludes.diff
index 0000000,0000000..f5e295b
new file mode 100644
--- /dev/null
+++ b/debian/patches/build_excludes.diff
@@@ -1,0 -1,0 +1,18 @@@
++Description: Add a way to exclude some source file from build using
++ javac.excludes property (used in debian/ant.properties)
++Author: Damien Raude-Morvan <drazzib at debian.org>
++Last-Update: 2011-10-26
++Forwarded: no
++Index: b/cnf/build.xml
++===================================================================
++--- a/cnf/build.xml
+++++ b/cnf/build.xml
++@@ -49,7 +49,7 @@
++ 	-->
++ 	<target name="compile" depends="dependencies" if="project.sourcepath">
++ 		<mkdir dir="${project.output}" />
++-		<javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}" classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true" listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no" verbose="${verbose}" />
+++		<javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}" classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true" listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no" verbose="${verbose}" excludes="${javac.excludes}" />
++ 		<!-- 
++ 		  The eclipse compiler copies resources but the Javac compiler does not
++ 		  If ${src} == ${bin} then this is not necessary, but unfortunately, now 
diff --cc debian/patches/display_bsn_on_missing_bundle.diff
index 0000000,0000000..f2b1716
new file mode 100644
--- /dev/null
+++ b/debian/patches/display_bsn_on_missing_bundle.diff
@@@ -1,0 -1,0 +1,29 @@@
++Description: Add a print to System.err when some bundle
++ is missing (will improve diagnostic when some symlink is broken).
++Author: Damien Raude-Morvan <drazzib at debian.org>
++Last-Update: 2012-01-17
++--- a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
+++++ b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
++@@ -977,8 +977,11 @@
++ 						File file = plugin.get(bsn, range, useStrategy, attrs);
++ 						// and the entry must exist
++ 						// if it does, return this as a result
++-						if (file != null)
+++						if (file != null) {
++ 							return toContainer(bsn, range, attrs, file);
+++						} else {
+++                            System.err.println("Missing: " + bsn + " " + range);
+++						}
++ 					}
++ 				}
++ 			}
++@@ -1002,6 +1005,9 @@
++ 					RepositoryPlugin repo = versions.get(provider);
++ 					String version = provider.toString();
++ 					File result = repo.get(bsn, version, Strategy.EXACT, attrs);
+++					if (result == null) {
+++                        System.err.println("Missing: " + bsn + " " + range);          
+++					}
++ 					return toContainer(bsn, version, attrs, result);
++ 				} else
++ 					error("Unexpected, found versions %s but then not provider for startegy %s?",
diff --cc debian/patches/find_swt_jar.diff
index 0000000,0000000..5a41f10
new file mode 100644
--- /dev/null
+++ b/debian/patches/find_swt_jar.diff
@@@ -1,0 -1,0 +1,21 @@@
++From: Jakub Adam <jakub.adam at ktknet.cz>
++Date: Mon, 30 Apr 2012 19:50:31 +0200
++Subject: find_swt_jar
++
++---
++ biz.aQute.bnd/bnd.bnd |    2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/biz.aQute.bnd/bnd.bnd b/biz.aQute.bnd/bnd.bnd
++index b15cd90..b54ed5c 100644
++--- a/biz.aQute.bnd/bnd.bnd
+++++ b/biz.aQute.bnd/bnd.bnd
++@@ -28,7 +28,7 @@ Bundle-License: 				http://www.opensource.org/licenses/apache2.0.php; \
++ 	org.eclipse.ui.editors,\
++ 	org.eclipse.ui.ide,\
++ 	org.eclipse.ui.workbench.texteditor,\
++-	org.eclipse.swt.carbon.macosx,\
+++	org.eclipse.swt,\
++ 	org.eclipse.core.jobs,\
++ 	org.eclipse.equinox.common,\
++ 	org.eclipse.equinox.registry,\
diff --cc debian/patches/fix-encoding.diff
index 0000000,0000000..35d0f25
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-encoding.diff
@@@ -1,0 -1,0 +1,13 @@@
++Description: Set the encoding of the source file to avoid compilation warnings/errors
++Author: Emmanuel Bourg <ebourg at apache.org>
++--- a/cnf/build.xml
+++++ b/cnf/build.xml
++@@ -49,7 +49,7 @@
++ 	-->
++ 	<target name="compile" depends="dependencies" if="project.sourcepath">
++ 		<mkdir dir="${project.output}" />
++-		<javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}" classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true" listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no" verbose="${verbose}" excludes="${javac.excludes}" />
+++		<javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}" classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true" listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no" verbose="${verbose}" excludes="${javac.excludes}" encoding="UTF-8"/>
++ 		<!-- 
++ 		  The eclipse compiler copies resources but the Javac compiler does not
++ 		  If ${src} == ${bin} then this is not necessary, but unfortunately, now 
diff --cc debian/patches/java8-compatibility.diff
index 0000000,0000000..1430776
new file mode 100644
--- /dev/null
+++ b/debian/patches/java8-compatibility.diff
@@@ -1,0 -1,0 +1,74 @@@
++Description: Fixes the compilation errors with Java 8
++Author: Emmanuel Bourg
++Forwarded: no
++--- a/biz.aQute.bndlib/src/aQute/bnd/signing/Signer.java
+++++ b/biz.aQute.bndlib/src/aQute/bnd/signing/Signer.java
++@@ -7,7 +7,7 @@
++ import java.util.jar.*;
++ import java.util.regex.*;
++ 
++-import aQute.lib.base64.*;
+++import aQute.lib.base64.Base64;
++ import aQute.lib.osgi.*;
++ 
++ /**
++--- a/biz.aQute.bndlib/src/aQute/lib/osgi/Jar.java
+++++ b/biz.aQute.bndlib/src/aQute/lib/osgi/Jar.java
++@@ -9,7 +9,7 @@
++ import java.util.regex.*;
++ import java.util.zip.*;
++ 
++-import aQute.lib.base64.*;
+++import aQute.lib.base64.Base64;
++ import aQute.libg.reporter.*;
++ 
++ public class Jar implements Closeable {
++--- a/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java
+++++ b/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java
++@@ -29,7 +29,7 @@
++ 
++ import aQute.bnd.annotation.*;
++ import aQute.bnd.service.*;
++-import aQute.lib.base64.*;
+++import aQute.lib.base64.Base64;
++ import aQute.lib.collections.*;
++ import aQute.lib.filter.*;
++ import aQute.lib.hex.*;
++--- a/aQute.libg/src/aQute/lib/collections/MultiMap.java
+++++ b/aQute.libg/src/aQute/lib/collections/MultiMap.java
++@@ -24,6 +24,7 @@
++ 		return set.addAll(value);
++ 	}
++ 	
+++/*
++ 	public boolean remove( K key, V value ) {
++ 		Set<V> set = get(key);
++ 		if ( set == null) {
++@@ -34,6 +35,7 @@
++ 			remove(key);
++ 		return result;
++ 	}
+++*/
++ 	
++ 	public boolean removeAll( K key, Collection<V> value ) {
++ 		Set<V> set = get(key);
++--- a/biz.aQute.junit/bnd.bnd
+++++ b/biz.aQute.junit/bnd.bnd
++@@ -7,7 +7,7 @@
++ Tester-Plugin: aQute.junit.plugin.ProjectTesterImpl
++ 
++ javac.source = 1.5
++-javac.target = jsr14
+++javac.target = 1.5
++ Private-Package: aQute.junit.*,\
++ 	junit.framework
++ Export-Package: junit.framework; version=3.8
++--- a/biz.aQute.launcher/bnd.bnd
+++++ b/biz.aQute.launcher/bnd.bnd
++@@ -11,4 +11,4 @@
++ 	
++ Bundle-Version: 1.0.0
++ javac.source = 1.5
++-javac.target = jsr14
++\ No newline at end of file
+++javac.target = 1.5
diff --cc debian/patches/no_ee_minimum.diff
index 0000000,0000000..95220a0
new file mode 100644
--- /dev/null
+++ b/debian/patches/no_ee_minimum.diff
@@@ -1,0 -1,0 +1,50 @@@
++Description: Don't request ee.minimum since we have a full
++ blown JVM.
++Author: Damien Raude-Morvan <drazzib at debian.org>
++Last-Update: 2011-10-26
++Forwarded: no
++Index: b/biz.aQute.bndlib/bnd.bnd
++===================================================================
++--- a/biz.aQute.bndlib/bnd.bnd
+++++ b/biz.aQute.bndlib/bnd.bnd
++@@ -34,7 +34,6 @@
++ 	osgi.cmpn;version=4.3,\
++ 	aQute.libg;version=project,\
++ 	osgi.core;version=4.1, \
++-	ee.j2se; version=1.5, \
++ 	org.osgi.impl.bundle.bindex
++ 
++ Bundle-Version: 1.49.0
++Index: b/biz.aQute.junit/bnd.bnd
++===================================================================
++--- a/biz.aQute.junit/bnd.bnd
+++++ b/biz.aQute.junit/bnd.bnd
++@@ -1,5 +1,4 @@
++ -buildpath: com.springsource.junit,\
++-	ee.minimum;version=1.2.1,\
++ 	osgi.cmpn;version=4.2.1,\
++ 	biz.aQute.bndlib;version=project,\
++ 	aQute.libg;version=project,\
++Index: b/demo/bnd.bnd
++===================================================================
++--- a/demo/bnd.bnd
+++++ b/demo/bnd.bnd
++@@ -2,9 +2,7 @@
++ Bundle-Activator: com.example.demo.Activator
++ Bundle-SymbolicName: demo
++ 
++--buildpath: osgi.core,\
++-	ee.minimum;version=1.2.1
++-	
+++-buildpath: osgi.core
++ 	
++ -testpath: \
++ 	biz.aQute.junit; version=snapshot
++@@ -25,7 +23,6 @@
++ 	*
++ 
++ -buildpath: osgi.core,\
++-	ee.minimum;version=1.2.1,\
++ 	junit.osgi
++ 	
++ javac.target=1.4
diff --cc debian/patches/no_felix.diff
index 0000000,0000000..7dca61d
new file mode 100644
--- /dev/null
+++ b/debian/patches/no_felix.diff
@@@ -1,0 -1,0 +1,20 @@@
++Description: Don't depends on felix for runtime
++ to break dependencies-cycles.
++Author: Damien Raude-Morvan <drazzib at debian.org>
++Last-Update: 2011-11-09
++Forwarded: no
++
++Index: b/demo/bnd.bnd
++===================================================================
++--- a/demo/bnd.bnd
+++++ b/demo/bnd.bnd
++@@ -11,9 +11,6 @@
++ 	org.eclipse.osgi, \
++ 	biz.aQute.launcher; version=snapshot
++  	
++--runbundles: org.apache.felix.scr,\
++-	org.apache.felix.configadmin
++-	
++ 
++ Bundle-Activator: test.TestActivator
++ Private-Package: test
diff --cc debian/patches/no_git_during_build.diff
index 0000000,0000000..1efe381
new file mode 100644
--- /dev/null
+++ b/debian/patches/no_git_during_build.diff
@@@ -1,0 -1,0 +1,19 @@@
++Description: Don't embed Git SHASUM in build MANIFEST.MF
++ since our tarball doesn't contains git metadata.
++Author: Damien Raude-Morvan <drazzib at debian.org>
++Last-Update: 2011-11-09
++Forwarded: no
++
++Index: b/cnf/build.bnd
++===================================================================
++--- a/cnf/build.bnd
+++++ b/cnf/build.bnd
++@@ -1,6 +1,6 @@
++ # We use git
++-Git-Descriptor: ${system;git describe --dirty --always}
++-Git-SHA: ${system;git rev-list -1 HEAD}
+++#Git-Descriptor: ${system;git describe --dirty --always}
+++#Git-SHA: ${system;git rev-list -1 HEAD}
++ 
++ Bundle-SCM				= git://github.com/bndtools/bnd.git
++ 
diff --cc debian/patches/osgi43_fixes.diff
index 0000000,0000000..ac1320a
new file mode 100644
--- /dev/null
+++ b/debian/patches/osgi43_fixes.diff
@@@ -1,0 -1,0 +1,88 @@@
++Description: Implements some missing methods for OSGi R4.3
++Author: Damien Raude-Morvan <drazzib at debian.org>
++Last-Update: 2011-11-09
++Forwarded: no
++
++Index: b/biz.aQute.launcher/src/aQute/launcher/Launcher.java
++===================================================================
++--- a/biz.aQute.launcher/src/aQute/launcher/Launcher.java
+++++ b/biz.aQute.launcher/src/aQute/launcher/Launcher.java
++@@ -458,7 +458,7 @@
++ 			Class<?> clazz = loader.loadClass(implementation);
++ 			FrameworkFactory factory = (FrameworkFactory) clazz.newInstance();
++ 			trace("Framework factory %s", factory);
++-			systemBundle = factory.newFramework(p);
+++			systemBundle = factory.newFramework((java.util.Map)p);
++ 			trace("framework instance %s", systemBundle);
++ 		} else {
++ 			trace("using embedded mini framework because we were told not to use META-INF/services");
++Index: b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
++===================================================================
++--- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
+++++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
++@@ -331,4 +331,30 @@
++     public String toString() {
++         return id + " " + location;
++     }
+++
+++    public <A> A adapt(java.lang.Class<A> type) {
+++        return null;
+++    }
+++
+++    public int compareTo(Bundle bundle) {
+++        return 0;
+++    }
+++
+++    public Bundle getBundle(java.lang.String location) {
+++        return null;
+++    }
+++    
+++    public <S> ServiceReference<S> getServiceReference(java.lang.Class<S> clazz) {
+++        return null;
+++    }
+++
+++    public <S> java.util.Collection<ServiceReference<S>> getServiceReferences(java.lang.Class<S> clazz, String filter)
+++            throws InvalidSyntaxException {
+++        return null;
+++    }
+++    
+++    public <S> ServiceRegistration<S> registerService(java.lang.Class<S> clazz, S service,
+++            java.util.Dictionary<java.lang.String,?> properties) {
+++        throw new UnsupportedOperationException();
+++    }
++ }
++Index: b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
++===================================================================
++--- a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
+++++ b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
++@@ -290,4 +290,30 @@
++ 			throw new ClassNotFoundException(name);
++ 		}
++ 	}
+++	
+++    public <A> A adapt(java.lang.Class<A> type) {
+++        return null;
+++    }
+++
+++    public int compareTo(Bundle bundle) {
+++        return 0;
+++    }
+++
+++    public Bundle getBundle(java.lang.String location) {
+++        return null;
+++    }
+++    public <S> ServiceReference<S> getServiceReference(java.lang.Class<S> clazz) {
+++        return null;
+++    }
+++
+++    public <S> java.util.Collection<ServiceReference<S>> getServiceReferences(java.lang.Class<S> clazz, String filter)
+++            throws InvalidSyntaxException {
+++        return null;
+++    }
+++    
+++    public <S> ServiceRegistration<S> registerService(java.lang.Class<S> clazz, S service,
+++            java.util.Dictionary<java.lang.String,?> properties) {
+++        throw new UnsupportedOperationException();
+++    }
+++
++ }
diff --cc debian/patches/series
index 2184749,0000000..bb4cf9c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,0 +1,11 @@@
- no_ee_minimum.patch
- display_bsn_on_missing_bundle.patch
- no-ee.j2se.patch
- findbugs.patch
- embedded-repo.patch
- FTBFS.patch
- implement-missing-methods.patch
- build-without-biz.aQute.repository-and-resolve.patch
- no-osgi.r5.patch
++build_excludes.diff
++no_ee_minimum.diff
++no_felix.diff
++no_git_during_build.diff
++osgi43_fixes.diff
++display_bsn_on_missing_bundle.diff
++find_swt_jar.diff
++fix-encoding.diff
++ant-1.9-compatibility.diff
++java8-compatibility.diff
++OSGi-6-methods.patch
diff --cc debian/pom-annotation.xml
index e17c606,0000000..5a41b93
mode 100644,000000..100644
--- a/debian/pom-annotation.xml
+++ b/debian/pom-annotation.xml
@@@ -1,23 -1,0 +1,35 @@@
- <project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-   xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
-   <modelVersion>4.0.0</modelVersion>
-   
-   <parent>
-     <groupId>biz.aQute.bnd</groupId>
-     <artifactId>parent</artifactId>
-     <version>2.1.0</version>
-   </parent>
++<project xmlns='http://maven.apache.org/POM/4.0.0'
++xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
++xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
 +
++  <modelVersion>4.0.0</modelVersion>
++  <groupId>biz.aQute</groupId>
 +  <artifactId>annotation</artifactId>
++  <version>1.50.0</version>
 +  <name>bnd Annotations Library</name>
 +  <description>The annotations for bnd.</description>
- 
++  <url>http://www.aQute.biz/Code/Bnd</url>
++  <scm>
++    <url>git://github.com/bndtools/bnd.git</url>
++    <connection>scm:git:git://github.com/bndtools/bnd.git</connection>
++  </scm>
++  <organization>
++    <name>aQute SARL</name>
++    <url>http://www.aQute.biz</url>
++  </organization>
++  <developers>
++    <developer>
++      <id>Peter.Kriens at aQute.biz</id>
++      <name>Peter.Kriens</name>
++      <email>Peter.Kriens at aQute.biz</email>
++      <organization>aQute</organization>
++    </developer>
++  </developers>
 +  <licenses>
 +    <license>
 +      <name>Apache Software License 2.0</name>
 +      <url>http://www.opensource.org/licenses/apache2.0.php</url>
 +      <distribution>repo</distribution>
 +    </license>
 +  </licenses>
- 
 +</project>
diff --cc debian/pom-bnd.xml
index bf9ba61,0000000..89b03c1
mode 100644,000000..100644
--- a/debian/pom-bnd.xml
+++ b/debian/pom-bnd.xml
@@@ -1,45 -1,0 +1,34 @@@
- <project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' 
-   xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
++<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
 +  <modelVersion>4.0.0</modelVersion>
- 
-   <parent>
-     <groupId>biz.aQute.bnd</groupId>
-     <artifactId>parent</artifactId>
-     <version>2.1.0</version>
-   </parent>
- 
++  <groupId>biz.aQute</groupId>
 +  <artifactId>bnd</artifactId>
++  <version>1.50.0</version>
++  <packaging>jar</packaging>
++  <description>A utility and plugin to wrap, build, or print bundles</description>
 +  <name>aQute Bundle Tool</name>
-   <description>
-     A command line utility and Ant plugin to wrap, build, or examine bundles.
-   </description>
- 
++  <url>http://www.aQute.biz/Code/Bnd</url>
++  <scm>
++    <url>https://github.com/bndtools/bnd</url>
++    <connection>scm:git:git://github.com/bndtools/bnd.git</connection>
++  </scm>
++  <organization>
++    <name>aQute SARL</name>
++    <url>http://www.aQute.biz</url>
++  </organization>
++  <developers>
++    <developer>
++      <name>Peter Kriens</name>
++      <email>peter.kriens at aqute.biz</email>
++      <roles>
++        <role>Primary Developer</role>
++      </roles>
++    </developer>
++  </developers>
 +  <licenses>
 +    <license>
-       <name>All files contained in this JAR are licensed under the Apache 2.0 license, unless noted differently in their source (see swing2swt).</name>
-       <url>http://www.opensource.org/licenses/apache2.0.php</url>
-       <distribution>repo</distribution>
++    <name>All files contained in this JAR are licensed under the Apache 2.0 license, unless noted differently in their source (see swing2swt).</name>
++    <url>http://www.opensource.org/licenses/apache2.0.php</url>
++    <distribution>repo</distribution>
 +    </license>
 +  </licenses>
- 
-   <dependencies>
-     <dependency>
-       <groupId>ant</groupId>
-       <artifactId>ant</artifactId>
-       <version>1.6.5</version>
-       <optional>true</optional>
-     </dependency>
-     <dependency>
-       <groupId>org.osgi</groupId>
-       <artifactId>org.osgi.core</artifactId>
-       <version>4.2.0</version>
-     </dependency>
-     <dependency>
-       <groupId>junit</groupId>
-       <artifactId>junit</artifactId>
-       <version>3.8.2</version>
-       <optional>true</optional>
-     </dependency>
-   </dependencies>
- 
 +</project>
diff --cc debian/pom-bndlib.xml
index 0a83023,0000000..7ab4513
mode 100644,000000..100644
--- a/debian/pom-bndlib.xml
+++ b/debian/pom-bndlib.xml
@@@ -1,40 -1,0 +1,64 @@@
- <project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' 
-   xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
-   <modelVersion>4.0.0</modelVersion>
- 
-   <parent>
-     <groupId>biz.aQute.bnd</groupId>
-     <artifactId>parent</artifactId>
-     <version>2.1.0</version>
-   </parent>
 +
++<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
++  <modelVersion>4.0.0</modelVersion>
++  <groupId>biz.aQute</groupId>
 +  <artifactId>bndlib</artifactId>
-   <name>A Swiss Army Knife for OSGi</name>
++  <version>1.50.0</version>
 +  <description>
-     The bndlib project is a general library to be used with OSGi bundles. It contains
-     lots of cool functionality that calculates dependencies, etc.
++    A Swiss Army Knife for OSGi
 +  </description>
- 
++  <name>
++    bnd - Bundle Tool
++  </name>
++  <url>
++    http://www.aQute.biz/Code/Bnd
++  </url>
++  <scm>
++    <url>
++      git://github.com/bndtools/bnd.git
++    </url>
++    <connection>
++      git://github.com/bndtools/bnd.git
++    </connection>
++    <developerConnection>
++      git://github.com/bndtools/bnd.git
++    </developerConnection>
++  </scm>
++  <organization>
++    <name>
++      aQute SARL
++    </name>
++    <url>
++      http://www.aQute.biz
++    </url>
++  </organization>
++  <developers>
++    <developer>
++      <id>
++        Peter.Kriens at aQute.biz
++      </id>
++      <name>
++        Peter.Kriens
++      </name>
++      <email>
++        Peter.Kriens at aQute.biz
++      </email>
++      <organization>
++        aQute
++      </organization>
++    </developer>
++  </developers>
 +  <licenses>
 +    <license>
-       <name>Apache Software License 2.0</name>
-       <url>http://www.opensource.org/licenses/apache2.0.php</url>
-       <distribution>repo</distribution>
++      <name>
++        Apache Software License 2.0
++      </name>
++      <url>
++        http://www.opensource.org/licenses/apache2.0.php
++      </url>
++      <distribution>
++        repo
++      </distribution>
 +    </license>
 +  </licenses>
- 
-   <dependencies>
-     <dependency>
-       <groupId>org.osgi</groupId>
-       <artifactId>org.osgi.core</artifactId>
-       <version>4.2.0</version>
-     </dependency>
-     <dependency>
-       <groupId>junit</groupId>
-       <artifactId>junit</artifactId>
-       <version>3.8.2</version>
-       <optional>true</optional>
-     </dependency>
-   </dependencies>
- 
 +</project>
diff --cc debian/rules
index 46882c7,0000000..b869dc1
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,140 -1,0 +1,128 @@@
 +#!/usr/bin/make -f
 +
 +include /usr/share/cdbs/1/rules/debhelper.mk
 +include /usr/share/cdbs/1/class/ant.mk
 +
 +MAVEN_REPO           := http://repo1.maven.org/maven2/biz/aQute/
- MAVEN_VERSION        := 2.1.0
++MAVEN_VERSION        := 1.50.0
 +
 +PACKAGE              := $(DEB_SOURCE_PACKAGE)
 +VERSION              := $(DEB_UPSTREAM_VERSION)
 +JAVA_HOME            := /usr/lib/jvm/default-java
 +DEB_JARS             := ant-nodeps ant junit
 +DEB_ANT_BUILD_TARGET := build
 +
 +### Bootstrap build
 +pre-build:: debian/stamp-bootstrap
 +bootstrap: debian/stamp-bootstrap
 +debian/stamp-bootstrap: DEB_BUILDDIR=$(CURDIR)
 +debian/stamp-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
 +debian/stamp-bootstrap:
 +	$(DEB_ANT_INVOKE)
 +	mkdir -p cnf/repo/biz.aQute.bnd/ \
 +		cnf/repo/com.springsource.junit/ \
 +		cnf/repo/org.eclipse.osgi \
 +		cnf/repo/osgi.core \
 +		cnf/repo/osgi.cmpn \
 +		cnf/repo/ee.minimum \
 +		cnf/repo/junit.osgi \
 +		cnf/repo/org.apache.tools.ant \
 +		cnf/repo/org.eclipse.core.runtime \
 +		cnf/repo/org.eclipse.core.resources \
 +		cnf/repo/org.eclipse.core.commands \
 +		cnf/repo/org.eclipse.jdt.core \
 +		cnf/repo/org.eclipse.jdt.ui \
 +		cnf/repo/org.eclipse.jdt.debug.ui \
 +		cnf/repo/org.eclipse.jdt.junit \
 +		cnf/repo/org.eclipse.jdt.launching \
 +		cnf/repo/org.eclipse.jface \
 +		cnf/repo/org.eclipse.jface.text \
 +		cnf/repo/org.eclipse.swt \
 +		cnf/repo/org.eclipse.debug.ui \
 +		cnf/repo/org.eclipse.debug.core \
 +		cnf/repo/org.eclipse.equinox.common \
 +		cnf/repo/org.eclipse.equinox.registry \
 +		cnf/repo/org.eclipse.ui \
 +		cnf/repo/org.eclipse.ui.editors \
 +		cnf/repo/org.eclipse.ui.workbench \
 +		cnf/repo/org.eclipse.ui.workbench.texteditor \
 +		cnf/repo/org.eclipse.ui.ide \
 +		cnf/repo/org.eclipse.core.jobs \
 +		cnf/repo/org.eclipse.text \
 +		cnf/repo/org.osgi.impl.bundle.bindex
 +	ln -s $(CURDIR)/bootstrap/bnd.jar cnf/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar
 +	ln -s /usr/share/java/junit.jar cnf/repo/com.springsource.junit/com.springsource.junit-3.8.2.jar
- 	ln -s /usr/share/java/junit4.jar cnf/repo/com.springsource.org.junit/com.springsource.org.junit-4.10.0.jar
 +	ln -s /usr/share/java/junit.jar cnf/repo/junit.osgi/junit.osgi-3.8.2.jar
 +	ln -s /usr/share/java/osgi.core.jar cnf/repo/org.eclipse.osgi/org.eclipse.osgi-3.5.0.jar
 +	ln -s /usr/share/java/osgi.core.jar cnf/repo/osgi.core/osgi.core-4.2.1.jar
 +	ln -s /usr/share/java/osgi.compendium.jar cnf/repo/osgi.cmpn/osgi.cmpn-4.3.0.jar
 +#	ln -s /usr/share/java/ee.foundation.jar cnf/repo/ee.minimum/ee.minimum-1.2.1.jar
 +	ln -s /usr/share/java/ant.jar cnf/repo/org.apache.tools.ant/org.apache.tools.ant-1.7.1.jar
- 	ln -s /usr/share/java/ant-contrib.jar cnf/ant-contrib/ant-contrib-1.0b3.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar cnf/repo/org.eclipse.core.runtime/org.eclipse.core.runtime-3.3.100.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar cnf/repo/org.eclipse.core.resources/org.eclipse.core.resources-3.3.1.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar cnf/repo/org.eclipse.core.commands/org.eclipse.core.commands-3.3.3.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.jdt.core_*.jar cnf/repo/org.eclipse.jdt.core/org.eclipse.jdt.core-3.3.3.jar
 +	ln -s /usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar cnf/repo/org.eclipse.jdt.ui/org.eclipse.jdt.ui-3.3.3.jar
 +	ln -s /usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar cnf/repo/org.eclipse.jdt.debug.ui/org.eclipse.jdt.debug.ui-3.2.102.jar
 +	ln -s /usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit_*.jar cnf/repo/org.eclipse.jdt.junit/org.eclipse.jdt.junit-3.3.3.jar
 +	ln -s /usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.launching_*.jar cnf/repo/org.eclipse.jdt.launching/org.eclipse.jdt.launching-3.3.3.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.jface_*.jar cnf/repo/org.eclipse.jface/org.eclipse.jface-3.3.2.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.jface.text_*.jar cnf/repo/org.eclipse.jface.text/org.eclipse.jface.text-3.3.2.jar
 +	ln -s /usr/lib/java/swt-gtk-*.jar cnf/repo/org.eclipse.swt/org.eclipse.swt-3.3.2.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.debug.ui_*.jar cnf/repo/org.eclipse.debug.ui/org.eclipse.debug.ui-3.3.2.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.debug.core_*.jar cnf/repo/org.eclipse.debug.core/org.eclipse.debug.core-3.3.2.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.equinox.common_*.jar cnf/repo/org.eclipse.equinox.common/org.eclipse.equinox.common-3.3.0.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.equinox.registry_*.jar cnf/repo/org.eclipse.equinox.registry/org.eclipse.equinox.registry-3.3.0.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui_*.jar cnf/repo/org.eclipse.ui/org.eclipse.ui-3.3.2.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.editors_*.jar cnf/repo/org.eclipse.ui.editors/org.eclipse.ui.editors-3.3.2.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.workbench_*.jar cnf/repo/org.eclipse.ui.workbench/org.eclipse.ui.workbench-3.3.2.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar cnf/repo/org.eclipse.ui.workbench.texteditor/org.eclipse.ui.workbench.texteditor-3.3.2.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.ide_*.jar cnf/repo/org.eclipse.ui.ide/org.eclipse.ui.ide-3.3.2.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar cnf/repo/org.eclipse.core.jobs/org.eclipse.core.jobs-3.3.1.jar
 +	ln -s /usr/lib/eclipse/plugins/org.eclipse.text_*.jar cnf/repo/org.eclipse.text/org.eclipse.text-3.5.100.jar
 +	ln -s /usr/share/java/bindex.jar cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar
 +	touch $@
 +clean-bootstrap: DEB_BUILDDIR=$(CURDIR)
 +clean-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
 +clean-bootstrap:
 +	$(DEB_ANT_INVOKE) clean
 +	rm -rf cnf/repo/biz.aQute.bnd/
- 	rm -rf biz.aQute.repository
- 	rm -rf biz.aQute.resolve
 +	rm -f debian/stamp-bootstrap
 +
 +### Standard build
 +install/$(PACKAGE)::
 +	pod2man -c 'BND for Debian GNU/Linux' \
 +	  -r $(PACKAGE)-$(VERSION) \
 +	  debian/bnd.pod > debian/bnd.1
 +
 +binary-post-install/$(PACKAGE)::
 +	mkdir install/
- 	cp biz.aQute.launcher/generated/biz.aQute.launcher.jar install/bnd.launcher.jar
- 	cp biz.aQute.junit/generated/biz.aQute.junit.jar install/bnd.junit.jar
++	cp biz.aQute.launcher/tmp/biz.aQute.launcher.jar install/bnd.launcher.jar
++	cp biz.aQute.junit/tmp/biz.aQute.junit.jar install/bnd.junit.jar
 +	mh_installpoms -p$(PACKAGE) -e$(VERSION)
- 	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bndlib.xml --usj-name=bndlib         biz.aQute.bndlib/generated/biz.aQute.bndlib.jar
- 	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bnd.xml --usj-name=bnd            biz.aQute.bnd/generated/biz.aQute.bnd.jar
- 	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-annotation.xml --usj-name=bnd.annotation biz.aQute.bnd/generated/biz.aQute.bnd.annotation.jar
++	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bndlib.xml     --usj-name=bndlib         biz.aQute.bndlib/tmp/biz.aQute.bndlib.jar
++	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-bnd.xml        --usj-name=bnd            biz.aQute.bnd/tmp/biz.aQute.bnd.jar
++	mh_installjar -p$(PACKAGE) -e$(VERSION) -l debian/pom-annotation.xml --usj-name=bnd.annotation biz.aQute.bnd/tmp/biz.aQute.bnd.annotation.jar
 +	jh_installlibs -p$(PACKAGE) install/bnd.launcher.jar
 +	jh_installlibs -p$(PACKAGE) install/bnd.junit.jar
 +	dh_install -p$(PACKAGE) debian/bnd.sh /usr/bin/
 +	mv $(DEB_DESTDIR)/usr/bin/bnd.sh $(DEB_DESTDIR)/usr/bin/bnd
 +
 +clean::
 +	-rm -f debian/stamp-bootstrap
- 	-rm -rf biz.aQute.repository
- 	-rm -rf biz.aQute.resolve
- 	-rm -rf biz.aQute.bndlib/bin
- 	-rm -rf biz.aQute.bndlib/generated
- 	-rm -rf biz.aQute.junit/generated
- 	-rm -rf biz.aQute.launcher/bin
- 	-rm -rf biz.aQute.launcher/generated
- 	-find . -type l -name '*.jar' -delete
- 	-find . -type f \( -name '*.jar' -o -name '*.class' -o -name 'packageinfo' \) -delete
++	-find -type l -name '*.jar' | xargs rm
 +	jh_clean
 +	mh_clean
 +	-rm -rf install/
 +	-rm -f debian/bnd.1
 +	-rm -Rf bootstrap
 +
 +get-orig-source:
 +	debian/orig-tar.sh "" $(VERSION)
 +
 +get-orig-pom:
- 	wget --user-agent="" -O debian/pom-bnd.xml $(MAVEN_REPO)/bnd/bnd/$(MAVEN_VERSION)/bnd-$(MAVEN_VERSION).pom
- 	wget --user-agent="" -O debian/pom-bndlib.xml $(MAVEN_REPO)/bnd/bndlib/$(MAVEN_VERSION)/bndlib-$(MAVEN_VERSION).pom
- 	wget --user-agent="" -O debian/pom-annotation.xml $(MAVEN_REPO)/bnd/annotation/$(MAVEN_VERSION)/annotation-$(MAVEN_VERSION).pom
++	wget --user-agent="" -O debian/pom-bnd.xml $(MAVEN_REPO)/bnd/$(MAVEN_VERSION)/bnd-$(MAVEN_VERSION).pom 
++	wget --user-agent="" -O debian/pom-bndlib.xml $(MAVEN_REPO)/bndlib/$(MAVEN_VERSION)/bndlib-$(MAVEN_VERSION).pom 
++	wget --user-agent="" -O debian/pom-annotation.xml $(MAVEN_REPO)/annotation/$(MAVEN_VERSION)/annotation-$(MAVEN_VERSION).pom 
 +
 +.PHONY: bootstrap clean-bootstrap

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



More information about the pkg-java-commits mailing list