This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bnd.
commit e635961d57f4da1fb0a714240799152109f239b3 Merge: 7c176b9 28681c5 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 16 10:25:11 2015 +0100 Merge tag 'upstream/2.2.0' aQute.libg/.classpath | 3 +- .../src/aQute/lib/collections/SortedList.java | 130 ++- aQute.libg/src/aQute/lib/data/Data.java | 108 +- aQute.libg/src/aQute/lib/getopt/CommandLine.java | 172 ++- .../src/aQute/lib/getopt/CommandLineMessages.java | 2 +- aQute.libg/src/aQute/lib/index/Index.java | 1 + aQute.libg/src/aQute/lib/io/IO.java | 57 +- aQute.libg/src/aQute/lib/json/ArrayHandler.java | 10 + aQute.libg/src/aQute/lib/json/JSONCodec.java | 14 +- .../src/aQute/lib/markdown/MarkdownFormatter.java | 62 ++ aQute.libg/src/aQute/lib/strings/Strings.java | 60 ++ .../src/aQute/lib/strings}/packageinfo | 0 aQute.libg/src/aQute/libg/command/Command.java | 3 +- aQute.libg/src/aQute/libg/cryptography/SHA1.java | 2 +- aQute.libg/src/aQute/libg/cryptography/SHA256.java | 2 +- .../src/aQute/libg/qtokens/QuotedTokenizer.java | 25 +- .../src/aQute/libg/reporter/ReporterAdapter.java | 14 + .../src/aQute/libg/reporter/ReporterMessages.java | 13 + aQute.libg/src/aQute/libg/reporter/packageinfo | 2 +- .../src/aQute/service/reporter/Messages.java | 6 +- aQute.libg/src/aQute/service/reporter/Report.java | 2 + .../src/aQute/service/reporter/Reporter.java | 10 + aQute.libg/src/aQute/service/reporter/packageinfo | 2 +- aQute.libg/src/test/JustifTest.java | 25 - .../aQute/lib/collections/CollectionsTest.java | 94 ++ .../aQute/lib/converter}/ConverterTest.java | 24 +- aQute.libg/test/aQute/lib/filter/FilterTest.java | 25 + .../aQute/lib/getopt}/CommandTest.java | 64 +- .../{src/test => test/aQute/lib/hex}/HexTest.java | 3 +- .../test => test/aQute/lib/index}/TestIndex.java | 3 +- .../test => test/aQute/lib/json}/JSONTest.java | 35 +- aQute.libg/test/aQute/lib/justif/JustifTest.java | 29 + .../lib/putjar}/TestDirectoryInputStream.java | 2 +- .../aQute/lib/settings}/SettingsTest.java | 3 +- .../test => test/aQute/libg/cafs}/TestCAFS.java | 8 +- .../{src/test => test/aQute/libg}/cafs/file1-1.txt | 0 .../{src/test => test/aQute/libg}/cafs/file1.txt | 0 .../{src/test => test/aQute/libg}/cafs/file2.txt | 0 .../aQute/libg/command}/ExecuteTest.java | 3 +- .../aQute/libg/forker}/TestForker.java | 3 +- .../test => test/aQute/libg/glob}/GlobTest.java | 3 +- .../aQute/libg/gzip}/TestGzipUtils.java | 15 +- .../test => test/aQute/libg/gzip}/unzipped.dat | 0 .../{src/test => test/aQute/libg/gzip}/zipped.dat | Bin .../aQute/libg/sax}/TestSAXFilters.java | 3 +- .../test => test/aQute/libg/sed}/ReplacerTest.java | 14 +- .../aQute/libg/tarjan}/TestTarjan.java | 3 +- biz.aQute.bnd/.classpath | 3 +- biz.aQute.bnd/bnd.bnd | 4 +- .../src/aQute/bnd/ant/ConsoleProgress.java | 21 + .../src/aQute/bnd/ant/ExpandPropertiesTask.java | 21 +- biz.aQute.bnd/src/aQute/bnd/ant/PackageTask.java | 2 + biz.aQute.bnd/src/aQute/bnd/ant/PrepareTask.java | 5 +- .../aQute/bnd/ant/RunconfigToDistributionTask.java | 177 ++++ biz.aQute.bnd/src/aQute/bnd/ant/taskdef.properties | 3 +- .../src/aQute/bnd/main/BaselineCommands.java | 14 +- biz.aQute.bnd/src/aQute/bnd/main/PatchCommand.java | 4 +- .../src/aQute/bnd/main/bnd-completion.bash | 41 + biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 409 ++++---- .../test => test/aQute/bnd/main}/TestBuild.java | 3 +- biz.aQute.bndlib.tests/src/a/A.java | 5 + biz.aQute.bndlib.tests/src/a/B.java | 5 + .../src/aQute/bnd/build/defaults.bnd | 5 + biz.aQute.bndlib.tests/src/test/AnalyzerTest.java | 2 +- biz.aQute.bndlib.tests/src/test/BuilderTest.java | 187 ++-- .../src/test/ClassParserTest.java | 4 +- biz.aQute.bndlib.tests/src/test/ClazzTest.java | 17 + biz.aQute.bndlib.tests/src/test/ContractTest.java | 187 ++++ .../src/test/CorruptManifest.java | 4 +- biz.aQute.bndlib.tests/src/test/JarSignerTest.java | 10 +- biz.aQute.bndlib.tests/src/test/JarTest.java | 27 +- biz.aQute.bndlib.tests/src/test/LauncherTest.java | 194 +++- biz.aQute.bndlib.tests/src/test/LocationTest.java | 58 + biz.aQute.bndlib.tests/src/test/MacroTest.java | 163 ++- biz.aQute.bndlib.tests/src/test/MavenTest.java | 16 +- biz.aQute.bndlib.tests/src/test/PackTest.java | 18 - .../src/test/ParseHeaderTest.java | 53 +- biz.aQute.bndlib.tests/src/test/ProjectTest.java | 223 ++-- biz.aQute.bndlib.tests/src/test/ResourcesTest.java | 117 ++- biz.aQute.bndlib.tests/src/test/TestSelfBuild.java | 3 +- biz.aQute.bndlib.tests/src/test/VerifierTest.java | 46 + .../src/test/WorkspaceRepositoryTest.java | 2 +- biz.aQute.bndlib.tests/src/test/WorkspaceTest.java | 13 +- .../src/test/baseline/BaselineTest.java | 277 ++++- .../src/test/component/BNDAnnotationTest.java | 144 ++- .../src/test/component/ComponentTest.java | 4 +- .../src/test/component/DSAnnotationTest.java | 52 + .../src/test/deployer/FileRepoTest.java | 8 +- biz.aQute.bndlib.tests/src/test/diff/DiffTest.java | 73 +- .../src/test/diff/inherit/A.java | 10 + .../src/test/diff/inherit/B.java | 7 + .../src/test/diff/inherit/I.java | 6 + .../src/test/metatype/MetatypeTest.java | 44 + .../test/package_info_versioniskey/Whatever.java | 5 + .../src/test/package_info_versioniskey/packageinfo | 5 + .../src/test/packageinfo/packageinfo | 2 +- .../{test => testresources}/a space/cnf/build.bnd | 0 .../a space/cnf/ext/defaults.bnd | 0 .../{test => testresources}/a space/test/bnd.bnd | 0 .../a space/test/src/test/placeholder | 0 .../{test => testresources}/beasymock.bar | Bin .../{test => testresources}/eclipse/bnd.index | 0 .../eclipse/plugins/beasymock.bar | Bin .../{test => testresources}/keystore | Bin .../activation/1.0.2/activation-1.0.2.pom | 0 .../activation/1.0.2/activation-1.0.2.pom.sha1 | 0 .../aQute/bndlib/0.0.145/bndlib-0.0.145.jar.sha1 | 0 .../biz/aQute/bndlib/0.0.145/bndlib-0.0.145.pom | 0 .../aQute/bndlib/0.0.145/bndlib-0.0.145.pom.sha1 | 0 .../biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom | 0 .../aQute/bndlib/0.0.203/bndlib-0.0.203.pom.sha1 | 0 .../aQute/bndlib/0.0.227/bndlib-0.0.227.jar.sha1 | 0 .../biz/aQute/bndlib/0.0.227/bndlib-0.0.227.pom | 0 .../aQute/bndlib/0.0.227/bndlib-0.0.227.pom.sha1 | 0 .../aQute/bndlib/0.0.236/bndlib-0.0.236.jar.sha1 | 0 .../biz/aQute/bndlib/0.0.236/bndlib-0.0.236.pom | 0 .../aQute/bndlib/0.0.238/bndlib-0.0.238.jar.sha1 | 0 .../biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom | 0 .../aQute/bndlib/0.0.238/bndlib-0.0.238.pom.sha1 | 0 .../aQute/bndlib/0.0.255/bndlib-0.0.255.jar.sha1 | 0 .../biz/aQute/bndlib/0.0.255/bndlib-0.0.255.pom | 0 .../aQute/bndlib/0.0.255/bndlib-0.0.255.pom.sha1 | 0 .../dom4j/dom4j/1.6.1/dom4j-1.6.1.jar.sha1 | 0 .../maven-repo/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom | 0 .../dom4j/dom4j/1.6.1/dom4j-1.6.1.pom.sha1 | 0 .../junit/junit/3.8.1/junit-3.8.1.jar.sha1 | 0 .../maven-repo/junit/junit/3.8.1/junit-3.8.1.pom | 0 .../junit/junit/3.8.1/junit-3.8.1.pom.sha1 | 0 .../maven-repo/junit/junit/3.8/junit-3.8.pom | 0 .../maven-repo/junit/junit/3.8/junit-3.8.pom.sha1 | 0 .../maven-repo/junit/junit/4.4/junit-4.4.jar.sha1 | 0 .../maven-repo/junit/junit/4.4/junit-4.4.pom | 0 .../maven-repo/junit/junit/4.4/junit-4.4.pom.sha1 | 0 .../1.0.0/javax.servlet-1.0.0.jar.sha1 | 0 .../javax.servlet/1.0.0/javax.servlet-1.0.0.pom | 0 .../1.0.0/javax.servlet-1.0.0.pom.sha1 | 0 .../1.0.0/maven-obr-plugin-1.0.0.jar.sha1 | 0 .../1.0.0/maven-obr-plugin-1.0.0.pom | 0 .../1.0.0/maven-obr-plugin-1.0.0.pom.sha1 | 0 .../1.0.8/maven-scr-plugin-1.0.8.jar.sha1 | 0 .../1.0.8/maven-scr-plugin-1.0.8.pom | 0 .../1.0.8/maven-scr-plugin-1.0.8.pom.sha1 | 0 .../maven-scr-plugin/maven-metadata-central.xml | 0 .../maven-metadata-central.xml.sha1 | 0 .../0.9.0-SNAPSHOT/maven-metadata-local.xml | 0 ...org.apache.felix.fileinstall-0.9.0-SNAPSHOT.pom | 0 .../maven-metadata-local.xml | 0 .../1.1.0-SNAPSHOT/maven-metadata-local.xml | 0 .../org.apache.felix.framework-1.1.0-SNAPSHOT.pom | 0 .../maven-metadata-local.xml | 0 .../1.0.0/org.osgi.compendium-1.0.0.jar.sha1 | 0 .../1.0.0/org.osgi.compendium-1.0.0.pom | 0 .../1.0.0/org.osgi.compendium-1.0.0.pom.sha1 | 0 .../1.0.0/org.osgi.core-1.0.0.jar.md5 | 0 .../org.osgi.core/1.0.0/org.osgi.core-1.0.0.pom | 0 .../1.0.0/org.osgi.core-1.0.0.pom.md5 | 0 .../org.osgi.core-1.1.0-20070713.230200-1.pom | 0 .../org.osgi.core-1.1.0-20070713.230200-1.pom.sha1 | 0 .../maven-metadata-apache.snapshots.xml | 0 .../maven-metadata-apache.snapshots.xml.sha1 | 0 .../org.osgi.core-1.1.0-20070713.230200-1.jar.sha1 | 0 .../org.osgi.core-1.1.0-20070713.230200-1.pom | 0 .../org.osgi.core-1.1.0-20070713.230200-1.pom.sha1 | 0 .../org.osgi.core-1.1.0-SNAPSHOT.pom | 0 .../1.0.0/org.osgi.foundation-1.0.0.jar.sha1 | 0 .../1.0.0/org.osgi.foundation-1.0.0.pom | 0 .../1.0.0/org.osgi.foundation-1.0.0.pom.sha1 | 0 .../1.0.0/org.osgi.service.obr-1.0.0.jar.md5 | 0 .../1.0.0/org.osgi.service.obr-1.0.0.pom | 0 .../1.0.0/org.osgi.service.obr-1.0.0.pom.md5 | 0 .../1.0.1/org.osgi.service.obr-1.0.1.jar.sha1 | 0 .../1.0.1/org.osgi.service.obr-1.0.1.pom | 0 .../1.0.1/org.osgi.service.obr-1.0.1.pom.sha1 | 0 .../redirectws/bnd/build.bnd | 0 .../redirectws/bnd/ext/test.bnd | 0 .../{test => testresources}/redirectws/wss/ws/cnf | 0 .../w o r k s p a c e/cnf/build.bnd | 0 .../w o r k s p a c e/cnf/ext/extension.bnd | 0 .../w o r k s p a c e/p r o j e c t/bnd.bnd | 0 .../testresources/ws-defaulting/cnf/build.bnd | 5 + .../testresources/ws-defaulting/p1/bnd.bnd | 1 + .../testresources/ws-location/cnf/build.bnd | 8 + .../testresources/ws-location/p1/bnd.bnd | 8 + .../testresources/ws-location/p1/i1.bnd | 5 + .../testresources/ws-location/p1/i2.bnd | 3 + .../ws-location/p1/src/bar/packageinfo | 2 + .../ws-location/p1/src/foo/package-info.java | 7 + .../testresources/ws-location/p1/sub1.bnd | 5 + .../testresources/ws-location/p1/sub2.bnd | 4 + .../ws-repo-test/cnf/build.bnd | 0 .../cnf/repo/libtest/libtest-1.0.0.lib | 0 .../ws-repo-test/p1/bnd.bnd | 0 .../ws-repo-test/p1/p1a.bndrun | 0 .../ws-repo-test/p1/p1b.bndrun | 0 .../ws-repo-test/p2/Resources/more/resource6.txt | 0 .../ws-repo-test/p2/Resources/more/resource7.txt | 0 .../ws-repo-test/p2/Resources/more/resource8.res | 0 .../ws-repo-test/p2/Resources/resource1.res | 0 .../ws-repo-test/p2/Resources/resource2.res | 0 .../ws-repo-test/p2/Resources/resource3.txt | 0 .../ws-repo-test/p2/Resources/resource4.txt | 0 .../ws-repo-test/p2/Resources/resource5.asc | 0 .../ws-repo-test/p2/Resources/stuff/resource9.res | 0 .../ws-repo-test/p2/Resources/text.txt | 0 .../ws-repo-test/p2/bnd.bnd | 0 .../ws-repo-test/p3/bnd.bnd | 0 .../ws-repo-test/p4-sub/a.bnd | 0 .../ws-repo-test/p4-sub/b.bnd | 0 .../ws-repo-test/p4-sub/bnd.bnd | 0 .../ws-repo-test/p4-sub/c.bnd | 0 .../ws-repo-test/p5/bnd.bnd | 0 .../{test => testresources}/ws/bug194/bnd.bnd | 0 .../{test => testresources}/ws/build-all/bnd.bnd | 0 .../ws/bump-included/bnd.bnd | 0 .../ws/bump-included/include.txt | 0 .../{test => testresources}/ws/bump-sub/a.bnd | 0 .../{test => testresources}/ws/bump-sub/b.bnd | 0 .../{test => testresources}/ws/bump-sub/bnd.bnd | 0 .../{test => testresources}/ws/cnf/build.bnd | 0 .../ws/cnf/repo/libtest/libtest-1.0.0.lib | 0 .../{test => testresources}/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 .../ws/maven1/maven-dependencies.txt | 0 .../{test => testresources}/ws/maven1/mvndeploy | 0 .../ws/maven1/parentpom.xml | 0 .../{test => testresources}/ws/maven1/pom.xml | 0 .../ws/maven1/testparentpom.xml | 0 .../{test => testresources}/ws/maven1/testpom.xml | 0 .../{test => testresources}/ws/maven2/bnd.bnd | 0 .../ws/maven2/parentpom.xml | 0 .../{test => testresources}/ws/maven2/pom.xml | 0 .../ws/p-maven-remote/bnd.bnd | 0 .../{test => testresources}/ws/p-stale-dep/bnd.bnd | 0 .../{test => testresources}/ws/p-stale/bnd.bnd | 0 .../{test => testresources}/ws/p1/bnd.bnd | 0 .../{test => testresources}/ws/p1/p1a.bndrun | 0 .../{test => testresources}/ws/p1/p1b.bndrun | 0 .../ws/p2/Resources/more/resource6.txt | 0 .../ws/p2/Resources/more/resource7.txt | 0 .../ws/p2/Resources/more/resource8.res | 0 .../ws/p2/Resources/resource1.res | 0 .../ws/p2/Resources/resource2.res | 0 .../ws/p2/Resources/resource3.txt | 0 .../ws/p2/Resources/resource4.txt | 0 .../ws/p2/Resources/resource5.asc | 0 .../ws/p2/Resources/stuff/resource9.res | 0 .../ws/p2/Resources/text.txt | 0 .../{test => testresources}/ws/p2/bnd.bnd | 0 .../{test => testresources}/ws/p3/bnd.bnd | 0 .../{test => testresources}/ws/p4-sub/a.bnd | 0 .../{test => testresources}/ws/p4-sub/b.bnd | 0 .../{test => testresources}/ws/p4-sub/bnd.bnd | 0 .../{test => testresources}/ws/p4-sub/c.bnd | 0 .../{test => testresources}/ws/p5/bnd.bnd | 0 .../{test => testresources}/ws/p5/src/pkg1/.keep | 0 .../ws/p5/src/pkg2/package-info.java | 0 .../ws/p5/src/pkg3/package-info.java | 0 .../ws/p5/src/pkg4/package-info.java | 0 .../ws/p5/src/pkg5/package-info.java | 0 .../ws/p5/src/pkg5/packageinfo | 0 .../ws/p5/src/pkg6/package-info.java | 0 .../ws/p5/src/pkg6/packageinfo | 0 .../ws/p5/src/pkg7/package-info.java | 0 biz.aQute.bndlib.tests/testresources/ws/p6/bnd.bnd | 3 + biz.aQute.bndlib/.classpath | 3 +- biz.aQute.bndlib/bnd.bnd | 2 +- .../src/aQute/bnd/annotation/metatype/packageinfo | 2 +- .../src/aQute/bnd/annotation/packageinfo | 2 +- .../src/aQute/bnd/build/ErrorDetails.java | 6 + biz.aQute.bndlib/src/aQute/bnd/build/Project.java | 165 ++- .../src/aQute/bnd/build/ProjectBuilder.java | 343 +++++- .../src/aQute/bnd/build/ProjectLauncher.java | 34 +- .../src/aQute/bnd/build/Workspace.java | 65 +- .../src/aQute/bnd/build}/defaults.bnd | 2 + .../src/aQute/bnd/build/model/BndEditModel.java | 52 +- .../model/conversions/ClauseListConverter.java | 3 + .../bnd/build/model/conversions/EEConverter.java | 2 + .../model/conversions/HeaderClauseConverter.java | 2 + .../model/conversions/PropertiesConverter.java | 2 + .../conversions/RequirementListConverter.java | 2 + .../model/conversions/SimpleListConverter.java | 5 +- .../model/conversions/StringEntryConverter.java | 2 + .../conversions/VersionedClauseConverter.java | 2 + biz.aQute.bndlib/src/aQute/bnd/build/packageinfo | 2 +- .../src/aQute/bnd/component/ComponentDef.java | 4 + .../src/aQute/bnd/component/HeaderReader.java | 6 + .../src/aQute/bnd/differ/Baseline.java | 51 +- .../src/aQute/bnd/differ/DiffPluginImpl.java | 63 +- biz.aQute.bndlib/src/aQute/bnd/differ/Element.java | 11 +- .../src/aQute/bnd/differ/JavaElement.java | 24 +- biz.aQute.bndlib/src/aQute/bnd/header/Attrs.java | 47 +- .../src/aQute/bnd/header/OSGiHeader.java | 4 +- .../src/aQute/bnd/header/Parameters.java | 3 +- biz.aQute.bndlib/src/aQute/bnd/header/packageinfo | 2 +- biz.aQute.bndlib/src/aQute/bnd/help/Syntax.java | 255 +++-- .../aQute/bnd/make/component/ServiceComponent.java | 9 +- .../aQute/bnd/make/metatype/MetaTypeReader.java | 39 + .../src/aQute/bnd/maven/MavenCommand.java | 9 +- .../src/aQute/bnd/obr/OBRFragment.java | 200 ++-- biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java | 213 +++- biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java | 155 ++- biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java | 27 +- .../src/aQute/bnd/osgi/CommandResource.java | 42 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Constants.java | 32 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Contracts.java | 191 ++++ .../src/aQute/bnd/osgi/Descriptors.java | 2 - .../src/aQute/bnd/osgi/FileResource.java | 41 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java | 43 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java | 25 +- .../src/aQute/bnd/osgi/OSInformation.java | 157 +++ biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java | 383 +++++-- biz.aQute.bndlib/src/aQute/bnd/osgi/Verifier.java | 186 +++- biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info | 1 - biz.aQute.bndlib/src/aQute/bnd/osgi/packageinfo | 2 +- .../src/aQute/bnd/osgi/resource/CapReqBuilder.java | 14 + .../bnd/service/RepositoryListenerPlugin.java | 25 + biz.aQute.bndlib/src/aQute/bnd/service/packageinfo | 2 +- .../aQute/bnd/service/progress/ProgressPlugin.java | 49 + .../src/aQute/bnd/service/progress}/packageinfo | 0 .../src/aQute/bnd/service/repository/Phase.java | 28 + .../bnd/service/repository/RepositoryDigest.java | 5 + .../service/repository/SearchableRepository.java | 122 +++ .../src/aQute/bnd/service/repository/packageinfo | 2 +- .../bnd/service/resolve/hook/ResolverHook.java | 24 + .../src/aQute/bnd/version/VersionRange.java | 28 + biz.aQute.jpm/.classpath | 2 +- biz.aQute.jpm/bnd.bnd | 19 +- biz.aQute.jpm/daemon.bnd | 2 +- biz.aQute.jpm/run.bnd | 12 +- biz.aQute.jpm/src/aQute/jpm/lib/ArtifactData.java | 24 +- biz.aQute.jpm/src/aQute/jpm/lib/CommandData.java | 24 +- .../src/aQute/jpm/lib/DependencyCollector.java | 66 ++ .../aQute/jpm/lib/JustAnotherPackageManager.java | 1108 +++++++++++++------- biz.aQute.jpm/src/aQute/jpm/lib/Service.java | 7 +- biz.aQute.jpm/src/aQute/jpm/main/Main.java | 1035 ++++++++++++------ biz.aQute.jpm/src/aQute/jpm/platform/Linux.java | 18 +- biz.aQute.jpm/src/aQute/jpm/platform/MacOS.java | 8 +- biz.aQute.jpm/src/aQute/jpm/platform/Platform.java | 84 +- biz.aQute.jpm/src/aQute/jpm/platform/Unix.java | 29 +- biz.aQute.jpm/src/aQute/jpm/platform/Windows.java | 12 +- .../src/aQute/jpm/platform/macos/command.sh | 2 +- .../src/aQute/jpm/platform/unix/command.sh | 2 +- .../aQute/jpm/platform/unix/jpm-completion.bash | 72 ++ .../src/aQute/jpm/platform/unix/launch.sh | 3 +- .../src/aQute/jpm/platform/windows/command.sh | 2 +- .../src/aQute/jpm/service/ServiceMain.java | 3 +- biz.aQute.jpm/static/jpm_prefix.md | 78 ++ biz.aQute.jpm/test/aQute/jpm/main/JPMTest.java | 157 +++ biz.aQute.jpm/test/test/JPMTest.java | 98 -- biz.aQute.junit/.classpath | 3 +- biz.aQute.junit/src/aQute/junit/Tee.java | 10 +- biz.aQute.launcher/.classpath | 3 +- biz.aQute.launcher/bnd.bnd | 4 +- .../src/aQute/launcher/Launcher.java | 352 +++++-- .../src/aQute/launcher/agent/LauncherAgent.java | 14 + .../launcher/constants/LauncherConstants.java | 4 + .../aQute/launcher/embedded/EmbeddedLauncher.java | 67 ++ .../aQute/launcher/plugin/ProjectLauncherImpl.java | 100 +- .../src/test/ProjectLaunchImplTest.java | 43 - .../aQute/launcher/minifw}/MiniFrameworkTest.java | 6 +- .../launcher/plugin/ProjectLaunchImplTest.java | 59 ++ biz.aQute.launcher/{src => }/test/ws/cnf/build.bnd | 0 biz.aQute.launcher/{src => }/test/ws/p1/bnd.bnd | 2 +- biz.aQute.repository/.classpath | 3 +- biz.aQute.repository/bnd.bnd | 1 + .../bnd/deployer/http/DefaultURLConnector.java | 29 +- .../deployer/repository/AbstractIndexedRepo.java | 24 +- .../repository/CachingUriResourceHandle.java | 21 +- .../bnd/deployer/repository/LocalIndexedRepo.java | 23 + .../repository/ProgressWrappingStream.java | 48 + biz.aQute.repository/src/test/AllTests.java | 32 - .../test/repository/FailingGeneratingProvider.java | 2 +- .../src/test/repository/NonGeneratingProvider.java | 2 +- .../bnd/deployer}/http/HttpConnectorTest.java | 4 +- .../aQute/bnd/deployer}/obr/OBRTest.java | 4 +- .../repository}/CachingUriResourceHandlerTest.java | 10 +- .../deployer/repository}/FindProvidersTest.java | 3 +- .../repository/TestCompressedObrRepo.java | 3 +- .../deployer}/repository/TestFixedIndexedRepo.java | 4 +- .../repository/TestLocalIndexGeneration.java | 7 +- .../deployer}/repository/TestLocalIndexedRepo.java | 3 +- .../repository/TestLocalObrGeneration.java | 3 +- .../TestMultipleLocalIndexGeneration.java | 3 +- .../bnd/deployer}/repository/TestObrRepo.java | 3 +- .../providers}/TestAttributeTypeParsing.java | 3 +- .../providers}/TestObrCapReqParsing.java | 3 +- .../repository/providers}/TestObrRecognition.java | 3 +- .../repository/providers}/TestR5Recognition.java | 3 +- biz.aQute.resolve/.classpath | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 24 +- .../.settings/org.eclipse.jdt.ui.prefs | 114 +- biz.aQute.resolve/bnd.bnd | 3 +- .../src/biz/aQute/resolve/ResolutionCallback.java | 11 + .../src/biz/aQute/resolve/ResolveProcess.java | 180 ++-- .../resolve/internal/BndrunResolveContext.java | 360 ++++++- .../src/biz/aQute/resolve/packageinfo | 2 +- .../internal}/BndrunResolveContextTest.java | 135 ++- .../biz/aQute/resolve/internal/ResolveTest.java | 79 ++ biz.aQute.resolve/testdata/repo4/index.xml | 206 ++++ bnd-maven-plugin/.project | 17 + build.xml | 56 +- {aQute.libg => cnf}/.classpath | 2 +- cnf/.project | 6 + cnf/build-template.xml | 218 ++++ cnf/build.bnd | 137 +-- cnf/build.properties | 3 + cnf/build.xml | 445 ++++---- cnf/ext/pluginpaths.bnd | 1 + cnf/ext/repositories.bnd | 6 + cnf/findbugs.include.xml | 33 + cnf/releaserepo/index.xml | 2 + cnf/releaserepo/repository.xml | 4 - demo/bnd.bnd | 10 +- demo/src/test/TestActivator.java | 88 +- dist/src/.empty | 0 dist/test/.empty | 0 448 files changed, 9931 insertions(+), 3029 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
