You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2017/08/11 13:36:15 UTC
svn commit: r1804789 -
/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckRequirementsCapabilities.java
Author: cziegeler
Date: Fri Aug 11 13:36:15 2017
New Revision: 1804789
URL: http://svn.apache.org/viewvc?rev=1804789&view=rev
Log:
Don't check service requirements
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckRequirementsCapabilities.java
Modified: sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckRequirementsCapabilities.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckRequirementsCapabilities.java?rev=1804789&r1=1804788&r2=1804789&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckRequirementsCapabilities.java (original)
+++ sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckRequirementsCapabilities.java Fri Aug 11 13:36:15 2017
@@ -71,6 +71,10 @@ public class CheckRequirementsCapabiliti
List<ArtifactDescriptor> candidates = getCandidates(artifacts, requirement);
if (candidates.isEmpty()) {
+ if ( "osgi.service".equals(requirement.getNamespace()) ){
+ // osgi.service is special - we don't provide errors or warnings in this case
+ continue;
+ }
if (!CapabilityMatcher.isOptional(requirement)) {
ctx.reportError(String.format(format, info.getArtifact().getId().getArtifactId(), info.getArtifact().getId().getVersion(), requirement.toString(), entry.getKey(), "no artifact is providing a matching capability in this start level."));
}