This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bnd.
commit f7578b60837775a2b35fb9ba561bdb2b12da7a24 Merge: 0fc440e eee8800 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 16 12:18:59 2015 +0100 Merge tag 'upstream/2.3.0' Upstream version 2.3.0 .gradle-wrapper/gradle-wrapper.properties | 6 + BUILDING-GRADLE.md | 1 + README => README.md | 2 +- aQute.libg/bnd.bnd | 5 +- aQute.libg/build.xml | 4 - aQute.libg/src/aQute/lib/collections/MultiMap.java | 15 +- aQute.libg/src/aQute/lib/collections/packageinfo | 2 +- .../aQute/lib/consoleapp/AbstractConsoleApp.java | 163 + aQute.libg/src/aQute/lib/converter/Converter.java | 2 +- aQute.libg/src/aQute/lib/env/Env.java | 322 + aQute.libg/src/aQute/lib/env/Header.java | 395 ++ .../src/aQute/lib/env/Props.java | 119 +- .../src/aQute/lib/env/Selector.java | 32 +- .../src/aQute/lib/env/Sieve.java | 102 +- aQute.libg/src/aQute/lib/filter/Filter.java | 22 + aQute.libg/src/aQute/lib/filter/packageinfo | 2 +- aQute.libg/src/aQute/lib/getopt/CommandLine.java | 27 +- aQute.libg/src/aQute/lib/hex/Hex.java | 9 +- aQute.libg/src/aQute/lib/hex/packageinfo | 2 +- aQute.libg/src/aQute/lib/io/IO.java | 43 +- aQute.libg/src/aQute/lib/io/IOConstants.java | 5 + .../src/aQute/lib/io/LimitedInputStream.java | 3 +- aQute.libg/src/aQute/lib/io/packageinfo | 2 +- aQute.libg/src/aQute/lib/json/JSONCodec.java | 29 +- aQute.libg/src/aQute/lib/json/MapHandler.java | 42 +- aQute.libg/src/aQute/lib/json/ObjectHandler.java | 6 +- aQute.libg/src/aQute/lib/justif/Justif.java | 124 +- aQute.libg/src/aQute/lib/justif/Table.java | 42 + aQute.libg/src/aQute/lib/justif/packageinfo | 2 +- .../src/aQute/lib/persistentmap/PersistentMap.java | 211 + aQute.libg/src/aQute/lib/persistentmap/packageinfo | 1 + .../src/aQute/lib/properties/PropertiesParser.java | 256 + .../src/aQute/lib/putjar/DirectoryInputStream.java | 5 +- aQute.libg/src/aQute/lib/strings/Strings.java | 4 + aQute.libg/src/aQute/lib/strings/packageinfo | 2 +- aQute.libg/src/aQute/lib/tag/Tag.java | 26 +- aQute.libg/src/aQute/lib/tag/packageinfo | 2 +- aQute.libg/src/aQute/libg/forker/Forker.java | 2 +- aQute.libg/src/aQute/libg/glob/Glob.java | 55 +- aQute.libg/src/aQute/libg/glob/packageinfo | 2 +- aQute.libg/src/aQute/libg/sed/ReplacerAdapter.java | 195 +- aQute.libg/src/aQute/libg/sed/Sed.java | 42 +- aQute.libg/src/aQute/libg/sed/packageinfo | 2 +- .../test/aQute/lib/converter/ConverterTest.java | 96 +- aQute.libg/test/aQute/lib/index/TestIndex.java | 4 + aQute.libg/test/aQute/lib/json/JSONTest.java | 68 +- aQute.libg/test/aQute/lib/justif/JustifTest.java | 19 + .../aQute/lib/persistentmap/PersistentMapTest.java | 72 + .../aQute/lib/properties/PropertiesParserTest.java | 32 + aQute.libg/test/aQute/libg/gzip/TestGzipUtils.java | 12 +- aQute.libg/test/aQute/libg/sed/ReplacerTest.java | 11 + .../aQute/libg/gzip => testresources}/unzipped.dat | 0 .../aQute/libg/gzip => testresources}/zipped.dat | Bin {dist => biz.aQute.bnd.doc}/.classpath | 4 +- {bnd-maven-plugin => biz.aQute.bnd.doc}/.project | 10 +- .../.settings/org.eclipse.jdt.core.prefs | 1 - biz.aQute.bnd.doc/bnd.bnd | 9 + biz.aQute.bnd.doc/docs/bndoc.bndoc | 17 + biz.aQute.bnd.doc/docs/src/en/100-front-matter.md | 14 + biz.aQute.bnd.doc/docs/src/en/110-introduction.md | 66 + biz.aQute.bnd.doc/docs/src/en/120-install.md | 36 + biz.aQute.bnd.doc/docs/src/en/130-quick-start.md | 43 + biz.aQute.bnd.doc/docs/src/en/140-overview.md | 1 + biz.aQute.bnd.doc/docs/src/en/150-projects.md | 134 + biz.aQute.bnd.doc/docs/src/en/160-jars.md | 1 + biz.aQute.bnd.doc/docs/src/en/170-versioning.md | 179 + biz.aQute.bnd.doc/docs/src/en/200-components.md | 244 + biz.aQute.bnd.doc/docs/src/en/210-metatype.md | 225 + biz.aQute.bnd.doc/docs/src/en/220-contracts.md | 1 + biz.aQute.bnd.doc/docs/src/en/300-launching.md | 10 + biz.aQute.bnd.doc/docs/src/en/310-testing.md | 62 + .../docs/src/en/320-error-handling.md | 1 + biz.aQute.bnd.doc/docs/src/en/400-commandline.md | 73 + biz.aQute.bnd.doc/docs/src/en/500-ant.md | 32 + biz.aQute.bnd.doc/docs/src/en/510-maven.md | 22 + biz.aQute.bnd.doc/docs/src/en/520-gradle.md | 1 + biz.aQute.bnd.doc/docs/src/en/570-bndtools.md | 1 + biz.aQute.bnd.doc/docs/src/en/600-plugins.md | 162 + biz.aQute.bnd.doc/docs/src/en/700-wrapping.md | 74 + biz.aQute.bnd.doc/docs/src/en/800-instructions.md | 238 + biz.aQute.bnd.doc/docs/src/en/810-macros.md | 292 + biz.aQute.bnd.doc/docs/src/en/850-api.md | 28 + biz.aQute.bnd.doc/docs/src/en/850-contributing.md | 13 + biz.aQute.bnd.doc/docs/src/en/900-errors.md | 1 + biz.aQute.bnd.doc/docs/src/en/910-faq.md | 140 + biz.aQute.bnd.doc/docs/src/styles/bootstrap.css | 6805 ++++++++++++++++++++ biz.aQute.bnd.doc/docs/templates/inner.htm | 3 + biz.aQute.bnd.doc/docs/templates/outer.htm | 28 + biz.aQute.bnd.doc/readme.md | 0 biz.aQute.bnd.doc/src/bnd/en/100-front-matter.md | 4 + biz.aQute.bnd.doc/src/bnd/en/110-introduction.md | 66 + biz.aQute.bnd.doc/src/bnd/en/120-install.md | 36 + biz.aQute.bnd.doc/src/bnd/en/130-quick-start.md | 43 + biz.aQute.bnd.doc/src/bnd/en/140-overview.md | 1 + biz.aQute.bnd.doc/src/bnd/en/150-projects.md | 172 + biz.aQute.bnd.doc/src/bnd/en/160-jars.md | 1 + biz.aQute.bnd.doc/src/bnd/en/170-versioning.md | 179 + biz.aQute.bnd.doc/src/bnd/en/200-components.md | 244 + biz.aQute.bnd.doc/src/bnd/en/210-metatype.md | 225 + biz.aQute.bnd.doc/src/bnd/en/220-contracts.md | 1 + biz.aQute.bnd.doc/src/bnd/en/300-launching.md | 10 + biz.aQute.bnd.doc/src/bnd/en/310-testing.md | 62 + biz.aQute.bnd.doc/src/bnd/en/320-error-handling.md | 1 + biz.aQute.bnd.doc/src/bnd/en/400-commandline.md | 73 + biz.aQute.bnd.doc/src/bnd/en/500-ant.md | 32 + biz.aQute.bnd.doc/src/bnd/en/510-maven.md | 22 + biz.aQute.bnd.doc/src/bnd/en/520-gradle.md | 1 + biz.aQute.bnd.doc/src/bnd/en/570-bndtools.md | 1 + biz.aQute.bnd.doc/src/bnd/en/600-plugins.md | 162 + biz.aQute.bnd.doc/src/bnd/en/700-wrapping.md | 74 + biz.aQute.bnd.doc/src/bnd/en/800-instructions.md | 238 + biz.aQute.bnd.doc/src/bnd/en/810-macros.md | 292 + biz.aQute.bnd.doc/src/bnd/en/850-api.md | 28 + biz.aQute.bnd.doc/src/bnd/en/850-contributing.md | 13 + biz.aQute.bnd.doc/src/bnd/en/900-errors.md | 1 + biz.aQute.bnd.doc/src/bnd/en/910-faq.md | 140 + biz.aQute.bnd/bnd.bnd | 6 +- biz.aQute.bnd/build.xml | 4 - biz.aQute.bnd/src/aQute/bnd/ant/BaseTask.java | 20 +- .../src/aQute/bnd/ant/ConsoleProgress.java | 4 +- biz.aQute.bnd/src/aQute/bnd/ant/PackageTask.java | 37 +- biz.aQute.bnd/src/aQute/bnd/ant/PrepareTask.java | 27 +- .../src/aQute/bnd/ant/ProjectBuildOrderTask.java | 121 +- .../aQute/bnd/ant/RunconfigToDistributionTask.java | 27 +- biz.aQute.bnd/src/aQute/bnd/ant/TestTask.java | 7 +- biz.aQute.bnd/src/aQute/bnd/ant/WrapTask.java | 4 +- .../src/aQute/bnd/ext/test/TestExtension.java | 19 + .../src/aQute/bnd/main/BaselineCommands.java | 108 +- biz.aQute.bnd/src/aQute/bnd/main/BndMessages.java | 4 + biz.aQute.bnd/src/aQute/bnd/main/DiffCommand.java | 69 +- biz.aQute.bnd/src/aQute/bnd/main/PatchCommand.java | 4 +- biz.aQute.bnd/src/aQute/bnd/main/RepoCommand.java | 85 +- biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 786 ++- biz.aQute.bnd/testextension.bnd | 2 + biz.aQute.bndlib.tests/bnd.bnd | 8 +- biz.aQute.bndlib.tests/build.gradle | 1 + biz.aQute.bndlib.tests/build.xml | 4 - biz.aQute.bndlib.tests/compilerversions/compile.sh | 53 +- .../compilerversions/compilerversions.bnd | 1 + .../compilerversions/src/eclipse_1_7/ClassRef.java | 13 + .../compilerversions/src/sun_1_7/ClassRef.java | 13 + .../compilerversions/src/sun_1_8/ClassRef.java | 13 + .../jar/BugReproLoggerGroovy189.jclass | Bin 0 -> 6140 bytes .../jar/BugReproLoggerGroovy210.jclass | Bin 0 -> 5296 bytes .../src/aQute/bnd/build/defaults.bnd | 9 +- .../src/aQute/bnd/testing/DSTestWiringTest.java | 94 + .../osgi/annotation/versioning/ConsumerType.java | 56 + .../osgi/annotation/versioning/ProviderType.java | 55 + .../org/osgi/annotation/versioning/Version.java | 47 + .../osgi/annotation/versioning/package-info.java | 30 + .../src/org/osgi/annotation/versioning/packageinfo | 4 + biz.aQute.bndlib.tests/src/test/AnalyzerTest.java | 21 + .../src/test/AnnotationsTest.java | 4 +- .../src/test/AttributesTest.java | 1 + biz.aQute.bndlib.tests/src/test/AttrsTest.java | 56 + biz.aQute.bndlib.tests/src/test/BuilderTest.java | 220 +- biz.aQute.bndlib.tests/src/test/CalltreeTest.java | 1 + .../src/test/ClassParserTest.java | 26 +- .../src/test/ClassReferenceTest.java | 101 +- biz.aQute.bndlib.tests/src/test/ClasspathTest.java | 1 + biz.aQute.bndlib.tests/src/test/ClazzTest.java | 44 + biz.aQute.bndlib.tests/src/test/ContractTest.java | 17 +- .../src/test/CorruptManifest.java | 1 + biz.aQute.bndlib.tests/src/test/EcjTest.java | 26 + .../src/test/ExportHeaderTest.java | 3 +- .../src/test/ExtensionsTest.java | 28 + .../src/test/IncludeHeaderTest.java | 1 + biz.aQute.bndlib.tests/src/test/InlineTest.java | 1 + biz.aQute.bndlib.tests/src/test/JarSignerTest.java | 1 + biz.aQute.bndlib.tests/src/test/JarTest.java | 21 +- biz.aQute.bndlib.tests/src/test/LauncherTest.java | 44 +- biz.aQute.bndlib.tests/src/test/MacroTest.java | 61 +- biz.aQute.bndlib.tests/src/test/MakeTest.java | 2 +- biz.aQute.bndlib.tests/src/test/ManifestTest.java | 23 + biz.aQute.bndlib.tests/src/test/MavenTest.java | 1 + biz.aQute.bndlib.tests/src/test/MergeTest.java | 1 + .../src/test/ParseHeaderTest.java | 79 +- biz.aQute.bndlib.tests/src/test/PluginTest.java | 5 +- .../src/test/PreprocessTest.java | 104 + biz.aQute.bndlib.tests/src/test/ProcessorTest.java | 105 + biz.aQute.bndlib.tests/src/test/ProjectTest.java | 565 +- .../src/test/PropertiesTest.java | 1 + .../src/test/ResourceRepoTest.java | 286 + biz.aQute.bndlib.tests/src/test/ResourcesTest.java | 10 +- biz.aQute.bndlib.tests/src/test/TestBndBook.java | 1 + biz.aQute.bndlib.tests/src/test/TestSelfBuild.java | 2 +- biz.aQute.bndlib.tests/src/test/UsesTest.java | 1 + biz.aQute.bndlib.tests/src/test/VerifierTest.java | 122 +- .../src/test/VersionPolicyTest.java | 1 + .../src/test/WorkspaceRepositoryTest.java | 28 + .../annotationheaders/AnnotationHeadersTest.java | 162 + .../src/test/annotationheaders/package-info.java | 3 + .../src/test/annotationheaders/packageinfo | 1 + biz.aQute.bndlib.tests/src/test/api/Interf.java | 19 + .../src/test/api/package-info.java | 5 + .../src/test/baseline/BaselineTest.java | 30 +- .../src/test/bndmodel/BndModelTest.java | 47 + .../src/test/builder-preprocess.txt | 3 + .../src/test/builder-preprocess.txt2 | 3 + .../src/test/component/BNDAnnotationTest.java | 8 +- .../src/test/component/ComponentOrderingTest.java | 1 + .../src/test/component/ComponentTest.java | 6 +- .../src/test/component/DSAnnotationTest.java | 25 +- .../src/test/deployer/FileRepoTest.java | 113 +- biz.aQute.bndlib.tests/src/test/diff/DiffTest.java | 72 + .../src/test/diff/inherit/A.java | 3 +- biz.aQute.bndlib.tests/src/test/lib/NanoHTTPD.java | 10 +- biz.aQute.bndlib.tests/src/test/make/MD5.java | 4 +- .../src/test/metatype/MetatypeTest.java | 1 + .../src/test/packageinfo/both_no_version/X.java | 5 + .../packageinfo/both_no_version/package-info.java | 2 + .../test/packageinfo/both_no_version/packageinfo | 1 + .../src/test/packageinfo/packageinfo | 2 +- .../src/test/properties/PropertiesTest.java | 12 +- .../src/test/uses/order/UsesOrderingTest.java | 1 + .../test/version/annotations/bnd/package-info.java | 6 + .../version/annotations/osgi/package-info.java | 5 + .../src/test/versionpolicy/api/package-info.java | 2 +- .../testresources/TestWeavingHook.jclass | Bin 0 -> 744 bytes .../testresources/a space/cnf/ext/defaults.bnd | 12 +- .../testresources/ws-extensions/about.md | 3 + .../testresources/ws-extensions/cnf/build.bnd | 1 + .../testresources/ws-extensions/cnf/repo.json | 5 + biz.aQute.bndlib/bnd.bnd | 14 +- biz.aQute.bndlib/build.xml | 4 - biz.aQute.bndlib/{README => readme.md} | 1 + .../src/aQute/bnd/annotation/headers/About.java | 69 + .../bnd/annotation/headers/BundleCategory.java | 31 + .../bnd/annotation/headers/BundleContributors.java | 66 + .../bnd/annotation/headers/BundleCopyright.java | 16 + .../bnd/annotation/headers/BundleDevelopers.java | 68 + .../aQute/bnd/annotation/headers/BundleDocURL.java | 19 + .../bnd/annotation/headers/BundleLicense.java | 86 + .../src/aQute/bnd/annotation/headers/Category.java | 54 + .../bnd/annotation/headers/ProvideCapability.java | 74 + .../bnd/annotation/headers/RequireCapability.java | 54 + .../aQute/bnd/annotation/headers/Resolution.java | 8 + .../src/aQute/bnd/annotation/headers}/packageinfo | 1 + .../src/aQute/bnd/annotation/licenses/ASL_2_0.java | 12 + .../bnd/annotation/licenses/BSD_2_Clause.java | 10 + .../bnd/annotation/licenses/BSD_3_Clause.java | 11 + .../aQute/bnd/annotation/licenses/CDDL_1_0.java | 12 + .../src/aQute/bnd/annotation/licenses/CPL_1_0.java | 12 + .../src/aQute/bnd/annotation/licenses/EPL_1_0.java | 11 + .../src/aQute/bnd/annotation/licenses/GPL_2_0.java | 11 + .../src/aQute/bnd/annotation/licenses/GPL_3_0.java | 11 + .../aQute/bnd/annotation/licenses/LGPL_2_1.java | 13 + .../src/aQute/bnd/annotation/licenses/MIT_1_0.java | 10 + .../src/aQute/bnd/annotation/licenses/MPL_2_0.java | 10 + .../src/aQute/bnd/annotation/licenses}/packageinfo | 1 + .../src/aQute/bnd/annotation/metatype/packageinfo | 2 +- .../src/aQute/bnd/build/Container.java | 41 + .../src/aQute/bnd/build/DownloadBlocker.java | 15 +- .../src/aQute/bnd/build/JUnitLauncher.java | 102 + biz.aQute.bndlib/src/aQute/bnd/build/Project.java | 478 +- .../src/aQute/bnd/build/ProjectBuilder.java | 139 +- .../src/aQute/bnd/build/ProjectLauncher.java | 53 +- .../src/aQute/bnd/build/ProjectTester.java | 5 + biz.aQute.bndlib/src/aQute/bnd/build/Run.java | 19 + .../src/aQute/bnd/build/Workspace.java | 227 +- .../src/aQute/bnd/build/WorkspaceRepository.java | 2 +- biz.aQute.bndlib/src/aQute/bnd/build/defaults.bnd | 14 +- .../src/aQute/bnd/build/model/BndEditModel.java | 65 +- biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java | 2 +- .../model/conversions/CollectionFormatter.java | 19 +- .../src/aQute/bnd/build/model/packageinfo | 2 +- biz.aQute.bndlib/src/aQute/bnd/build/packageinfo | 2 +- .../src/aQute/bnd/component/AnnotationReader.java | 16 +- .../src/aQute/bnd/component/DSAnnotations.java | 7 +- .../src/aQute/bnd/component/HeaderReader.java | 2 +- .../src/aQute/bnd/component/TagResource.java | 2 +- .../src/aQute/bnd/differ/Baseline.java | 60 +- .../src/aQute/bnd/differ/DiffPluginImpl.java | 12 +- .../src/aQute/bnd/differ/JavaElement.java | 175 +- biz.aQute.bndlib/src/aQute/bnd/header/Attrs.java | 190 +- .../src/aQute/bnd/header/OSGiHeader.java | 9 + .../src/aQute/bnd/header/Parameters.java | 6 + biz.aQute.bndlib/src/aQute/bnd/header/packageinfo | 2 +- biz.aQute.bndlib/src/aQute/bnd/help/Syntax.java | 85 +- .../src/aQute/bnd/indexer/MimeType.java | 15 + biz.aQute.bndlib/src/aQute/bnd/indexer/NOTE | 1 + .../src/aQute/bnd/indexer/Namespaces.java | 70 + .../src/aQute/bnd/indexer/RepoIndex.java | 95 + .../src/aQute/bnd/indexer/ResourceAnalyzer.java | 63 + .../bnd/indexer/analyzers/BlueprintAnalyzer.java | 41 + .../bnd/indexer/analyzers/BundleAnalyzer.java | 460 ++ .../src/aQute/bnd/indexer/analyzers/EE.java | 99 + .../bnd/indexer/analyzers/KnownBundleAnalyzer.java | 85 + .../src/aQute/bnd/indexer/analyzers/NOTE | 1 + .../indexer/analyzers/OSGiFrameworkAnalyzer.java | 108 + .../aQute/bnd/indexer/analyzers/SCRAnalyzer.java | 113 + .../src/aQute/bnd/indexer/analyzers/Yield.java | 7 + .../bnd/indexer/analyzers/known-bundles.properties | 75 + .../aQute/bnd/make/component/ServiceComponent.java | 4 +- .../aQute/bnd/make/metatype/MetatypePlugin.java | 5 + .../src/aQute/bnd/maven/MavenCommand.java | 18 +- .../src/aQute/bnd/maven/PomResource.java | 2 +- .../src/aQute/bnd/obr/OBRFragment.java | 2 +- biz.aQute.bndlib/src/aQute/bnd/osgi/About.java | 68 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java | 815 ++- .../src/aQute/bnd/osgi/Annotation.java | 16 +- .../src/aQute/bnd/osgi/AnnotationHeaders.java | 396 ++ biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java | 254 +- .../src/aQute/bnd/osgi/ClassDataCollector.java | 8 +- .../src/aQute/bnd/osgi/ClassDataCollectors.java | 289 + biz.aQute.bndlib/src/aQute/bnd/osgi/Classpath.java | 73 + biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java | 269 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Constants.java | 120 +- .../src/aQute/bnd/osgi/Descriptors.java | 89 + biz.aQute.bndlib/src/aQute/bnd/osgi/Domain.java | 6 +- .../src/aQute/bnd/osgi/FileResource.java | 4 +- .../src/aQute/bnd/osgi/Instruction.java | 16 +- .../src/aQute/bnd/osgi/Instructions.java | 31 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java | 60 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java | 212 +- .../src/aQute/bnd/osgi/OSInformation.java | 34 + biz.aQute.bndlib/src/aQute/bnd/osgi/OpCodes.java | 8 +- .../src/aQute/bnd/osgi/PreprocessResource.java | 2 + biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java | 594 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Verifier.java | 238 +- biz.aQute.bndlib/src/aQute/bnd/osgi/packageinfo | 2 +- .../aQute/bnd/osgi/profiles-OpenJDK8.properties | 51 + .../src/aQute/bnd/osgi/resource/CapReq.java | 2 +- .../src/aQute/bnd/osgi/resource/CapReqBuilder.java | 95 +- .../aQute/bnd/osgi/resource/CapabilityImpl.java | 14 + .../src/aQute/bnd/osgi/resource/FilterParser.java | 728 +++ .../bnd/osgi/resource/PersistentResource.java | 417 ++ .../aQute/bnd/osgi/resource/RequirementImpl.java | 13 + .../aQute/bnd/osgi/resource/ResourceBuilder.java | 4 + .../src/aQute/bnd/osgi/resource/packageinfo | 2 +- .../repository/ResourceDescriptorImpl.java | 62 + .../repository/ResourceRepositoryImpl.java | 545 ++ biz.aQute.bndlib/src/aQute/bnd/service/Plugin.java | 3 +- .../aQute/bnd/service/classparser/ClassParser.java | 8 + .../src/aQute/bnd/service/classparser}/packageinfo | 1 + .../bnd/service/extension/ExtensionActivator.java | 10 + .../src/aQute/bnd/service/extension}/packageinfo | 0 .../bnd/service/repository/InfoRepository.java | 20 + .../bnd/service/repository/RepositoryDigest.java | 9 + .../bnd/service/repository/ResourceRepository.java | 66 + .../service/repository/SearchableRepository.java | 32 +- .../src/aQute/bnd/service/repository/packageinfo | 2 +- .../aQute/bnd/service/resolve/hook}/packageinfo | 0 .../bnd/service/url/URLConnectionHandler.java | 52 + .../src/aQute/bnd/service/url/packageinfo | 2 +- biz.aQute.bndlib/src/aQute/bnd/signing/Signer.java | 4 +- .../src/aQute/bnd/testing/DSTestWiring.java | 312 + .../src/aQute/bnd/testing/TestingLog.java | 198 + .../src/aQute/bnd/testing}/packageinfo | 0 .../src/aQute/bnd/url/BasicAuthentication.java | 63 + .../src/aQute/bnd/url/BndAuthentication.java | 143 + .../src/aQute/bnd/url/ConnectionSettings.java | 72 + .../aQute/bnd/url/DefaultURLConnectionHandler.java | 119 + .../src/aQute/bnd/url/HttpsVerification.java | 103 + .../aQute/bnd/url/MultiURLConnectionHandler.java | 30 + .../src/aQute/bnd/url}/packageinfo | 0 .../src/aQute/bnd/version/VersionRange.java | 41 +- biz.aQute.bndlib/src/aQute/bnd/version/packageinfo | 2 +- .../src/aQute/lib/deployer/FileRepo.java | 278 +- .../src/aQute/lib/deployer/RDImpl.java | 22 + .../src/aQute/lib/spring/SpringXMLType.java | 2 +- {dist => biz.aQute.bndoc}/.classpath | 6 +- {dist => biz.aQute.bndoc}/.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 +- biz.aQute.bndoc/bnd.bnd | 33 + biz.aQute.bndoc/build | 5 + biz.aQute.bndoc/build.gradle | 6 + biz.aQute.bndoc/doc/bndoc.bndoc | 11 + biz.aQute.bndoc/doc/en/050-front.md | 44 + biz.aQute.bndoc/doc/en/100-bndoc.md | 115 + biz.aQute.bndoc/doc/en/110-formatting.md | 3 + biz.aQute.bndoc/doc/en/120-diagrams.md | 30 + biz.aQute.bndoc/doc/resources/img/front.jpg | Bin 0 -> 579601 bytes biz.aQute.bndoc/example/main.bndoc | 20 + biz.aQute.bndoc/jar/LICENSES.md | 10 + biz.aQute.bndoc/less/base.less | 198 + biz.aQute.bndoc/less/bndoc.less | 28 + biz.aQute.bndoc/less/functions.less | 159 + biz.aQute.bndoc/less/layout.less | 114 + biz.aQute.bndoc/less/print.less | 110 + biz.aQute.bndoc/less/style.less | 36 + biz.aQute.bndoc/readme.md | 1 + biz.aQute.bndoc/run.bnd | 26 + biz.aQute.bndoc/src/biz/aQute/bndoc/lib/Base.java | 151 + .../src/biz/aQute/bndoc/lib/BndocDecorator.java | 234 + .../src/biz/aQute/bndoc/lib/Constants.java | 35 + .../src/biz/aQute/bndoc/lib/CustomShapes.java | 377 ++ .../src/biz/aQute/bndoc/lib/DocumentBuilder.java | 776 +++ .../src/biz/aQute/bndoc/lib/PageSize.java | 16 + .../src/biz/aQute/bndoc/lib/ParagraphCounter.java | 36 + biz.aQute.bndoc/src/biz/aQute/bndoc/lib/Table.java | 319 + .../biz/aQute/bndoc/lib/resources/defaults.bndoc | 2 + .../src/biz/aQute/bndoc/lib/resources/inner.htm | 3 + .../src/biz/aQute/bndoc/lib/resources/outer.htm | 29 + .../src/biz/aQute/bndoc/lib/resources/style.css | 576 ++ .../src/biz/aQute/bndoc/main/About.java | 5 + biz.aQute.bndoc/src/biz/aQute/bndoc/main/Main.java | 316 + .../src/biz/aQute/markdown/BlockQuoteHandler.java | 50 + .../src/biz/aQute/markdown/CodeHandler.java | 58 + .../src/biz/aQute/markdown/Configuration.java | 35 + .../src/biz/aQute/markdown/HeaderHandler.java | 58 + .../src/biz/aQute/markdown/LinkHandler.java | 58 + .../src/biz/aQute/markdown/ListHandler.java | 270 + .../src/biz/aQute/markdown/Markdown.java | 1075 ++++ .../src/biz/aQute/markdown/ParaHandler.java | 26 + .../src/biz/aQute/markdown/RuleHandler.java | 33 + biz.aQute.bndoc/src/biz/aQute/markdown/Table.java | 227 + .../src/biz/aQute/markdown/TableHandler.java | 273 + .../src/biz/aQute/markdown/XmlHandler.java | 33 + .../markdown/ditaa/AsciiArtConfiguration.java | 11 + .../biz/aQute/markdown/ditaa/AsciiArtHandler.java | 130 + .../src/biz/aQute/markdown/ditaa/CustomShapes.java | 369 ++ .../test/biz/aQute/bndoc/lib/CommandLineTest.java | 14 + .../biz/aQute/bndoc/lib/DocumentBuilderTest.java | 18 + .../test/biz/aQute/bndoc/lib/TableTest.java | 80 + .../test/biz/aQute/markdown/MarkdownTest.java | 278 + biz.aQute.bndoc/testdocs/art/simple.art | 10 + biz.aQute.bndoc/testdocs/css/extra.css | 3 + biz.aQute.bndoc/testdocs/css/style.css | 3 + biz.aQute.bndoc/testdocs/docs/bndoc.bndoc | 10 + biz.aQute.bndoc/testdocs/docs/en/a.md | 98 + biz.aQute.bndoc/testdocs/docs/en/b.md | 5 + .../testdocs/markdown/Amps and angle encoding.html | 17 + .../testdocs/markdown/Amps and angle encoding.text | 21 + biz.aQute.bndoc/testdocs/markdown/Auto links.html | 18 + biz.aQute.bndoc/testdocs/markdown/Auto links.text | 13 + .../testdocs/markdown/Backslash escapes.html | 102 + .../testdocs/markdown/Backslash escapes.text | 104 + .../markdown/Blockquotes with code blocks.html | 15 + .../markdown/Blockquotes with code blocks.text | 11 + ...rd-wrapped paragraphs with list-like lines.html | 8 + ...rd-wrapped paragraphs with list-like lines.text | 8 + .../testdocs/markdown/Horizontal rules.html | 71 + .../testdocs/markdown/Horizontal rules.text | 67 + .../testdocs/markdown/Inline HTML (Advanced).html | 14 + .../testdocs/markdown/Inline HTML (Advanced).text | 14 + .../testdocs/markdown/Inline HTML (Simple).html | 72 + .../testdocs/markdown/Inline HTML (Simple).text | 69 + .../testdocs/markdown/Inline HTML comments.html | 13 + .../testdocs/markdown/Inline HTML comments.text | 13 + .../testdocs/markdown/Links, inline style.html | 9 + .../testdocs/markdown/Links, inline style.text | 9 + .../testdocs/markdown/Links, reference style.html | 18 + .../testdocs/markdown/Links, reference style.text | 31 + .../markdown/Literal quotes in titles.html | 3 + .../markdown/Literal quotes in titles.text | 7 + .../markdown/Markdown Documentation - Basics.html | 314 + .../markdown/Markdown Documentation - Basics.text | 306 + .../markdown/Markdown Documentation - Syntax.html | 942 +++ .../markdown/Markdown Documentation - Syntax.text | 888 +++ .../testdocs/markdown/Nested blockquotes.html | 9 + .../testdocs/markdown/Nested blockquotes.text | 5 + .../markdown/Ordered and unordered lists.html | 137 + .../markdown/Ordered and unordered lists.text | 122 + .../testdocs/markdown/Strong and em together.html | 7 + .../testdocs/markdown/Strong and em together.text | 7 + biz.aQute.bndoc/testdocs/markdown/Tabs.html | 25 + biz.aQute.bndoc/testdocs/markdown/Tabs.text | 21 + biz.aQute.bndoc/testdocs/markdown/Tidyness.html | 8 + biz.aQute.bndoc/testdocs/markdown/Tidyness.text | 5 + .../testdocs/markdownpro/definition-list.mdt | 53 + biz.aQute.bndoc/testdocs/markdownpro/escaping.mdt | 11 + biz.aQute.bndoc/testdocs/markdownpro/headers.mdt | 47 + biz.aQute.bndoc/testdocs/markdownpro/macros.mdt | 25 + .../testdocs/markdownpro/nested-quotes.html | 16 + .../testdocs/markdownpro/nested-quotes.text | 8 + .../testdocs/markdownpro/simple-lists.html | 34 + .../testdocs/markdownpro/simple-lists.text | 22 + biz.aQute.bndoc/testdocs/markdownpro/spans.mdt | 15 + biz.aQute.bndoc/testdocs/markdownpro/tables.mdt | 448 ++ biz.aQute.bndoc/testdocs/markdownpro/test.html | 12 + biz.aQute.bndoc/testdocs/markdownpro/test.text | 8 + biz.aQute.bndoc/testdocs/preprocess/a.md | 2 + biz.aQute.bndoc/testdocs/preprocess/b.md | 1 + biz.aQute.bndoc/testdocs/simple/a.md | 10 + biz.aQute.bndoc/testdocs/simple/b.md | 1 + biz.aQute.jpm/bnd.bnd | 3 +- biz.aQute.jpm/build.xml | 4 - biz.aQute.jpm/images/icon.ico | Bin 0 -> 16958 bytes biz.aQute.jpm/readme.md | 119 + biz.aQute.jpm/run.bnd | 2 +- biz.aQute.jpm/src/aQute/jpm/lib/ArtifactData.java | 2 + biz.aQute.jpm/src/aQute/jpm/lib/CommandData.java | 4 + .../src/aQute/jpm/lib/DependencyCollector.java | 10 +- biz.aQute.jpm/src/aQute/jpm/lib/JVM.java | 23 + .../aQute/jpm/lib/JustAnotherPackageManager.java | 251 +- biz.aQute.jpm/src/aQute/jpm/lib/Service.java | 8 +- biz.aQute.jpm/src/aQute/jpm/main/InstallCert.java | 115 +- biz.aQute.jpm/src/aQute/jpm/main/Main.java | 587 +- biz.aQute.jpm/src/aQute/jpm/platform/Linux.java | 17 +- biz.aQute.jpm/src/aQute/jpm/platform/MacOS.java | 107 +- biz.aQute.jpm/src/aQute/jpm/platform/Platform.java | 165 +- biz.aQute.jpm/src/aQute/jpm/platform/Unix.java | 147 +- biz.aQute.jpm/src/aQute/jpm/platform/Windows.java | 356 +- .../src/aQute/jpm/platform/macos/command.sh | 2 +- .../src/aQute/jpm/platform/macos/launch.sh | 2 +- .../src/aQute/jpm/platform/unix/command.sh | 2 +- .../src/aQute/jpm/platform/unix/launch.sh | 2 +- .../aQute/jpm/platform/windows/WinRegistry.java | 392 -- .../src/aQute/jpm/platform/windows/command.sh | 1 - .../src/aQute/jpm/service/ServiceMain.java | 6 +- biz.aQute.jpm/test/aQute/jpm/main/JPMTest.java | 33 + .../.settings/org.eclipse.jdt.core.prefs | 2 +- biz.aQute.junit/bnd.bnd | 10 +- biz.aQute.junit/build.xml | 4 - biz.aQute.junit/src/aQute/junit/Activator.java | 110 +- .../src/aQute/junit/JUnitEclipseReport.java | 13 +- .../src/aQute/junit/JunitXmlReport.java | 8 +- .../src/aQute/junit/UnresolvedTester.java | 41 + .../src/aQute/junit/constants/TesterConstants.java | 5 + .../src/aQute/junit/plugin/ProjectTesterImpl.java | 13 +- .../src/aQute/junit/runtime/OSGiTestCase.java | 8 +- .../.settings/org.eclipse.jdt.core.prefs | 29 +- biz.aQute.launcher/bnd.bnd | 4 +- biz.aQute.launcher/build.xml | 4 - .../src/aQute/launcher/Launcher.java | 49 +- .../launcher/constants/LauncherConstants.java | 2 + .../src/aQute/launcher/minifw/Context.java | 97 +- .../src/aQute/launcher/minifw/MiniFramework.java | 74 +- .../aQute/launcher/plugin/ProjectLauncherImpl.java | 71 +- .../{embedded => pre}/EmbeddedLauncher.java | 9 +- .../src/aQute/launcher/pre/JpmLauncher.java | 93 + .../launcher/plugin/ProjectLaunchImplTest.java | 47 +- {dist => biz.aQute.repository.aether}/.classpath | 6 +- {dist => biz.aQute.repository.aether}/.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 1 - biz.aQute.repository.aether/bnd.bnd | 63 + .../repository/aether/AetherRepository.java | 444 ++ .../aether/ConsoleRepositoryListener.java | 123 + .../repository/aether/ConsoleTransferListener.java | 156 + .../repository/aether/ConversionUtils.java | 71 + .../bnd/deployer/repository/aether/MvnVersion.java | 79 + .../repository/aether/ConversionUtilsTest.java | 53 + biz.aQute.repository.aether/testdata/2.bnd | 2 + biz.aQute.repository.aether/testdata/3.bnd | 2 + biz.aQute.repository/bnd.bnd | 4 +- biz.aQute.repository/build.xml | 4 - .../src/aQute/bnd/deployer/obr/NexusOBR.java | 22 +- .../deployer/repository/AbstractIndexedRepo.java | 271 +- .../repository/CachingUriResourceHandle.java | 43 +- .../bnd/deployer/repository/FixedIndexedRepo.java | 3 +- .../bnd/deployer/repository/LocalIndexedRepo.java | 86 +- .../bnd/deployer/repository/RepoConstants.java | 9 + .../bnd/deployer/repository/RepoResourceUtils.java | 170 + .../repository/VersionedResourceIndex.java | 93 + .../providers/KnownBundleAnalyzerPlugin.java | 2 +- .../repository/providers/ObrContentProvider.java | 1 - biz.aQute.repository/src/test/lib/NanoHTTPD.java | 8 +- .../repository/CachingUriResourceHandlerTest.java | 55 +- .../deployer/repository/TestFixedIndexedRepo.java | 19 + .../repository/TestLocalIndexGeneration.java | 1 + biz.aQute.resolve/bnd.bnd | 15 +- biz.aQute.resolve/build.xml | 7 - .../resolve/internal/BndrunResolveContext.java | 1352 ++-- .../resolve/repository/InfoRepositoryWrapper.java | 159 + .../biz/aQute/resolve/repository/TestWrapper.java | 131 + bnd-maven-plugin-parent/LICENSE | 177 + bnd-maven-plugin-parent/README.md | 68 + .../bnd-maven-plugin-dependencies/pom.xml | 43 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 11 +- .../.settings/org.eclipse.jdt.ui.prefs | 61 + bnd-maven-plugin-parent/bnd-maven-plugin/pom.xml | 118 + .../java/aQute/bnd/mavenplugin/BndArtifact.java | 22 + .../aQute/bnd/mavenplugin/BndArtifactHandler.java | 18 + .../java/aQute/bnd/mavenplugin/BndTestRunner.java | 50 + .../java/aQute/bnd/mavenplugin/BndWorkspace.java | 60 + .../java/aQute/bnd/mavenplugin/BundlePackager.java | 126 + .../bnd/mavenplugin/ConfigureMavenProject.java | 230 + .../aQute/bnd/mavenplugin/InitializeForBnd.java | 107 + .../main/resources/META-INF/plexus/components.xml | 47 + .../aQute/bnd/mavenplugin/BndTestRunnerTest.java | 64 + .../bnd/mavenplugin/ConfigureMavenProjectTest.java | 209 + bnd-maven-plugin-parent/pom.xml | 25 + build.gradle | 45 + build.xml | 56 - cnf/build-template.xml | 218 - cnf/build.bnd | 5 +- cnf/build.gradle.properties | 3 + cnf/build.properties | 3 - cnf/build.xml | 220 - cnf/ext/pluginpaths.bnd | 5 +- cnf/ext/repositories.bnd | 10 +- cnf/findbugs.include.xml | 545 +- 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/gradle/custom/allProjects.gradle | 5 + cnf/gradle/custom/bndProjects.gradle | 7 + cnf/gradle/custom/nonBndProjects.gradle | 7 + cnf/gradle/custom/rootProject.gradle | 7 + cnf/gradle/custom/settings-allProjects.gradle | 5 + cnf/gradle/custom/settings-rootProject.gradle | 7 + cnf/gradle/custom/settings-workspace.gradle | 7 + cnf/gradle/custom/subProjects.gradle | 7 + cnf/gradle/doc/BUILDING-GRADLE.md | 751 +++ cnf/gradle/doc/bnd.dot | 201 + cnf/gradle/doc/bnd.svg | 408 ++ cnf/gradle/doc/template.dot | 190 + cnf/gradle/doc/template.svg | 384 ++ cnf/gradle/template/bndLayout.gradle | 40 + cnf/gradle/template/bndProject.gradle | 419 ++ cnf/gradle/template/bndWorkspace.gradle | 47 + cnf/gradle/template/buildDependencies.gradle | 122 + cnf/gradle/template/clean.gradle | 67 + cnf/gradle/template/findbugs-placeholders.gradle | 23 + cnf/gradle/template/findbugs.gradle | 69 + cnf/gradle/template/index.gradle | 204 + cnf/gradle/template/javaDoc.gradle | 71 + cnf/gradle/template/javaProject.gradle | 36 + cnf/gradle/template/rootProject.gradle | 56 + cnf/gradle/template/settings-allProjects.gradle | 113 + cnf/gradle/template/settings-rootProject.gradle | 26 + cnf/gradle/template/settings-workspace.gradle | 26 + cnf/gradle/template/template.gradle | 83 + cnf/jpm4j.json | 15 + cnf/scripts/fb_generate_includes.bash | 33 - demo/bnd.bnd | 26 +- demo/build.xml | 6 - demo/src/test/A.java | 9 + demo/src/test/B.java | 7 + demo/src/test/TestActivator.java | 80 +- demo/src/test/TestCase2.java | 47 + demo/src/test/api/Interf.java | 18 + demo/src/test/api/package-info.java | 5 + demo/x.bndrun | 13 + dist/.classpath | 6 +- dist/.project | 6 - dist/bnd.bnd | 8 - dist/build-settings.gradle | 11 + dist/build.gradle | 20 + dist/build.xml | 7 - gradlew | 164 + gradlew.bat | 90 + osgi.r5/build.xml | 4 - settings.gradle | 20 + 670 files changed, 47993 insertions(+), 11037 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

