You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/09/20 08:14:26 UTC
svn commit: r998792 - in /camel/trunk/platforms/karaf/features: pom.xml
src/main/resources/features-spring2.xml src/main/resources/features.xml
Author: ningjiang
Date: Mon Sep 20 06:14:25 2010
New Revision: 998792
URL: http://svn.apache.org/viewvc?rev=998792&view=rev
Log:
Update the camel-jasypt and camel-bean-validator feature
Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=998792&r1=998791&r2=998792&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Mon Sep 20 06:14:25 2010
@@ -72,6 +72,7 @@
<ibatis-bundle-version>2.3.4.726_2</ibatis-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
<jaxb-bundle-version>2.1.13_1</jaxb-bundle-version>
+ <jasypt-bundle-version>1.6_1</jasypt-bundle-version>
<jetty6-bundle-version>6.1.22_1</jetty6-bundle-version>
<jexcelapi-bundle-version>2.4.2_2</jexcelapi-bundle-version>
<hapi-bundle-version>0.5.1_3</hapi-bundle-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=998792&r1=998791&r2=998792&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml Mon Sep 20 06:14:25 2010
@@ -217,6 +217,7 @@
<feature name='camel-bean-validator' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/${servicemix-specs-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hibernate-validator/${hibernate-validator-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-bean-validator/${pom.version}</bundle>
</feature>
@@ -245,7 +246,6 @@
</feature>
<feature name='camel-flatpack' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
- <bundle>wrap:mvn:org.slf4j/slf4j-api/${slf4j-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}</bundle>
@@ -316,7 +316,7 @@
<bundle>mvn:org.apache.camel/camel-jasypt/${pom.version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle>wrap:mvn:com.ibm.icu/icu4j/${icu4j-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt-bundle-version}</bundle>
</feature>
<feature name='camel-jaxb' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=998792&r1=998791&r2=998792&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon Sep 20 06:14:25 2010
@@ -318,7 +318,7 @@
<bundle>mvn:org.apache.camel/camel-jasypt/${pom.version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle>wrap:mvn:com.ibm.icu/icu4j/${icu4j-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt-bundle-version}</bundle>
</feature>
<feature name='camel-jaxb' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
@@ -591,6 +591,7 @@
<feature name='camel-bean-validator' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/${servicemix-specs-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hibernate-validator/${hibernate-validator-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-bean-validator/${pom.version}</bundle>
</feature>