You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/06/19 23:10:31 UTC
[sling-whiteboard] branch master updated: [r2f] minor format and
added inline comments
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new c45f5a4 [r2f] minor format and added inline comments
c45f5a4 is described below
commit c45f5a4ba62f5250beed9d02c7760a58d3876ea1
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Thu Jun 20 01:06:54 2019 +0200
[r2f] minor format and added inline comments
---
.../impl/RuntimeEnvironment2FeatureModelService.java | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/runtime2feature/src/main/java/org/apache/sling/feature/r2f/impl/RuntimeEnvironment2FeatureModelService.java b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/impl/RuntimeEnvironment2FeatureModelService.java
index e4ea07b..8859c67 100644
--- a/runtime2feature/src/main/java/org/apache/sling/feature/r2f/impl/RuntimeEnvironment2FeatureModelService.java
+++ b/runtime2feature/src/main/java/org/apache/sling/feature/r2f/impl/RuntimeEnvironment2FeatureModelService.java
@@ -128,15 +128,17 @@ public class RuntimeEnvironment2FeatureModelService implements RuntimeEnvironmen
Feature runtimeFeature = getRuntimeFeature();
return compareFeatures(new DiffRequest()
- .setPrevious(launchFeature)
- .setCurrent(runtimeFeature)
- .addIncludeComparator("bundles")
- .addIncludeComparator("configurations")
- .setResultId(new ArtifactId(runtimeFeature.getId().getGroupId(),
- runtimeFeature.getId().getArtifactId(),
- runtimeFeature.getId().getVersion(),
- runtimeFeature.getId().getClassifier() + "_updater",
- runtimeFeature.getId().getType())));
+ .setPrevious(launchFeature)
+ .setCurrent(runtimeFeature)
+ .addIncludeComparator("bundles")
+ .addIncludeComparator("configurations")
+ // framework-properties can not be scanned in the BundleContext ATM
+ // extensions can not be computed at runtime
+ .setResultId(new ArtifactId(runtimeFeature.getId().getGroupId(),
+ runtimeFeature.getId().getArtifactId(),
+ runtimeFeature.getId().getVersion(),
+ runtimeFeature.getId().getClassifier() + "_updater",
+ runtimeFeature.getId().getType())));
}
}