fix(cdi): provide JavaAnnotation osgi.contract via system capabilities

The javax.annotation-api jar is already an OSGi bundle and doesn't need
wrapping. The osgi.contract capability required by aries.cdi.extender is
now provided by the system bundle via karaf-capabilities in
config.properties, with javax.annotation packages exported as system
packages extra.

Author: jbonofre

assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties

@@ -91,15 +91,19 @@ org.osgi.framework.system.packages.extra= \
  org.apache.karaf.branding, \
  sun.misc, \
  com.sun.jmx.remote.protocol, \
- com.sun.jmx.remote.protocol.jmxmp
+ com.sun.jmx.remote.protocol.jmxmp, \
+ javax.annotation;version="1.3", \
+ javax.annotation.security;version="1.3", \
+ javax.annotation.sql;version="1.3"
 
 org.osgi.framework.system.capabilities= \
  ${eecap-${java.specification.version}}, \
  ${${karaf.framework}-capabilities}, \
  ${karaf-capabilities}
 
 karaf-capabilities= \
- osgi.service;objectClass:List<String>=org.apache.karaf.info.ServerInfo
+ osgi.service;objectClass:List<String>=org.apache.karaf.info.ServerInfo, \
+ osgi.contract;osgi.contract=JavaAnnotation;uses:="javax.annotation,javax.annotation.security,javax.annotation.sql";version:List<Version>="1.3,1.2,1.1,1"
 
 felix-capabilities= \
  osgi.service;objectClass:List<String>=org.osgi.service.packageadmin.PackageAdmin, \

assemblies/features/specs/src/main/feature/feature.xml

@@ -155,7 +155,7 @@
     <!-- cdi -->
     <feature name="cdi" version="1.1.3">
         <feature prerequisite="true">spifly</feature>
-        <bundle dependency="true">wrap:mvn:javax.annotation/javax.annotation-api/${annotation-api.version}$overwrite=merge&amp;Provide-Capability=osgi.contract;osgi.contract=JavaAnnotation;version:Version=1.3;uses:="javax.annotation,javax.annotation.security,javax.annotation.sql"</bundle>
+        <bundle dependency="true">mvn:javax.annotation/javax.annotation-api/${annotation-api.version}</bundle>
         <bundle>mvn:org.apache.xbean/xbean-bundleutils/4.17</bundle>
         <bundle>mvn:org.apache.xbean/xbean-asm8-shaded/4.17</bundle>
         <bundle>mvn:org.apache.xbean/xbean-finder-shaded/4.17</bundle>

itests/test/src/test/filtered-resources/etc/config.properties

@@ -91,14 +91,18 @@ org.osgi.framework.system.packages.extra= \
  org.apache.karaf.branding, \
  org.apache.karaf.jaas.boot.principal, \
  org.apache.karaf.jaas.boot, \
- sun.misc
+ sun.misc, \
+ javax.annotation;version="1.3", \
+ javax.annotation.security;version="1.3", \
+ javax.annotation.sql;version="1.3"
 
 org.osgi.framework.system.capabilities= \
  ${eecap-${java.specification.version}}, \
  osgi.service;effective:=active;objectClass=org.osgi.service.packageadmin.PackageAdmin, \
  osgi.service;effective:=active;objectClass=org.osgi.service.resolver.Resolver, \
  osgi.service;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \
- osgi.service;effective:=active;objectClass=org.osgi.service.url.URLHandlers
+ osgi.service;effective:=active;objectClass=org.osgi.service.url.URLHandlers, \
+ osgi.contract;osgi.contract=JavaAnnotation;uses:="javax.annotation,javax.annotation.security,javax.annotation.sql";version:List<Version>="1.3,1.2,1.1,1"
 
 eecap-18 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
  osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0", \