Repository: camel Updated Branches: refs/heads/camel-2.17.x 00cb4b89b -> 472d2f937
CAMEL-9902 : Remove ServiceMix scripting-api from Karaf features Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/472d2f93 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/472d2f93 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/472d2f93 Branch: refs/heads/camel-2.17.x Commit: 472d2f93784896257a930e431cbf2049864b99cf Parents: 00cb4b8 Author: lburgazzoli <lburgazz...@gmail.com> Authored: Fri Apr 22 15:38:41 2016 +0200 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Fri Apr 22 15:40:53 2016 +0200 ---------------------------------------------------------------------- platforms/karaf/features/src/main/resources/features.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/472d2f93/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 1d25534..fc1834f 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -568,8 +568,7 @@ </feature> <feature name='camel-groovy' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle> <bundle>mvn:org.apache.camel/camel-groovy/${project.version}</bundle> </feature> @@ -601,7 +600,6 @@ <feature name='camel-hazelcast' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <feature>transaction</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.eclipsesource.minimal-json/minimal-json/${minimal-json-version}</bundle> <bundle dependency='true'>mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle> <bundle dependency='true'>mvn:com.hazelcast/hazelcast-client/${hazelcast-version}</bundle> @@ -1363,24 +1361,20 @@ <feature name='camel-script-jruby' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-script</feature> <bundle>mvn:com.google.code.scriptengines/scriptengines-jruby/${scriptengines-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:org.jruby/jruby-complete/${jruby-version}</bundle> </feature> <feature name='camel-script-javascript' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-script</feature> <bundle>mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino-bundle-version}</bundle> </feature> <feature name='camel-script-groovy' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-script</feature> <bundle>mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle> </feature> <feature name='camel-script' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-script/${project.version}</bundle>