Author: davsclaus
Date: Thu Dec 9 06:54:19 2010
New Revision: 1043847
URL: http://svn.apache.org/viewvc?rev=1043847&view=rev
Log:
CAMEL-3404: Using hawtdb from central repo. Thanks to Jean for patch.
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=1043847&r1=1043846&r2=1043847&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Thu Dec 9 06:54:19 2010
@@ -61,7 +61,6 @@
<flatpack-bundle-version>3.2.0_1</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>
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=1043847&r1=1043846&r2=1043847&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
Thu Dec 9 06:54:19 2010
@@ -295,8 +295,8 @@
</feature>
<feature name='camel-hawtdb' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<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.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle>
+ <bundle>mvn: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}'>
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=1043847&r1=1043846&r2=1043847&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
Dec 9 06:54:19 2010
@@ -310,9 +310,9 @@
<bundle>mvn:org.apache.camel/camel-hl7/${pom.version}</bundle>
</feature>
<feature name='camel-hawtdb' version='${pom.version}'>
- <feature version='${pom.version}'>camel-core</feature>
-
<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>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle>
+ <bundle>mvn: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}'>
