Author: ningjiang
Date: Tue Jul 6 05:02:48 2010
New Revision: 960784
URL: http://svn.apache.org/viewvc?rev=960784&view=rev
Log:
Update the features files
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=960784&r1=960783&r2=960784&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Jul 6 05:02:48 2010
@@ -68,6 +68,7 @@
<groovy-version>1.7.3</groovy-version>
<guiceyfruit-version>2.0</guiceyfruit-version>
<hamcrest-version>1.2-dev1</hamcrest-version>
+ <hawtbuf-version>1.0</hawtbuf-version>
<hawtdb-version>1.1</hawtdb-version>
<hibernate-version>3.2.6.ga</hibernate-version>
<hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=960784&r1=960783&r2=960784&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Jul 6 05:02:48 2010
@@ -60,6 +60,7 @@
<flatpack-bundle-version>3.1.1_3</flatpack-bundle-version>
<felix.configadmin.version>1.2.4</felix.configadmin.version>
<felix.framework.version>2.0.5</felix.framework.version>
+
<fuse-maven-repo-url>http://repo.fusesource.com/nexus/content/groups/public</fuse-maven-repo-url>
<freemarker-bundle-version>2.3.15_3</freemarker-bundle-version>
<geronimo-el-version>1.0.1</geronimo-el-version>
<geronimo-jsp-version>1.0.1</geronimo-jsp-version>
@@ -73,7 +74,6 @@
<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>
-
<hawtdb-maven-repo-url>http://hawtdb.fusesource.org/repo/snapshot</hawtdb-maven-repo-url>
<httpcore-bundle-version>4.0-alpha6_1</httpcore-bundle-version>
<irclib-bundle-version>1.10_2</irclib-bundle-version>
<isorelax-bundle-version>20050913_1</isorelax-bundle-version>
@@ -105,6 +105,7 @@
<quartz-bundle-version>1.8.3_1</quartz-bundle-version>
<qpid-bundle-version>0.5.0_2</qpid-bundle-version>
<saxon-bundle-version>9.1.0.1_3</saxon-bundle-version>
+ <scala-bundle-version>2.8.0.RC7_1</scala-bundle-version>
<servicemix-specs-version>1.5.0</servicemix-specs-version>
<jaxws.api.version>2.1</jaxws.api.version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml?rev=960784&r1=960783&r2=960784&view=diff
==============================================================================
---
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
(original)
+++
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
Tue Jul 6 05:02:48 2010
@@ -288,7 +288,8 @@
</feature>
<feature name='camel-hawtdb' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:${hawtdb-maven-repo-url}!org.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle>
+
<bundle>mvn:${fuse-maven-repo-url}!org.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle>
+
<bundle>mvn:${fuse-maven-repo-url}!org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hawtdb/${pom.version}</bundle>
</feature>
<feature name='camel-ibatis' version='${pom.version}'>
@@ -460,7 +461,7 @@
<bundle>mvn:org.apache.camel/camel-saxon/${pom.version}</bundle>
</feature>
<feature name='camel-scala' version='${pom.version}'>
-
<bundle>mvn:http://scala-tools.org/repo-releases!org.scala-lang-osgi/scala-library/${scala-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-scala/${pom.version}</bundle>
</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=960784&r1=960783&r2=960784&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Jul 6 05:02:48 2010
@@ -278,7 +278,8 @@
</feature>
<feature name='camel-hawtdb' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:${hawtdb-maven-repo-url}!org.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle>
+
<bundle>mvn:${fuse-maven-repo-url}!org.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle>
+
<bundle>mvn:${fuse-maven-repo-url}!org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hawtdb/${pom.version}</bundle>
</feature>
<feature name='camel-hl7' version='${pom.version}'>
@@ -463,7 +464,7 @@
<bundle>mvn:org.apache.camel/camel-saxon/${pom.version}</bundle>
</feature>
<feature name='camel-scala' version='${pom.version}'>
-
<bundle>mvn:http://scala-tools.org/repo-releases!org.scala-lang-osgi/scala-library/${scala-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-scala/${pom.version}</bundle>
</feature>
