This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit ff7caaf36b5962c7252e161e48b411343eb4f6ec
Merge: 9b43030 9f36d1e
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Fri Feb 23 16:44:08 2018 +0100
Merge pull request #6 from bosschaert/SLING-7512-2
SLING-7512 Order features based on their dependencies.
featuremodel/feature-analyser/pom.xml | 14 +-
.../apache/sling/feature/analyser/Descriptor.java | 4 +-
.../analyser/impl/BundleDescriptorImpl.java | 4 +-
.../task/impl/CheckRequirementsCapabilities.java | 2 +-
.../scanner/impl/FelixFrameworkScanner.java | 2 +-
.../feature/scanner/impl/RepoInitScanner.java | 9 +-
.../sling/feature/analyser/AnalyserTest.java | 21 +-
featuremodel/feature-applicationbuilder/pom.xml | 13 ++
.../feature/applicationbuilder/impl/Main.java | 19 +-
featuremodel/feature-launcher/pom.xml | 5 +
.../feature/launcher/impl/FeatureProcessor.java | 13 +-
featuremodel/feature-modelconverter/pom.xml | 6 +
.../sling/feature/modelconverter/impl/Main.java | 13 +-
.../{feature-launcher => feature-resolver}/pom.xml | 80 +++-----
.../sling/feature/resolver/FrameworkResolver.java | 224 +++++++++++++++++++++
.../feature/resolver/impl/BundleResourceImpl.java | 191 ++++++++++++++++++
.../feature/resolver/impl/ResolveContextImpl.java | 96 +++++++++
.../feature/resolver/FrameworkResolverTest.java | 100 +++++++++
.../resolver/impl/BundleResourceImplTest.java | 182 +++++++++++++++++
.../resolver/impl/ResolveContextImplTest.java | 129 ++++++++++++
.../src/test/resources/feature1.json | 5 +
.../src/test/resources/feature2.json | 5 +
.../src/test/resources/feature3.json | 5 +
.../apache/sling/feature/support/FeatureUtil.java | 11 +-
.../feature/support/json/FeatureJSONReader.java | 31 +--
.../feature/support/json/FeatureJSONWriter.java | 5 +-
.../feature/support/util/CapabilityMatcher.java | 8 +-
.../sling/feature/support/util/ManifestParser.java | 42 ++--
.../sling/feature/support/util/ManifestUtil.java | 8 +-
.../sling/feature/support/util/PackageInfo.java | 6 +
.../support/json/FeatureJSONReaderTest.java | 4 +-
.../org/apache/sling/feature/support/json/U.java | 4 +-
.../support/util/CapabilityMatcherTest.java | 4 +-
.../feature/AbstractCapabilityRequirement.java | 96 +++++++++
.../java/org/apache/sling/feature/Capability.java | 104 ----------
.../java/org/apache/sling/feature/Feature.java | 11 +-
.../org/apache/sling/feature/OSGiCapability.java | 59 ++++++
.../org/apache/sling/feature/OSGiRequirement.java | 59 ++++++
.../java/org/apache/sling/feature/Requirement.java | 113 -----------
.../sling/feature/process/ApplicationBuilder.java | 14 +-
.../apache/sling/feature/process/BuilderUtil.java | 4 +-
.../sling/feature/process/FeatureResolver.java | 38 ++++
.../sling/feature/CapabilityRequirementTest.java | 68 +++++++
.../sling/feature/process/FeatureBuilderTest.java | 39 ++--
featuremodel/pom.xml | 1 +
45 files changed, 1476 insertions(+), 395 deletions(-)
--
To stop receiving notification emails like this one, please contact
cziege...@apache.org.
