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 2009/09/14 08:35:46 UTC
svn commit: r814493 - in /camel/trunk: components/camel-cache/pom.xml
components/camel-mail/pom.xml components/camel-ognl/pom.xml parent/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: ningjiang
Date: Mon Sep 14 06:35:46 2009
New Revision: 814493
URL: http://svn.apache.org/viewvc?rev=814493&view=rev
Log:
CAMEL-1819 fixed the features file version errors
Modified:
camel/trunk/components/camel-cache/pom.xml
camel/trunk/components/camel-mail/pom.xml
camel/trunk/components/camel-ognl/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-cache/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/pom.xml?rev=814493&r1=814492&r2=814493&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/pom.xml (original)
+++ camel/trunk/components/camel-cache/pom.xml Mon Sep 14 06:35:46 2009
@@ -39,11 +39,6 @@
<repositories>
<repository>
- <id>servicemix</id>
- <name>Apache ServiceMix Repository</name>
- <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
- </repository>
- <repository>
<id>com.springsource.repository.bundles.external</id>
<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
<url>http://repository.springsource.com/maven/bundles/external</url>
Modified: camel/trunk/components/camel-mail/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/pom.xml?rev=814493&r1=814492&r2=814493&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/pom.xml (original)
+++ camel/trunk/components/camel-mail/pom.xml Mon Sep 14 06:35:46 2009
@@ -42,12 +42,6 @@
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
</repository>
- <!-- for java mail bundle -->
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
</repositories>
<dependencies>
@@ -65,9 +59,8 @@
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>com.springsource.javax.mail</artifactId>
- <version>${javamail-version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
</dependency>
<!-- testing -->
Modified: camel/trunk/components/camel-ognl/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/pom.xml?rev=814493&r1=814492&r2=814493&view=diff
==============================================================================
--- camel/trunk/components/camel-ognl/pom.xml (original)
+++ camel/trunk/components/camel-ognl/pom.xml Mon Sep 14 06:35:46 2009
@@ -41,9 +41,8 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- <version>2.7.3</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.ognl</artifactId>
</dependency>
<!-- testing -->
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=814493&r1=814492&r2=814493&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Sep 14 06:35:46 2009
@@ -54,6 +54,7 @@
<spring-version>2.5.6</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
<mina-version>1.1.7</mina-version>
+ <javax-mail-version>1.4.1_1-SNAPSHOT</javax-mail-version>
<jaxb-version>2.1.10</jaxb-version>
<jaxb-api-version>2.1</jaxb-api-version>
<stax-api-version>1.0.1</stax-api-version>
@@ -74,6 +75,7 @@
<groovy-version>1.6.3</groovy-version>
<guiceyfruit-version>2.0</guiceyfruit-version>
<junit-version>4.4</junit-version>
+ <ognl-version>2.7.3_1</ognl-version>
<pax-exam-version>1.0.0</pax-exam-version>
<pax-tiny-bundle-version>1.0.0</pax-tiny-bundle-version>
<saxon-version>9.1.0.1</saxon-version>
@@ -793,6 +795,13 @@
<artifactId>groovy-engine</artifactId>
<version>20070112</version>
</dependency>
+
+ <!-- optional ognl support -->
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.ognl</artifactId>
+ <version>${ognl-version}</version>
+ </dependency>
<!-- optional Pax support-->
<dependency>
@@ -910,9 +919,9 @@
<!-- optional JavaMail -->
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javamail-version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
+ <version>${javax-mail-version}</version>
</dependency>
<!-- optional XStream -->
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=814493&r1=814492&r2=814493&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 14 06:35:46 2009
@@ -181,7 +181,7 @@
<bundle>mvn:org.apache.camel/camel-ftp/${pom.version}</bundle>
</feature>
<feature name='camel-guice' version='${pom.version}'>
- <bundle>mvn:org.guiceyfruit/guiceyfruit-core/${guicyfruit-version}</bundle>
+ <bundle>mvn:org.guiceyfruit/guiceyfruit-core/${guiceyfruit-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-guice/${pom.version}</bundle>
</feature>
@@ -307,8 +307,7 @@
<feature name='camel-mail' version='${pom.version}'>
<bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
- <bundle>mvn:javax.activation/com.springsource.javax.activation/${spring-javax-activation-version}</bundle>
- <bundle>mvn:javax.mail/com.springsource.javax.mail/${spring-javax-mail-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax.mail/${javax-mail-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mail/${pom.version}</bundle>
</feature>
@@ -327,8 +326,8 @@
</feature>
<feature name='camel-ognl' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-bundle-version></bundle>
- <bundle>mvn:org.apache.camel/camel-ognl/${pom.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-version></bundle>
+ <bundle>mvn:org.apache.camel/camel-ognl/'${pom.version}'</bundle>
</feature>
<feature name='camel-quartz' version='${pom.version}'>
<bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>