Repository: camel Updated Branches: refs/heads/master 2ac6bf92e -> 05c983301
Fix some problems with karaf 4 validation Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/05c98330 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05c98330 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05c98330 Branch: refs/heads/master Commit: 05c983301b050edbc7fc91a3477e8f9d8f9824a6 Parents: 2ac6bf9 Author: Guillaume Nodet <gno...@apache.org> Authored: Tue Mar 15 11:16:34 2016 +0100 Committer: Guillaume Nodet <gno...@apache.org> Committed: Tue Mar 15 11:16:43 2016 +0100 ---------------------------------------------------------------------- platforms/karaf/features/pom.xml | 3 +- .../src/main/resources/config.properties | 67 ++++++++++++++------ 2 files changed, 51 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/05c98330/platforms/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml index 8c72bf2..bc67707 100644 --- a/platforms/karaf/features/pom.xml +++ b/platforms/karaf/features/pom.xml @@ -210,8 +210,9 @@ <feature>framework</feature> </framework> <features> - <feature>camel-*</feature> + <feature>camel|camel-(?!ignite)*</feature> </features> + <configuration>file://${project.build.directory}/classes/config.properties</configuration> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/camel/blob/05c98330/platforms/karaf/features/src/main/resources/config.properties ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/config.properties b/platforms/karaf/features/src/main/resources/config.properties index d85b437..7a78ebc 100755 --- a/platforms/karaf/features/src/main/resources/config.properties +++ b/platforms/karaf/features/src/main/resources/config.properties @@ -21,27 +21,56 @@ # Framework config properties. # org.osgi.framework.system.packages= \ - org.osgi.framework.startlevel;uses:="org.osgi.framework";version="1.0", \ - org.osgi.framework.wiring;uses:="org.osgi.resource,org.osgi.framework";version="1.1", \ - org.osgi.framework.hooks.bundle;uses:="org.osgi.framework";version="1.1", \ - org.osgi.framework.hooks.service;uses:="org.osgi.framework";version="1.1", \ - org.osgi.framework.hooks.resolver;uses:="org.osgi.framework.wiring";version="1.0", \ - org.osgi.framework.launch;uses:="org.osgi.framework";version="1.1", \ - org.osgi.framework.namespace;uses:="org.osgi.resource";version="1.0", \ - org.osgi.framework;version="1.7",\ - org.osgi.framework.hooks.weaving;uses:="org.osgi.framework.wiring";version="1.0",\ - org.osgi.resource;version="1.0",org.osgi.service.url;version="1.0",\ - org.osgi.service.startlevel;uses:="org.osgi.framework";version="1.1",\ - org.osgi.service.packageadmin;uses:="org.osgi.framework";version="1.2",\ - org.osgi.service.url;version="1.0", \ - org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5.1", \ - org.apache.karaf.jaas.boot;version="2.3.3", \ - org.apache.karaf.jaas.boot.principal;version="2.3.3", \ - org.apache.karaf.version;version="2.3.3", \ + org.osgi.dto;version="1.0",\ + org.osgi.resource;version="1.0",\ + org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\ + org.osgi.framework;version="1.8",\ + org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",\ + org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",\ + org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",\ + org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",\ + org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",\ + org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",\ + org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",\ + org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",\ + org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",\ + org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",\ + org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",\ + org.osgi.service.condpermadmin;version="1.1.1";uses:="org.osgi.framework,org.osgi.service.permissionadmin",\ + org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",org.osgi.service.permissionadmin;version="1.2",\ + org.osgi.service.resolver;version="1.0";uses:="org.osgi.resource",\ + org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",\ + org.osgi.service.url;version="1.0",\ + org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework",\ + org.apache.karaf.version;version="${karaf.osgi.version}",\ + org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="${karaf.osgi.version}",\ + org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="${karaf.osgi.version}",\ ${jre-${java.specification.version}} org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.* +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 + +eecap-1.8= 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" +eecap-1.7= 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" +eecap-1.6= 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" +eecap-1.5= 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" +eecap-1.4= 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" +eecap-1.3= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3" +eecap-1.2= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2" + # Standard package set. Note that: # - javax.transaction* is exported with a mandatory attribute # - sun.misc is exported because of the camel-disruptor feature (see the <details> of it inside features.xml) @@ -378,6 +407,7 @@ jre-1.7= \ sun.misc jre-1.8= \ + com.sun.tools.xjc, \ javax.accessibility, \ javax.activation;version="1.1", \ javax.activity, \ @@ -536,4 +566,5 @@ jre-1.8= \ org.w3c.dom.xpath, \ org.xml.sax, \ org.xml.sax.ext, \ - org.xml.sax.helpers \ No newline at end of file + org.xml.sax.helpers, \ + sun.misc
