Author: ffang
Date: Fri Sep 2 14:18:13 2011
New Revision: 1164543
URL: http://svn.apache.org/viewvc?rev=1164543&view=rev
Log:
Merged revisions 1164540 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1164540 | ffang | 2011-09-02 22:09:20 +0800 (δΊ”, 02 9 2011) | 1 line
[CAMEL-4407]camel-script feature should ship script implementation bundles
like groovy/javascript/ruby
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1164543&r1=1164542&r2=1164543&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Fri Sep 2
14:18:13 2011
@@ -144,6 +144,9 @@
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<wsdl4j-bundle-version>1.6.2_3</wsdl4j-bundle-version>
<wss4j-version>1.6.1</wss4j-version>
+ <rhino.bundle.version>1.7R1_3</rhino.bundle.version>
+ <scriptengines.version>1.1</scriptengines.version>
+ <asm2.bundle.version>2.2.3_4</asm2.bundle.version>
</properties>
<!-- The validate plugin will export these provided dependencies bundles'
export packages first -->
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1164543&r1=1164542&r2=1164543&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Fri Sep 2 14:18:13 2011
@@ -533,6 +533,14 @@
<feature name='camel-script' version='${pom.version}' resolver='(obr)'
start-level='50'>
<feature version='${pom.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.asm/${asm2.bundle.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.codehaus.groovy/groovy-all/${groovy-version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jruby/${jruby-bundle-version}</bundle>
+
<bundle>mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines.version}</bundle>
+
<bundle>mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines.version}</bundle>
+
<bundle>mvn:com.google.code.scriptengines/scriptengines-jruby/${scriptengines.version}</bundle>
<bundle>mvn:org.apache.camel/camel-script/${pom.version}</bundle>
</feature>
<feature name='camel-sip' version='${pom.version}' resolver='(obr)'
start-level='50'>
