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 09:49:44 UTC
svn commit: r814510 - in /camel/branches/camel-1.x: ./
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 07:49:44 2009
New Revision: 814510
URL: http://svn.apache.org/viewvc?rev=814510&view=rev
Log:
Merged revisions 814493 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r814493 | ningjiang | 2009-09-14 14:35:46 +0800 (Mon, 14 Sep 2009) | 1 line
CAMEL-1819 fixed the features file version errors
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-mail/pom.xml
camel/branches/camel-1.x/components/camel-ognl/pom.xml
camel/branches/camel-1.x/parent/pom.xml
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 07:49:44 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801960,802307,802478,803559,807476,810751,812937
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801960,802307,802478,803559,807476,810751,812937,814493
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-mail/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-mail/pom.xml?rev=814510&r1=814509&r2=814510&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-mail/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-mail/pom.xml Mon Sep 14 07:49:44 2009
@@ -61,8 +61,8 @@
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
</dependency>
<!-- these 2 jars are buggy and not recommended to use -->
Modified: camel/branches/camel-1.x/components/camel-ognl/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-ognl/pom.xml?rev=814510&r1=814509&r2=814510&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-ognl/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-ognl/pom.xml Mon Sep 14 07:49:44 2009
@@ -43,9 +43,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/branches/camel-1.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=814510&r1=814509&r2=814510&view=diff
==============================================================================
--- camel/branches/camel-1.x/parent/pom.xml (original)
+++ camel/branches/camel-1.x/parent/pom.xml Mon Sep 14 07:49:44 2009
@@ -56,6 +56,7 @@
<mina-version>1.1.7</mina-version>
<uface-version>1.0-m1</uface-version>
<jaxb-version>2.1.6</jaxb-version>
+ <javax-mail-version>1.4.1_1-SNAPSHOT</javax-mail-version>
<jaxb-api-version>2.1</jaxb-api-version>
<stax-api-version>1.0.1</stax-api-version>
<log4j-version>1.2.14</log4j-version>
@@ -72,8 +73,9 @@
<hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
<hsqldb-version>1.8.0.7</hsqldb-version>
<groovy-version>1.5.6</groovy-version>
- <guiceyfruit-version>2.0-beta-4</guiceyfruit-version>
+ <guiceyfruit-version>2.0</guiceyfruit-version>
<junit-version>3.8.2</junit-version>
+ <ognl-version>2.7.3_1</ognl-version>
<saxon-version>9.1.0.1</saxon-version>
<scala-version>2.7.3</scala-version>
<scala-plugin-version>2.9.1</scala-plugin-version>
@@ -752,6 +754,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 Saxon support-->
<dependency>
@@ -837,9 +846,9 @@
<!-- optional JavaMail -->
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</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/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml?rev=814510&r1=814509&r2=814510&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml Mon Sep 14 07:49:44 2009
@@ -150,7 +150,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>
@@ -276,8 +276,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:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.geronimo-javamail_1.4_provider/${geronimo-javamail-1.4-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>
@@ -296,7 +295,7 @@
</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.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}'>
Re: svn commit: r814510 - in /camel/branches/camel-1.x: ./ components/camel-mail/pom.xml
components/camel-ognl/pom.xml parent/pom.xml platforms/karaf/features/src/main/resources/features.xml
Posted by Willem Jiang <wi...@gmail.com>.
After digging the code for a while, I found there are some API change on
the camel-guice, so I agree to revert the change and keep the
guiceyfruit version to 2.0-beta-4.
I just committed the patch for it, also updated the features file for
camel-guice.
Willem
Willem Jiang wrote:
> Hi Guillaume,
>
> I'm sorry. It's my fault to think upgrading the guiceyfruit version too
> easy.
> I will commit a right upgrade patch today.
>
> Willem
>
> Guillaume Nodet wrote:
>> The upgrade to guiceyfruit 2.0 leads to compilation failures.
>> I'll revert to 2.0-beta-4 unless someone wants to do the upgrade
>> correctly.
>>
>> On Mon, Sep 14, 2009 at 09:49, <ni...@apache.org> wrote:
>>> Author: ningjiang
>>> Date: Mon Sep 14 07:49:44 2009
>>> New Revision: 814510
>>>
>>> URL: http://svn.apache.org/viewvc?rev=814510&view=rev
>>> Log:
>>> Merged revisions 814493 via svnmerge from
>>> https://svn.apache.org/repos/asf/camel/trunk
>>>
>>>
>>> Modified: camel/branches/camel-1.x/parent/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=814510&r1=814509&r2=814510&view=diff
>>>
>>> ==============================================================================
>>>
>>> --- camel/branches/camel-1.x/parent/pom.xml (original)
>>> +++ camel/branches/camel-1.x/parent/pom.xml Mon Sep 14 07:49:44 2009
>>> @@ -56,6 +56,7 @@
>>> <mina-version>1.1.7</mina-version>
>>> <uface-version>1.0-m1</uface-version>
>>> <jaxb-version>2.1.6</jaxb-version>
>>> + <javax-mail-version>1.4.1_1-SNAPSHOT</javax-mail-version>
>>> <jaxb-api-version>2.1</jaxb-api-version>
>>> <stax-api-version>1.0.1</stax-api-version>
>>> <log4j-version>1.2.14</log4j-version>
>>> @@ -72,8 +73,9 @@
>>>
>>> <hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
>>>
>>> <hsqldb-version>1.8.0.7</hsqldb-version>
>>> <groovy-version>1.5.6</groovy-version>
>>> - <guiceyfruit-version>2.0-beta-4</guiceyfruit-version>
>>> + <guiceyfruit-version>2.0</guiceyfruit-version>
>>> <junit-version>3.8.2</junit-version>
>>> + <ognl-version>2.7.3_1</ognl-version>
>>> <saxon-version>9.1.0.1</saxon-version>
>>> <scala-version>2.7.3</scala-version>
>>> <scala-plugin-version>2.9.1</scala-plugin-version>
>>> @@ -752,6 +754,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 Saxon support-->
>>> <dependency>
>>> @@ -837,9 +846,9 @@
>>>
>>> <!-- optional JavaMail -->
>>> <dependency>
>>> - <groupId>javax.mail</groupId>
>>> - <artifactId>mail</artifactId>
>>> - <version>1.4</version>
>>> + <groupId>org.apache.servicemix.bundles</groupId>
>>> +
>>> <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
>>> + <version>${javax-mail-version}</version>
>>> </dependency>
>>>
>>> <!-- optional XStream -->
>>>
>>
>>
>>
>
>
Re: svn commit: r814510 - in /camel/branches/camel-1.x: ./ components/camel-mail/pom.xml
components/camel-ognl/pom.xml parent/pom.xml platforms/karaf/features/src/main/resources/features.xml
Posted by Willem Jiang <wi...@gmail.com>.
Hi Guillaume,
I'm sorry. It's my fault to think upgrading the guiceyfruit version too
easy.
I will commit a right upgrade patch today.
Willem
Guillaume Nodet wrote:
> The upgrade to guiceyfruit 2.0 leads to compilation failures.
> I'll revert to 2.0-beta-4 unless someone wants to do the upgrade correctly.
>
> On Mon, Sep 14, 2009 at 09:49, <ni...@apache.org> wrote:
>> Author: ningjiang
>> Date: Mon Sep 14 07:49:44 2009
>> New Revision: 814510
>>
>> URL: http://svn.apache.org/viewvc?rev=814510&view=rev
>> Log:
>> Merged revisions 814493 via svnmerge from
>> https://svn.apache.org/repos/asf/camel/trunk
>>
>>
>> Modified: camel/branches/camel-1.x/parent/pom.xml
>> URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=814510&r1=814509&r2=814510&view=diff
>> ==============================================================================
>> --- camel/branches/camel-1.x/parent/pom.xml (original)
>> +++ camel/branches/camel-1.x/parent/pom.xml Mon Sep 14 07:49:44 2009
>> @@ -56,6 +56,7 @@
>> <mina-version>1.1.7</mina-version>
>> <uface-version>1.0-m1</uface-version>
>> <jaxb-version>2.1.6</jaxb-version>
>> + <javax-mail-version>1.4.1_1-SNAPSHOT</javax-mail-version>
>> <jaxb-api-version>2.1</jaxb-api-version>
>> <stax-api-version>1.0.1</stax-api-version>
>> <log4j-version>1.2.14</log4j-version>
>> @@ -72,8 +73,9 @@
>> <hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
>> <hsqldb-version>1.8.0.7</hsqldb-version>
>> <groovy-version>1.5.6</groovy-version>
>> - <guiceyfruit-version>2.0-beta-4</guiceyfruit-version>
>> + <guiceyfruit-version>2.0</guiceyfruit-version>
>> <junit-version>3.8.2</junit-version>
>> + <ognl-version>2.7.3_1</ognl-version>
>> <saxon-version>9.1.0.1</saxon-version>
>> <scala-version>2.7.3</scala-version>
>> <scala-plugin-version>2.9.1</scala-plugin-version>
>> @@ -752,6 +754,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 Saxon support-->
>> <dependency>
>> @@ -837,9 +846,9 @@
>>
>> <!-- optional JavaMail -->
>> <dependency>
>> - <groupId>javax.mail</groupId>
>> - <artifactId>mail</artifactId>
>> - <version>1.4</version>
>> + <groupId>org.apache.servicemix.bundles</groupId>
>> + <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
>> + <version>${javax-mail-version}</version>
>> </dependency>
>>
>> <!-- optional XStream -->
>>
>
>
>
Re: svn commit: r814510 - in /camel/branches/camel-1.x: ./
components/camel-mail/pom.xml components/camel-ognl/pom.xml parent/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Posted by Guillaume Nodet <gn...@gmail.com>.
The upgrade to guiceyfruit 2.0 leads to compilation failures.
I'll revert to 2.0-beta-4 unless someone wants to do the upgrade correctly.
On Mon, Sep 14, 2009 at 09:49, <ni...@apache.org> wrote:
> Author: ningjiang
> Date: Mon Sep 14 07:49:44 2009
> New Revision: 814510
>
> URL: http://svn.apache.org/viewvc?rev=814510&view=rev
> Log:
> Merged revisions 814493 via svnmerge from
> https://svn.apache.org/repos/asf/camel/trunk
>
>
> Modified: camel/branches/camel-1.x/parent/pom.xml
> URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=814510&r1=814509&r2=814510&view=diff
> ==============================================================================
> --- camel/branches/camel-1.x/parent/pom.xml (original)
> +++ camel/branches/camel-1.x/parent/pom.xml Mon Sep 14 07:49:44 2009
> @@ -56,6 +56,7 @@
> <mina-version>1.1.7</mina-version>
> <uface-version>1.0-m1</uface-version>
> <jaxb-version>2.1.6</jaxb-version>
> + <javax-mail-version>1.4.1_1-SNAPSHOT</javax-mail-version>
> <jaxb-api-version>2.1</jaxb-api-version>
> <stax-api-version>1.0.1</stax-api-version>
> <log4j-version>1.2.14</log4j-version>
> @@ -72,8 +73,9 @@
> <hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
> <hsqldb-version>1.8.0.7</hsqldb-version>
> <groovy-version>1.5.6</groovy-version>
> - <guiceyfruit-version>2.0-beta-4</guiceyfruit-version>
> + <guiceyfruit-version>2.0</guiceyfruit-version>
> <junit-version>3.8.2</junit-version>
> + <ognl-version>2.7.3_1</ognl-version>
> <saxon-version>9.1.0.1</saxon-version>
> <scala-version>2.7.3</scala-version>
> <scala-plugin-version>2.9.1</scala-plugin-version>
> @@ -752,6 +754,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 Saxon support-->
> <dependency>
> @@ -837,9 +846,9 @@
>
> <!-- optional JavaMail -->
> <dependency>
> - <groupId>javax.mail</groupId>
> - <artifactId>mail</artifactId>
> - <version>1.4</version>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
> + <version>${javax-mail-version}</version>
> </dependency>
>
> <!-- optional XStream -->
>
--
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com