This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bnd.
commit 6bedb4197b4804d89e3579576f03a29d2b9e89af Merge: 897753c 9c13cc6 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 16 16:20:09 2015 +0100 Merge tag 'upstream/2.4.0' Upstream version 2.4.0 .gradle-wrapper/gradle-wrapper.properties | 3 +- .travis.yml | 12 + BUILDING-GRADLE.md | 1 - CONTRIBUTING.md | 225 + README.md | 48 +- aQute.libg/.settings/org.eclipse.jdt.core.prefs | 8 +- aQute.libg/bnd.bnd | 8 +- .../src/aQute/configurable/Configurable.java | 30 +- aQute.libg/src/aQute/configurable/packageinfo | 2 +- aQute.libg/src/aQute/lib/base64/Base64.java | 6 + aQute.libg/src/aQute/lib/base64/packageinfo | 2 +- aQute.libg/src/aQute/lib/converter/Converter.java | 9 + aQute.libg/src/aQute/lib/env/Env.java | 6 +- aQute.libg/src/aQute/lib/filter/Filter.java | 19 +- aQute.libg/src/aQute/lib/getopt/CommandLine.java | 7 +- aQute.libg/src/aQute/lib/getopt/packageinfo | 2 +- aQute.libg/src/aQute/lib/json/ArrayHandler.java | 4 +- .../src/aQute/lib/json/CollectionHandler.java | 7 +- aQute.libg/src/aQute/lib/json/Decoder.java | 2 + aQute.libg/src/aQute/lib/json/Encoder.java | 18 +- aQute.libg/src/aQute/lib/json/MapHandler.java | 5 +- aQute.libg/src/aQute/lib/json/ObjectHandler.java | 33 +- aQute.libg/src/aQute/lib/json/SpecialHandler.java | 2 - aQute.libg/src/aQute/lib/json/packageinfo | 2 +- .../src/aQute/lib/persistentmap/PersistentMap.java | 223 +- aQute.libg/src/aQute/lib/persistentmap/packageinfo | 2 +- .../src/aQute/lib/settings/PasswordCryptor.java | 45 + aQute.libg/src/aQute/lib/settings/Settings.java | 83 +- aQute.libg/src/aQute/lib/settings/packageinfo | 2 +- aQute.libg/src/aQute/lib/strings/Strings.java | 8 + aQute.libg/src/aQute/lib/strings/packageinfo | 2 +- aQute.libg/src/aQute/lib/tag/Tag.java | 25 +- .../aQute/lib/utf8properties/UTF8Properties.java | 105 + aQute.libg/src/aQute/lib/zip/ZipUtil.java | 105 + .../src/aQute/lib/zip}/packageinfo | 0 aQute.libg/src/aQute/libg/asn1/BER.java | 10 +- aQute.libg/src/aQute/libg/cryptography/Crypto.java | 1 + aQute.libg/src/aQute/libg/generics/Create.java | 6 +- aQute.libg/src/aQute/libg/reporter/Message.java | 3 + .../src/aQute/libg/reporter/ReporterMessages.java | 1 + aQute.libg/src/aQute/libg/reporter/packageinfo | 2 +- aQute.libg/src/aQute/libg/sed/ReplacerAdapter.java | 25 +- aQute.libg/src/aQute/libg/sed/packageinfo | 2 +- aQute.libg/src/aQute/service/reporter/Report.java | 16 +- .../src/aQute/service/reporter/Reporter.java | 5 +- .../test/aQute/configurable/ConfigurableTest.java | 32 + aQute.libg/test/aQute/lib/index/TestIndex.java | 137 +- aQute.libg/test/aQute/lib/json/JSONTest.java | 2 +- .../aQute/lib/persistentmap/PersistentMapTest.java | 2 +- .../test/aQute/lib/settings/SettingsTest.java | 6 +- .../lib/utf8properties/UTF8PropertiesTest.java | 50 + aQute.libg/test/aQute/libg/sed/ReplacerTest.java | 10 +- biz.aQute.bnd.annotation/.classpath | 7 + biz.aQute.bnd.annotation/.project | 23 + .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 361 ++ .../.settings/org.eclipse.jdt.ui.prefs | 0 biz.aQute.bnd.annotation/bnd.bnd | 9 + biz.aQute.bnd.bootstrap/.classpath | 7 + biz.aQute.bnd.bootstrap/.project | 23 + .../.settings/org.eclipse.jdt.core.prefs | 12 + biz.aQute.bnd.bootstrap/bnd.bnd | 14 + biz.aQute.bnd.bootstrap/bootstrap.bndrun | 13 + biz.aQute.bnd.bootstrap/build.xml | 7 + biz.aQute.bnd.bootstrap/console.bnd | 4 + biz.aQute.bnd.bootstrap/launch.bndrun | 14 + .../src/aQute/bnd/bootstrap/console/Console.java | 76 + .../aQute/bnd/bootstrap/console/PrompterImpl.java | 143 + .../biz/aQute/bnd/bootstrap/ExampleComponent.java | 10 + biz.aQute.bnd.doc/.classpath | 8 - biz.aQute.bnd.doc/.project | 23 - .../.settings/org.eclipse.jdt.core.prefs | 11 - 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/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.gradle/.classpath | 7 + biz.aQute.bnd.gradle/.project | 23 + .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 361 ++ .../.settings/org.eclipse.jdt.ui.prefs | 0 biz.aQute.bnd.gradle/bnd.bnd | 21 + biz.aQute.bnd.gradle/build.gradle | 26 + .../gradle-plugins/biz.aQute.bnd.properties | 1 + .../src/aQute/bnd/gradle/BndPlugin.groovy | 484 ++ .../aQute/bnd/gradle/BndPluginConvention.groovy | 33 + .../src/aQute/bnd/gradle/BndProperties.groovy | 39 + biz.aQute.bnd.test/.classpath | 7 + biz.aQute.bnd.test/.project | 23 + .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 361 ++ .../.settings/org.eclipse.jdt.ui.prefs | 0 biz.aQute.bnd.test/bnd.bnd | 13 + .../src/aQute/bnd/test/BndTestCase.java | 0 .../NewlineEscapedStringFormatterTestCase.java | 0 .../src/aQute/bnd/test/SimpleContext.java | 0 .../src/aQute/bnd/test/XmlTester.java | 79 + biz.aQute.bnd.testextension/.classpath | 7 + biz.aQute.bnd.testextension/.project | 23 + .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 361 ++ .../.settings/org.eclipse.jdt.ui.prefs | 0 biz.aQute.bnd.testextension/bnd.bnd | 7 + .../src/aQute/bnd/ext/test/TestExtension.java | 0 biz.aQute.bnd/.settings/org.eclipse.jdt.core.prefs | 8 +- biz.aQute.bnd/annotation.bnd | 4 - biz.aQute.bnd/biz.aQute.bnd.bnd | 32 - biz.aQute.bnd/bnd.bnd | 51 +- biz.aQute.bnd/bnd/embedded-repo.bnd | 8 +- biz.aQute.bnd/enroute | 5 + biz.aQute.bnd/schema.xml | 147 +- biz.aQute.bnd/src/aQute/bnd/ant/BaseTask.java | 6 + biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java | 11 +- .../src/aQute/bnd/ant/ConsoleProgress.java | 2 +- .../src/aQute/bnd/ant/ExpandPropertiesTask.java | 3 +- .../aQute/bnd/ant/RunconfigToDistributionTask.java | 2 +- .../aQute/bnd/enroute/commands/EnrouteCommand.java | 196 + .../aQute/bnd/enroute/commands/EnrouteOptions.java | 7 + .../src/aQute/bnd/main/BaselineCommands.java | 2 +- biz.aQute.bnd/src/aQute/bnd/main/BndMessages.java | 2 + biz.aQute.bnd/src/aQute/bnd/main/Interactive.java | 17 + biz.aQute.bnd/src/aQute/bnd/main/Plugins.java | 161 + biz.aQute.bnd/src/aQute/bnd/main/RepoCommand.java | 174 +- biz.aQute.bnd/src/aQute/bnd/main/bnd.info | 1 + biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 813 ++- biz.aQute.bnd/templates/enroute.zip | Bin 0 -> 102940 bytes biz.aQute.bnd/test.bnd | 4 - biz.aQute.bnd/testextension.bnd | 2 - biz.aQute.bndlib.tests/.classpath | 3 +- biz.aQute.bndlib.tests/bnd.bnd | 16 +- biz.aQute.bndlib.tests/build.gradle | 1 - .../AnalyzerCrawlInvokerInterfaceAIOOBTest.jclass | Bin 0 -> 1436 bytes biz.aQute.bndlib.tests/java8/newer/.classpath | 6 + biz.aQute.bndlib.tests/java8/newer/.project | 17 + .../newer/.settings/org.eclipse.jdt.core.prefs | 11 + .../newer/src/api_default_methods/Consumer.java | 8 + .../newer/src/api_default_methods/Provider.java | 8 + biz.aQute.bndlib.tests/java8/older/.classpath | 6 + biz.aQute.bndlib.tests/java8/older/.project | 17 + .../older/.settings/org.eclipse.jdt.core.prefs | 11 + .../older/src/api_default_methods/Consumer.java | 5 + .../older/src/api_default_methods/Provider.java | 5 + .../java8/type_annotations/.classpath | 6 + .../java8/type_annotations/.project | 17 + .../.settings/org.eclipse.jdt.core.prefs | 11 + .../annotations/InvisibleParameterAnnotation.java | 12 + .../annotations/InvisibleRepeatedAnnotation.java | 10 + .../annotations/InvisibleTypeAnnotation.java | 12 + .../repeated/InvisibleRepeatedAnnotations.java | 11 + .../invisible/annotations/ReferenceInvisible.java | 16 + .../src/reference/runtime/annotations/Bar.java | 5 + .../src/reference/runtime/annotations/Foo.java | 7 + .../runtime/annotations/ReferenceRuntime.java | 35 + .../annotations/RuntimeParameterAnnotation.java | 12 + .../annotations/RuntimeRepeatedAnnotation.java | 10 + .../runtime/annotations/RuntimeTypeAnnotation.java | 12 + .../repeated/RuntimeRepeatedAnnotations.java | 12 + biz.aQute.bndlib.tests/src/test/AnalyzerTest.java | 1019 ++- .../src/test/AnnotationsTest.java | 3 +- .../src/test/AttributesTest.java | 9 +- biz.aQute.bndlib.tests/src/test/BuilderTest.java | 2611 +++++--- biz.aQute.bndlib.tests/src/test/CalltreeTest.java | 4 +- .../src/test/ClassParserTest.java | 66 +- biz.aQute.bndlib.tests/src/test/ClasspathTest.java | 4 +- biz.aQute.bndlib.tests/src/test/ClazzTest.java | 33 +- biz.aQute.bndlib.tests/src/test/ContractTest.java | 3 +- .../src/test/CorruptManifest.java | 3 +- .../src/test/ExtensionsTest.java | 3 +- .../src/test/FilterParserTest.java | 46 + .../src/test/IncludeHeaderTest.java | 40 +- biz.aQute.bndlib.tests/src/test/JarSignerTest.java | 5 +- biz.aQute.bndlib.tests/src/test/JarTest.java | 7 +- biz.aQute.bndlib.tests/src/test/LauncherTest.java | 61 +- biz.aQute.bndlib.tests/src/test/LocationTest.java | 4 +- biz.aQute.bndlib.tests/src/test/MacroTest.java | 217 +- biz.aQute.bndlib.tests/src/test/MakeTest.java | 4 +- biz.aQute.bndlib.tests/src/test/ManifestTest.java | 6 +- biz.aQute.bndlib.tests/src/test/MavenTest.java | 4 +- biz.aQute.bndlib.tests/src/test/MergeTest.java | 58 +- biz.aQute.bndlib.tests/src/test/MetatypeTests.java | 2 +- biz.aQute.bndlib.tests/src/test/NoUsesTest.java | 3 +- .../src/test/PreprocessTest.java | 2 +- biz.aQute.bndlib.tests/src/test/ProjectTest.java | 82 +- .../src/test/PropertiesTest.java | 7 +- biz.aQute.bndlib.tests/src/test/ResourcesTest.java | 6 +- biz.aQute.bndlib.tests/src/test/SpringTest.java | 2 +- biz.aQute.bndlib.tests/src/test/TestBndBook.java | 7 +- biz.aQute.bndlib.tests/src/test/VerifierTest.java | 10 +- .../src/test/VersionPolicyTest.java | 39 +- .../WorkspaceBundleVersionedDependencyTest.java | 32 + .../src/test/WorkspaceRepositoryTest.java | 2 +- biz.aQute.bndlib.tests/src/test/WorkspaceTest.java | 79 +- biz.aQute.bndlib.tests/src/test/XmlParseTest.java | 19 + .../src/test/activator/AbstractActivator.java | 7 + .../test/activator/DefaultVisibilityActivator.java | 13 + .../src/test/activator/IActivator.java | 7 + .../MissingNoArgsConstructorActivator.java | 15 + .../src/test/activator/NotAnActivator.java | 11 + .../src/test/annotations/diff/Inner.java | 8 + .../src/test/annotations/diff/Outer.java | 9 + .../diff/payload/ArrayAnnotationDiffTest.java | 14 + .../src/test/baseline/BaselineTest.java | 128 +- .../src/test/bndmodel/BndModelTest.java | 66 + .../src/test/component/ComponentTest.java | 174 +- .../src/test/component/DSAnnotationTest.java | 800 ++- .../src/test/deployer/FileRepoTest.java | 129 +- biz.aQute.bndlib.tests/src/test/diff/DiffTest.java | 66 +- .../src/test/exceptionimport/ExceptionImport.java | 13 + biz.aQute.bndlib.tests/src/test/lib/NanoHTTPD.java | 76 +- .../src/test/metatype/BNDMetatypeTest.java | 1206 ++++ .../src/test/metatype/MetatypeTest.java | 1206 ---- .../src/test/metatype/SpecMetatypeTest.java | 951 +++ .../src/test/resource/PersistentResourceTest.java | 40 + .../osgi/AnnotatedProviderInterface.java | 8 + .../ImplementR5AnnotatedProviderInterface.java | 7 + biz.aQute.bndlib.tests/testresources/blueprint.xml | 12 + .../testresources/bndmodel/test-01.bndrun | 4 + .../redirectws/{bnd => cnf}/build.bnd | 0 .../redirectws/{bnd => cnf}/ext/test.bnd | 0 .../cnf/build.bnd | 52 + .../myconsumer/bnd.bnd | 4 + .../myconsumer/static/test.txt | 0 .../mydependency/bnd.bnd | 2 + .../mydependency/mysub.bnd | 3 + .../ws-versioneddependencies/cnf/build.bnd | 52 + .../ws-versioneddependencies/myconsumer/bnd.bnd | 4 + .../myconsumer/static/test.txt | 0 .../ws-versioneddependencies/mydependency/bnd.bnd | 3 + .../testresources/ws/multipath/bnd.bnd | 16 + .../.settings/org.eclipse.jdt.core.prefs | 6 +- biz.aQute.bndlib/bnd.bnd | 64 +- .../src/aQute/bnd/annotation/headers/About.java | 1 - .../bnd/annotation/headers/BundleLicense.java | 2 - .../bnd/annotation/metatype/Configurable.java | 32 +- .../src/aQute/bnd/annotation/metatype/packageinfo | 2 +- .../src/aQute/bnd/annotation/plugin/BndPlugin.java | 13 + .../src/aQute/bnd/annotation/plugin}/packageinfo | 0 .../src/aQute/bnd/build/Container.java | 2 +- biz.aQute.bndlib/src/aQute/bnd/build/Project.java | 292 +- .../src/aQute/bnd/build/ProjectBuilder.java | 81 +- .../src/aQute/bnd/build/ProjectLauncher.java | 75 +- .../src/aQute/bnd/build/ProjectTester.java | 6 +- .../src/aQute/bnd/build/ReflectAction.java | 28 +- biz.aQute.bndlib/src/aQute/bnd/build/Run.java | 4 + .../src/aQute/bnd/build/ScriptAction.java | 4 + .../src/aQute/bnd/build/Workspace.java | 465 +- .../src/aQute/bnd/build/WorkspaceRepository.java | 70 +- biz.aQute.bndlib/src/aQute/bnd/build/defaults.bnd | 2 +- .../src/aQute/bnd/build/model/BndEditModel.java | 324 +- biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java | 62 +- .../bnd/build/model/clauses/ExportedPackage.java | 4 + .../bnd/build/model/clauses/HeaderClause.java | 4 +- .../bnd/build/model/clauses/ImportPattern.java | 6 + .../bnd/build/model/clauses/ServiceComponent.java | 4 + .../bnd/build/model/clauses/VersionedClause.java | 6 + .../src/aQute/bnd/build/model/clauses/packageinfo | 2 +- .../model/conversions/ClauseListConverter.java | 7 + .../model/conversions/CollectionFormatter.java | 5 + .../bnd/build/model/conversions/Converter.java | 2 + .../model/conversions/DefaultBooleanFormatter.java | 6 + .../build/model/conversions/DefaultFormatter.java | 5 + .../bnd/build/model/conversions/EEConverter.java | 5 + .../bnd/build/model/conversions/EEFormatter.java | 5 + .../bnd/build/model/conversions/EnumConverter.java | 5 + .../bnd/build/model/conversions/EnumFormatter.java | 5 + .../model/conversions/HeaderClauseConverter.java | 5 + .../model/conversions/HeaderClauseFormatter.java | 5 + .../bnd/build/model/conversions/MapFormatter.java | 5 + .../conversions/NewlineEscapedStringFormatter.java | 82 +- .../bnd/build/model/conversions/NoopConverter.java | 5 + .../model/conversions/PropertiesConverter.java | 7 + .../conversions/PropertiesEntryFormatter.java | 5 + .../model/conversions/RequirementFormatter.java | 5 + .../conversions/RequirementListConverter.java | 6 + .../model/conversions/SimpleListConverter.java | 7 + .../model/conversions/StringEntryConverter.java | 5 + .../conversions/VersionedClauseConverter.java | 5 + .../src/aQute/bnd/build/model/packageinfo | 2 +- biz.aQute.bndlib/src/aQute/bnd/build/packageinfo | 2 +- .../src/aQute/bnd/component/AnnotationReader.java | 494 +- .../src/aQute/bnd/component/ComponentDef.java | 45 +- .../src/aQute/bnd/component/DSAnnotations.java | 2 +- .../src/aQute/bnd/component/HeaderReader.java | 20 +- .../src/aQute/bnd/component/ReferenceDef.java | 8 + .../error/DeclarativeServicesAnnotationError.java | 25 + .../src/aQute/bnd/component/error}/packageinfo | 0 .../src/aQute/bnd/differ/Baseline.java | 9 +- .../src/aQute/bnd/differ/DiffPluginImpl.java | 5 +- .../src/aQute/bnd/differ/JavaElement.java | 115 +- biz.aQute.bndlib/src/aQute/bnd/differ/packageinfo | 2 +- .../src/aQute/bnd/filerepo/FileRepo.java | 1 + biz.aQute.bndlib/src/aQute/bnd/header/Attrs.java | 12 + .../src/aQute/bnd/header/Parameters.java | 14 + biz.aQute.bndlib/src/aQute/bnd/header/packageinfo | 2 +- biz.aQute.bndlib/src/aQute/bnd/help/Syntax.java | 2 +- .../src/aQute/bnd/indexer/ResourceAnalyzer.java | 2 - .../bnd/indexer/analyzers/BundleAnalyzer.java | 197 +- .../src/aQute/bnd/indexer/analyzers/EE.java | 6 +- .../bnd/indexer/analyzers/KnownBundleAnalyzer.java | 7 +- .../indexer/analyzers/OSGiFrameworkAnalyzer.java | 2 - .../aQute/bnd/indexer/analyzers/SCRAnalyzer.java | 2 - biz.aQute.bndlib/src/aQute/bnd/make/MakeBnd.java | 12 - .../make/component/ComponentAnnotationReader.java | 25 +- .../aQute/bnd/make/component/ServiceComponent.java | 6 +- .../src/aQute/bnd/make/coverage/Coverage.java | 1 - .../aQute/bnd/make/metatype/MetaTypeReader.java | 30 +- .../src/aQute/bnd/maven/MavenCommand.java | 7 +- .../src/aQute/bnd/maven/PomParser.java | 3 +- .../src/aQute/bnd/maven/support/Maven.java | 5 + .../src/aQute/bnd/maven/support/MavenEntry.java | 7 +- .../src/aQute/bnd/maven/support/ProjectPom.java | 3 +- biz.aQute.bndlib/src/aQute/bnd/metatype/ADDef.java | 65 + .../src/aQute/bnd/metatype/DesignateDef.java | 35 + .../src/aQute/bnd/metatype/DesignateReader.java | 73 + .../src/aQute/bnd/metatype/IconDef.java | 21 + .../aQute/bnd/metatype/MetatypeAnnotations.java | 71 + .../src/aQute/bnd/metatype/OCDDef.java | 58 + .../src/aQute/bnd/metatype/OCDReader.java | 264 + .../src/aQute/bnd/metatype/OptionDef.java | 20 + .../src/aQute/bnd/metatype/TagResource.java | 33 + biz.aQute.bndlib/src/aQute/bnd/osgi/About.java | 23 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java | 167 +- .../src/aQute/bnd/osgi/Annotation.java | 2 + biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java | 26 +- .../src/aQute/bnd/osgi/ClassDataCollector.java | 2 + biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java | 252 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Constants.java | 99 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Domain.java | 10 +- .../src/aQute/bnd/osgi/Instructions.java | 54 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java | 29 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java | 757 ++- .../src/aQute/bnd/osgi/OSInformation.java | 27 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java | 261 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Verifier.java | 72 +- .../src/aQute/bnd/osgi/ZipResource.java | 22 +- biz.aQute.bndlib/src/aQute/bnd/osgi/packageinfo | 2 +- .../src/aQute/bnd/osgi/resource/CapReq.java | 6 + .../src/aQute/bnd/osgi/resource/CapReqBuilder.java | 63 +- .../aQute/bnd/osgi/resource/CapabilityImpl.java | 8 +- .../src/aQute/bnd/osgi/resource/FilterParser.java | 292 +- .../bnd/osgi/resource/PersistentResource.java | 367 +- .../aQute/bnd/osgi/resource/RequirementImpl.java | 6 + .../src/aQute/bnd/osgi/resource/ResourceImpl.java | 18 +- .../src/aQute/bnd/osgi/resource/packageinfo | 2 +- .../src/aQute/bnd/plugin/ant/AntPlugin.java | 39 + .../aQute/bnd/plugin/eclipse/EclipsePlugin.java | 68 + .../src/aQute/bnd/plugin/eclipse/classpath | 8 + .../src/aQute/bnd/plugin/eclipse/project | 23 + .../src/aQute/bnd/plugin/git/GitPlugin.java | 41 + .../src/aQute/bnd/plugin/gradle/GradlePlugin.java | 17 + .../src/aQute/bnd/plugin/maven/MavenPlugin.java | 105 + .../src/aQute/bnd/plugin/maven/pom.xml | 6 + .../src/aQute/bnd/plugin/maven/rootpom.xml | 12 + .../repository/ResourceRepositoryImpl.java | 8 +- .../src/aQute/bnd/service/Refreshable.java | 5 + .../src/aQute/bnd/service/RegistryDonePlugin.java | 13 + .../src/aQute/bnd/service/RepositoryPlugin.java | 10 + .../src/aQute/bnd/service/action/Action.java | 3 + .../src/aQute/bnd/service/action/packageinfo | 2 +- .../bnd/service/lifecycle/LifeCyclePlugin.java | 38 + .../src/aQute/bnd/service/lifecycle}/packageinfo | 0 biz.aQute.bndlib/src/aQute/bnd/service/packageinfo | 2 +- .../bnd/service/url/URLConnectionHandler.java | 4 - .../src/aQute/bnd/signing/JartoolSigner.java | 12 + biz.aQute.bndlib/src/aQute/bnd/test/XmlTester.java | 72 - .../src/aQute/bnd/url/BasicAuthentication.java | 8 +- .../src/aQute/bnd/url/BndAuthentication.java | 11 +- .../src/aQute/bnd/url/ConnectionSettings.java | 3 +- .../aQute/bnd/url/DefaultURLConnectionHandler.java | 5 + .../src/aQute/bnd/url/HttpsVerification.java | 4 + biz.aQute.bndlib/src/aQute/bnd/url/packageinfo | 2 +- biz.aQute.bndlib/src/aQute/bnd/util/dto/DTO.java | 274 + .../src/aQute/bnd/{differ => util/dto}/packageinfo | 0 .../src/aQute/bnd/version/VersionRange.java | 43 +- biz.aQute.bndlib/src/aQute/bnd/version/packageinfo | 2 +- .../src/aQute/lib/deployer/FileRepo.java | 135 +- .../src/aQute/lib/spring/JPAComponent.java | 2 + .../src/aQute/lib/spring/SpringComponent.java | 2 + .../src/aQute/lib/spring/SpringXMLType.java | 2 + biz.aQute.bndlib/src/aQute/lib/spring/XMLType.java | 21 +- biz.aQute.bndoc/.classpath | 8 - biz.aQute.bndoc/.project | 23 - .../.settings/org.eclipse.jdt.core.prefs | 360 -- 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 579601 -> 0 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.configadmin/.classpath | 7 + biz.aQute.configadmin/.project | 23 + .../.settings/org.eclipse.jdt.core.prefs | 12 + biz.aQute.configadmin/bnd.bnd | 10 + .../src/biz/aQute/configadmin/PidTracker.java | 47 + .../biz/aQute/configadmin/StaticConfiguration.java | 110 + .../configadmin/StaticConfigurationAdmin.java | 161 + .../src/biz/aQute/configadmin}/packageinfo | 0 .../configadmin/StaticConfigurationAdminTest.java | 76 + biz.aQute.jpm/bnd.bnd | 5 +- biz.aQute.jpm/release | 2 +- biz.aQute.jpm/src/aQute/jpm/platform/MacOS.java | 1 - biz.aQute.jpm/src/aQute/jpm/platform/Windows.java | 1 - .../src/aQute/jpm/platform/macos/command.sh | 2 +- biz.aQute.jpm/test/aQute/jpm/main/JPMTest.java | 4 +- biz.aQute.junit/bnd.bnd | 13 +- biz.aQute.junit/src/aQute/junit/Activator.java | 40 +- .../src/aQute/junit/BasicTestReport.java | 1 + .../src/aQute/junit/JunitXmlReport.java | 27 +- biz.aQute.junit/src/aQute/junit/Tag.java | 34 +- .../src/aQute/junit/plugin/ProjectTesterImpl.java | 12 - .../.settings/org.eclipse.jdt.core.prefs | 7 +- biz.aQute.launcher/bnd.bnd | 11 +- .../src/aQute/launcher/Launcher.java | 146 +- .../src/aQute/launcher/SimplePermissionPolicy.java | 4 +- .../launcher/constants/LauncherConstants.java | 9 +- .../src/aQute/launcher/minifw/Context.java | 10 +- .../aQute/launcher/plugin/ProjectLauncherImpl.java | 64 +- .../launcher/plugin/ProjectLaunchImplTest.java | 4 +- biz.aQute.repository.aether/.classpath | 1 - .../.settings/org.eclipse.jdt.core.prefs | 1 + biz.aQute.repository.aether/bnd.bnd | 5 +- .../repository/aether/AetherRepository.java | 205 +- .../aether/ConsoleRepositoryListener.java | 1 - .../repository/aether/ConversionUtils.java | 10 + .../bnd/deployer/repository/aether/MvnVersion.java | 26 +- .../repository/aether/AetherRepsitoryTests.java | 111 + .../repository/aether/ConversionUtilsTest.java | 21 +- .../deployer/repository/aether/MvnVersionTest.java | 58 + .../javax/servlet/servlet-api/maven-metadata.xml | 14 + .../servlet/servlet-api/maven-metadata.xml.md5 | 1 + .../servlet/servlet-api/maven-metadata.xml.sha1 | 1 + .../.settings/org.eclipse.jdt.core.prefs | 6 +- biz.aQute.repository/bnd.bnd | 43 +- .../bnd/deployer/http/DefaultURLConnector.java | 33 +- .../deployer/http/HttpBasicAuthURLConnector.java | 8 +- .../src/aQute/bnd/deployer/obr/NexusOBR.java | 4 + .../deployer/repository/AbstractIndexedRepo.java | 50 +- .../repository/CachingUriResourceHandle.java | 2 +- .../bnd/deployer/repository/FixedIndexedRepo.java | 40 +- .../bnd/deployer/repository/LocalIndexedRepo.java | 39 +- .../bnd/deployer/repository/RepoResourceUtils.java | 2 +- .../deployer/repository/ReporterLogService.java | 6 +- .../providers/KnownBundleAnalyzerPlugin.java | 5 +- .../repository/wrapper/InfoRepositoryWrapper.java | 227 + .../bnd/deployer/repository/wrapper/Plugin.java | 140 + .../bnd/deployer/repository/wrapper}/packageinfo | 0 biz.aQute.repository/src/aQute/bnd/jpm/Index.java | 284 + .../src/aQute/bnd/jpm/Repository.java | 2082 ++++++ .../src/aQute/bnd/jpm/ResourceDescriptorImpl.java | 39 + .../src/aQute/bnd/jpm/StoredRevisionCache.java | 283 + .../src/aQute/bnd/jpm}/packageinfo | 0 biz.aQute.repository/src/test/lib/NanoHTTPD.java | 4 +- .../aQute/bnd/deployer/http/HttpConnectorTest.java | 15 +- .../bnd/deployer/http/HttpRedirectionTest.java | 87 + .../test/aQute/bnd/deployer/obr/OBRTest.java | 9 +- .../repository/CachingUriResourceHandlerTest.java | 36 +- .../bnd/deployer/repository/FindProvidersTest.java | 12 +- .../deployer/repository/TestCompressedObrRepo.java | 3 +- .../deployer/repository/TestFixedIndexedRepo.java | 54 +- .../repository/TestLocalIndexGeneration.java | 4 +- .../repository/TestLocalObrGeneration.java | 2 +- .../TestMultipleLocalIndexGeneration.java | 14 +- .../aQute/bnd/deployer/repository/TestObrRepo.java | 3 +- .../repository/providers/TestObrCapReqParsing.java | 3 +- .../deployer/repository/wrapper/TestWrapper.java | 198 + biz.aQute.repository/testdata/with spaces .xml | 3 + .../testdata/ws/cnf/augments.properties | 2 + biz.aQute.repository/testdata/ws/cnf/build.bnd | 11 + biz.aQute.repository/testdata/ws/cnf/jpm4j.json | 11 + .../.settings/org.eclipse.jdt.core.prefs | 6 +- biz.aQute.resolve/bnd.bnd | 22 +- .../src/biz/aQute/resolve/BndResolver.java | 22 + .../biz/aQute/resolve/GenericResolveContext.java | 850 +++ .../src/biz/aQute/resolve/ResolveProcess.java | 537 +- .../src/biz/aQute/resolve/ResolverLogger.java | 61 + .../resolve/internal/BndrunResolveContext.java | 709 +- .../internal/FrameworkResourceRepository.java | 7 +- .../resolve/internal/InternalResolverLogger.java | 20 + .../biz/aQute/resolve/internal/J2SE_1_2.properties | 4 +- .../biz/aQute/resolve/internal/J2SE_1_3.properties | 8 +- .../biz/aQute/resolve/internal/J2SE_1_4.properties | 12 +- .../biz/aQute/resolve/internal/J2SE_1_5.properties | 10 +- .../aQute/resolve/internal/JavaSE_1_6.properties | 9 +- .../aQute/resolve/internal/JavaSE_1_7.properties | 12 +- .../aQute/resolve/internal/JavaSE_1_8.properties | 163 + .../aQute/resolve/internal/JavaSE_1_9.properties | 163 + .../internal/JavaSE_compact1_1_8.properties | 13 + .../internal/JavaSE_compact1_1_9.properties | 13 + .../internal/JavaSE_compact2_1_8.properties | 38 + .../internal/JavaSE_compact2_1_9.properties | 38 + .../internal/JavaSE_compact3_1_8.properties | 69 + .../internal/JavaSE_compact3_1_9.properties | 69 + .../src/biz/aQute/resolve/internal/Utils.java | 2 +- .../src/biz/aQute/resolve/packageinfo | 2 +- .../resolve/repository/InfoRepositoryWrapper.java | 159 - biz.aQute.resolve/src/test/lib/Utils.java | 42 +- .../resolve/internal/BndrunResolveContextTest.java | 214 +- .../internal/GenericResolveContextResolveTest.java | 85 + .../biz/aQute/resolve/internal/ResolveTest.java | 8 +- .../biz/aQute/resolve/repository/JpmRepoTest.java | 188 + .../biz/aQute/resolve/repository/TestWrapper.java | 131 - biz.aQute.resolve/testdata/ws/cnf/build.bnd | 10 + biz.aQute.resolve/testdata/ws/cnf/jpm4j.json | 15 + biz.aQute.resolve/testdata/ws/provider/bnd.bnd | 6 + biz.aQute.resolve/testdata/ws/requirer/bnd.bnd | 12 + bnd-maven-plugin-parent/LICENSE | 177 - bnd-maven-plugin-parent/README.md | 68 - .../bnd-maven-plugin-dependencies/pom.xml | 43 - .../.settings/org.eclipse.jdt.core.prefs | 365 -- 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 | 53 +- cnf/bnd.bnd | 13 + cnf/build-settings.json | Bin 0 -> 1664 bytes cnf/build.bnd | 23 +- cnf/build.gradle | 10 + cnf/build.gradle.properties | 3 - cnf/ext/pluginpaths.bnd | 3 +- cnf/ext/repositories.bnd | 2 +- 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 | 24 + demo/.settings/org.eclipse.jdt.core.prefs | 6 +- demo/bnd.bnd | 9 +- demo/x.bndrun | 4 +- dist/bnd.bnd | 21 + dist/build-settings.gradle | 11 - dist/build.gradle | 108 +- gradle.properties | 6 + org.osgi.impl.bundle.repoindex.ant/.classpath | 7 + org.osgi.impl.bundle.repoindex.ant/.project | 23 + .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 302 + .../.settings/org.eclipse.jdt.ui.prefs | 60 + .../.settings/org.eclipse.mylyn.tasks.ui.prefs | 4 + org.osgi.impl.bundle.repoindex.ant/bnd.bnd | 38 + .../impl/bundle/repoindex/ant/RepoIndexTask.java | 118 + .../taskdef.properties | 1 + .../.classpath | 0 org.osgi.impl.bundle.repoindex.api/.project | 23 + .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 302 + .../.settings/org.eclipse.jdt.ui.prefs | 60 + .../.settings/org.eclipse.mylyn.tasks.ui.prefs | 4 + org.osgi.impl.bundle.repoindex.api/bnd.bnd | 5 + .../src/org/osgi/service/indexer/Builder.java | 83 + .../src/org/osgi/service/indexer/Capability.java | 62 + .../src/org/osgi/service/indexer/Namespaces.java | 71 + .../src/org/osgi/service/indexer/Requirement.java | 62 + .../src/org/osgi/service/indexer/Resource.java | 81 + .../org/osgi/service/indexer/ResourceAnalyzer.java | 68 + .../org/osgi/service/indexer/ResourceIndexer.java | 155 + .../src/org/osgi/service/indexer/packageinfo | 1 + .../.classpath | 0 org.osgi.impl.bundle.repoindex.cli/.project | 23 + .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 302 + .../.settings/org.eclipse.jdt.ui.prefs | 60 + .../.settings/org.eclipse.mylyn.tasks.ui.prefs | 4 + org.osgi.impl.bundle.repoindex.cli/bnd.bnd | 48 + .../impl/bundle/bindex/cli/CommandLineOptions.java | 170 + .../src/org/osgi/impl/bundle/bindex/cli/Index.java | 227 + org.osgi.impl.bundle.repoindex.lib/.classpath | 7 + org.osgi.impl.bundle.repoindex.lib/.project | 23 + .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 302 + .../.settings/org.eclipse.jdt.ui.prefs | 60 + .../.settings/org.eclipse.mylyn.tasks.ui.prefs | 4 + org.osgi.impl.bundle.repoindex.lib/bnd.bnd | 34 + .../service/indexer/impl/BlueprintAnalyzer.java | 53 + .../osgi/service/indexer/impl/BundleAnalyzer.java | 580 ++ .../osgi/service/indexer/impl/ConsoleLogSvc.java | 57 + .../src/org/osgi/service/indexer/impl/EE.java | 99 + .../service/indexer/impl/FlatStreamResource.java | 58 + .../osgi/service/indexer/impl/GeneratorState.java | 59 + .../org/osgi/service/indexer/impl/JarResource.java | 146 + .../service/indexer/impl/KnownBundleAnalyzer.java | 135 + .../org/osgi/service/indexer/impl/MimeType.java | 16 + .../indexer/impl/OSGiFrameworkAnalyzer.java | 112 + .../org/osgi/service/indexer/impl/RepoIndex.java | 366 ++ .../org/osgi/service/indexer/impl/SCRAnalyzer.java | 305 + .../src/org/osgi/service/indexer/impl/Schema.java | 24 + .../src/org/osgi/service/indexer/impl/Util.java | 238 + .../service/indexer/impl/known-bundles.properties | 76 + .../service/indexer/impl/types/ScalarType.java | 5 + .../service/indexer/impl/types/SymbolicName.java | 61 + .../org/osgi/service/indexer/impl/types/Type.java | 82 + .../service/indexer/impl/types/TypedAttribute.java | 34 + .../service/indexer/impl/types/VersionKey.java | 19 + .../service/indexer/impl/types/VersionRange.java | 150 + .../service/indexer/impl/util/AddOnlyList.java | 216 + .../org/osgi/service/indexer/impl/util/Create.java | 61 + .../org/osgi/service/indexer/impl/util/Hex.java | 23 + .../org/osgi/service/indexer/impl/util/Indent.java | 68 + .../osgi/service/indexer/impl/util/OSGiHeader.java | 133 + .../org/osgi/service/indexer/impl/util/Pair.java | 61 + .../service/indexer/impl/util/QuotedTokenizer.java | 118 + .../osgi/service/indexer/impl/util/Reporter.java | 19 + .../org/osgi/service/indexer/impl/util/Tag.java | 482 ++ .../org/osgi/service/indexer/impl/util/Yield.java | 7 + .../org/osgi/service/indexer/osgi/Activator.java | 34 + .../osgi/service/indexer/osgi/AnalyzerTracker.java | 84 + .../org/osgi/service/indexer/osgi/LogTracker.java | 45 + .../org/osgi/service/indexer/osgi/LogUtils.java | 25 + .../osgi/service/indexer/impl/NaughtyAnalyzer.java | 19 + .../org/osgi/service/indexer/impl/NullLogSvc.java | 22 + .../test/org/osgi/service/indexer/impl/TODO.txt | 12 + .../service/indexer/impl/TestBundleAnalyzer.java | 136 + .../test/org/osgi/service/indexer/impl/TestEE.java | 55 + .../org/osgi/service/indexer/impl/TestIndexer.java | 386 ++ .../osgi/service/indexer/impl/TestJarResource.java | 57 + .../org/osgi/service/indexer/impl/TestMacro.java | 33 + .../indexer/impl/TestOSGiFrameworkAnalyzer.java | 82 + .../org/osgi/service/indexer/impl/TestUtils.java | 24 + .../test/org/osgi/service/indexer/impl/Utils.java | 66 + .../osgi/service/indexer/impl/WibbleAnalyzer.java | 19 + .../testdata/empty.txt | 3 + .../testdata/fragment-01.txt | 21 + .../testdata/fragment-02.txt | 21 + .../testdata/fragment-03.txt | 27 + .../testdata/fragment-04.txt | 34 + .../testdata/fragment-05.txt | 24 + .../testdata/fragment-06.txt | 24 + .../testdata/fragment-07.txt | 25 + .../testdata/fragment-08.txt | 16 + .../testdata/fragment-09.txt | 22 + .../testdata/fragment-10.txt | 25 + .../testdata/fragment-11.txt | 25 + .../testdata/fragment-12.txt | 17 + .../testdata/fragment-13.txt | 24 + .../testdata/fragment-14.txt | 28 + .../testdata/fragment-15.txt | 25 + .../testdata/fragment-16.txt | 25 + .../testdata/fragment-17.txt | 25 + .../testdata/fragment-18.txt | 25 + .../testdata/fragment-19.txt | 24 + .../testdata/fragment-20.txt | 25 + .../testdata/fragment-plainjar-versioned.txt | 13 + .../testdata/fragment-plainjar.txt | 12 + .../testdata/fragment-scr1_0.txt | 25 + .../testdata/fragment-scr1_1.txt | 25 + .../testdata/fragment-scr1_2.txt | 25 + .../testdata/fragment-scr_services.txt | 56 + .../testdata/fragment-subdir1.txt | 21 + .../testdata/fragment-subdir2.txt | 21 + .../testdata/fragment-wibble-filtered.txt | 43 + .../testdata/fragment-wibble.txt | 44 + .../testdata/full-03+06-not-pretty.txt | 1 + .../testdata/full-03+06.txt | 54 + .../gemini-blueprint-extender-1.0.0.RELEASE.xml | 170 + .../testdata/known-bundles.properties | 9 + .../testdata/org.apache.aries.blueprint-1.0.0.xml | 181 + .../org.apache.felix.eventadmin-1.2.14.xml | 45 + .../testdata/org.apache.felix.eventadmin-1.3.2.xml | 61 + .../testdata/org.apache.felix.http.jetty-2.2.0.xml | 125 + .../testdata/org.apache.felix.scr-1.6.0.xml | 73 + .../testdata/unpacked.xml | 54 + org.osgi.impl.bundle.repoindex.test/.classpath | 7 + org.osgi.impl.bundle.repoindex.test/.project | 23 + .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 302 + .../.settings/org.eclipse.jdt.ui.prefs | 60 + .../.settings/org.eclipse.mylyn.tasks.ui.prefs | 4 + org.osgi.impl.bundle.repoindex.test/bnd.bnd | 27 + .../org/example/tests/osgi/TestOSGiServices.java | 146 + .../src/org/example/tests/utils/Utils.java | 114 + .../org/example/tests/utils/WibbleAnalyzer.java | 17 + .../src/testdata/expect-pretty.xml | 24 + .../src/testdata/expect-workingdir.xml | 24 + .../src/testdata/expect.xml | 24 + .../src/testdata/fragment-basic.txt | 21 + .../src/testdata/fragment-wibble-filtered.txt | 43 + .../src/testdata/fragment-wibble.txt | 22 + .../org.eclipse.equinox.ds-1.4.0-extra.xml | 151 + .../org.eclipse.equinox.ds-1.4.0-overridden.xml | 142 + ...org.eclipse.equinox.ds-1.4.0.extra-fragment.txt | 148 + .../org.eclipse.equinox.ds-1.4.0.fragment.txt | 145 + .../src/testdata/org.eclipse.equinox.ds-1.4.0.xml | 148 + .../src/testdata/plainjar.fragment.txt | 12 + .../org/example/tests/cli/TestCommandLine.java | 165 + .../tests/standalone/TestStandaloneLibrary.java | 96 + osgi.r5/.settings/org.eclipse.jdt.core.prefs | 6 +- osgi.r5/bnd.bnd | 2 +- settings.gradle | 133 +- 890 files changed, 36721 insertions(+), 34181 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
