Author: ningjiang
Date: Thu Feb 25 09:24:28 2010
New Revision: 916190
URL: http://svn.apache.org/viewvc?rev=916190&view=rev
Log:
Merged revisions 916096 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Also update the features validate plugin and fixed the validate issue
........
r916096 | ningjiang | 2010-02-25 10:54:05 +0800 (Thu, 25 Feb 2010) | 1 line
CAMEL-2490 Applied patch with thanks to Christian
........
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/pom.xml
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
camel/branches/camel-1.x/platforms/karaf/pom.xml
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 09:24:28 2010
@@ -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,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876,887196,895119,896772,898201,901634,902688,903638,903970,904365,904440,904442,905171,905241,905585,905883,906013,906068,906342,908925,909028
+/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,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876,887196,895119,896772,898201,901634,902688,903638,903970,904365,904440,904442,905171,905241,905585,905883,906013,906068,906342,908925,909028,916096
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=916190&r1=916189&r2=916190&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-mail/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-mail/pom.xml Thu Feb 25 09:24:28
2010
@@ -37,7 +37,7 @@
</properties>
<repositories>
- <!-- for jvnet mock-mail -->
+ <!-- for javax mail and jvnet mock-mail -->
<repository>
<id>java.net.m2</id>
<name>Java.net Repository for Maven</name>
@@ -61,8 +61,9 @@
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javax-mail-version}</version>
</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=916190&r1=916189&r2=916190&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-ognl/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-ognl/pom.xml Thu Feb 25 09:24:28
2010
@@ -36,6 +36,13 @@
<camel.osgi.export.pkg>org.apache.camel.language.ognl.*</camel.osgi.export.pkg>
</properties>
+ <repositories>
+ <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>
<dependency>
@@ -45,6 +52,19 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.ognl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- using the javassist from spring osgi bundle repo -->
+ <dependency>
+ <groupId>org.jboss.javassist</groupId>
+ <artifactId>com.springsource.javassist</artifactId>
+ <version>${javassist-version}</version>
</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=916190&r1=916189&r2=916190&view=diff
==============================================================================
--- camel/branches/camel-1.x/parent/pom.xml (original)
+++ camel/branches/camel-1.x/parent/pom.xml Thu Feb 25 09:24:28 2010
@@ -55,8 +55,9 @@
<spring-osgi-version>1.1.2</spring-osgi-version>
<mina-version>1.1.7</mina-version>
<uface-version>1.0-m1</uface-version>
+ <javassist-version>3.9.0.GA</javassist-version>
+ <javax-mail-version>1.4.3</javax-mail-version>
<jaxb-version>2.1.6</jaxb-version>
- <javax-mail-version>1.4.1_2</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>
@@ -895,13 +896,6 @@
<artifactId>hsqldb</artifactId>
<version>${hsqldb-version}</version>
</dependency>
-
- <!-- optional JavaMail -->
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
- <version>${javax-mail-version}</version>
- </dependency>
<!-- optional XStream -->
<dependency>
Modified: camel/branches/camel-1.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?rev=916190&r1=916189&r2=916190&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Thu Feb 25
09:24:28 2010
@@ -69,7 +69,6 @@
<irclib-bundle-version>1.10_2</irclib-bundle-version>
<isorelax-bundle-version>20050913_1</isorelax-bundle-version>
<java-persistence-api-version>1.3.0.2-fuse</java-persistence-api-version>
- <javax-mail-version>1.4.1_2</javax-mail-version>
<jcr-bundle-version>1.0_2</jcr-bundle-version>
<jdom-bundle-version>1.1_2</jdom-bundle-version>
<jettison-bundle-version>1.1</jettison-bundle-version>
@@ -191,7 +190,7 @@
</plugins>
</build>
- <!--profiles>
+ <profiles>
<profile>
<id>validate</id>
<build>
@@ -199,7 +198,7 @@
<plugin>
<groupId>org.apache.felix.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<executions>
<execution>
<id>validate</id>
@@ -209,9 +208,16 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
</profile>
- </profiles-->
+ </profiles>
</project>
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=916190&r1=916189&r2=916190&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
Thu Feb 25 09:24:28 2010
@@ -53,7 +53,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${axiom-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax.mail/${javax-mail-version}</bundle>
+ <bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jaxws_2.1_spec/${geronimo-jaxws-spec-version}</bundle>
@@ -71,6 +71,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-http/${pom.version}</bundle>
</feature>
<feature name='camel-mina' version='${pom.version}'>
@@ -262,7 +263,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.bundles/org.apache.servicemix.bundles.javax.mail/${javax-mail-version}</bundle>
+ <bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mail/${pom.version}</bundle>
</feature>
@@ -277,6 +278,7 @@
<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:http://repository.springsource.com/maven/bundles/external!org.jboss.javassist/com.springsource.javassist/${javassist-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ognl/${pom.version}</bundle>
</feature>
<feature name='camel-quartz' version='${pom.version}'>
Modified: camel/branches/camel-1.x/platforms/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/pom.xml?rev=916190&r1=916189&r2=916190&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/pom.xml Thu Feb 25 09:24:28 2010
@@ -78,6 +78,14 @@
<enabled>false</enabled>
</snapshots>
</repository>
+
+ <!-- Java.net Repository for javax mail -->
+ <repository>
+ <id>java.net.m2</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
+ </repository>
</repositories>
<build>
