fix build issue discuss at meeting http://www.globalqss.com/idempiere/irclog/%23idempiere.2015-08-12.log.html - IDEMPIERE-2770 Jenkins build broken

org.adempiere.sdk-feature/adempiere.cquery

@@ -19,7 +19,7 @@
     <cq:advisorNode namePattern="^org\.apache\.xml\.resolver$" componentType="osgi.bundle" versionOverride="[1.2.0,1.3.0)"/>
     <cq:advisorNode namePattern="^org\.apache\.xerces$" componentType="osgi.bundle" versionOverride="[2.9.0,2.9.1)"/>
     <cq:advisorNode namePattern="^org\.apache\.xml\.serializer$" componentType="osgi.bundle" versionOverride="[2.7.1,2.7.2)"/>
-    <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" versionOverride="[4.2.2,4.2.2]"/>
+    <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" componentType="osgi.bundle" versionOverride="[4.2.2,4.2.2]"/>
     <cq:advisorNode namePattern="^org\.objectweb(\..+)?" componentType="osgi.bundle" versionOverride="[5.0.1,5.0.1]"/>
     <cq:advisorNode namePattern="^javax\.jms$" componentType="osgi.bundle" versionOverride="[1.1.0,1.1.1)"/>
     <cq:advisorNode namePattern="^javax\.ejb$" componentType="osgi.bundle" versionOverride="[3.1.1,3.1.2)"/>

org.adempiere.sdk-feature/adempiere.rmap

@@ -10,6 +10,7 @@
   <rm:locator pattern="^org\.eclipse\.jetty\.osgi\-servlet\-api$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.apache\.felix\.webconsole(\..+)?" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.apache\.felix\.inventory" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.apache\.felix\.scr" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^javax\.websocket\-api$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^javax\.annotation\-api$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^javax\.management\.j2ee\-api$" searchPathRef="bundles.maven"/>
@@ -121,6 +122,7 @@
         <maven:entry artifactId="org.apache.felix.webconsole.plugins.ds" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.ds"/>
         <maven:entry artifactId="org.apache.felix.webconsole.plugins.memoryusage" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.memoryusage"/>
         <maven:entry artifactId="org.apache.felix.inventory" groupId="org.apache.felix" name="org.apache.felix.inventory"/>
+        <maven:entry artifactId="org.apache.felix.scr" groupId="org.apache.felix" name="org.apache.felix.scr"/>
       </maven:mappings>
     </rm:provider>
   </rm:searchPath>

org.adempiere.server-feature/feature.xml

@@ -266,6 +266,20 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.felix.inventory"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.felix.scr"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.apache.felix.webconsole.plugins.memoryusage"
          download-size="0"
@@ -483,5 +497,4 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-
 </feature>

org.adempiere.server-feature/server.product

@@ -50,6 +50,8 @@
       <plugin id="org.adempiere.ui.zk" autoStart="true" startLevel="4" />
       <plugin id="org.adempiere.webstore" autoStart="true" startLevel="4" />
       <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.inventory" autoStart="true" startLevel="0" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="0" />
       <plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
       <plugin id="org.apache.felix.webconsole.plugins.packageadmin" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />