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, <ningji...@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 -->
