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/10/27 08:30:40 UTC
svn commit: r830084 - in /camel/branches/camel-1.x: ./
platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
platforms/karaf/pom.xml
Author: ningjiang
Date: Tue Oct 27 07:30:40 2009
New Revision: 830084
URL: http://svn.apache.org/viewvc?rev=830084&view=rev
Log:
Merged revisions 826977 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r826977 | gertv | 2009-10-20 14:54:55 +0800 (Tue, 20 Oct 2009) | 1 line
CAMEL-2080: Enable features-maven-plugin validate goal for karaf features build
........
Modified:
camel/branches/camel-1.x/ (props changed)
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 Tue Oct 27 07:30:40 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,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819483,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333
+/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,819483,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,826977,828288,828333
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=830084&r1=830083&r2=830084&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Tue Oct 27 07:30:40 2009
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
@@ -42,7 +41,7 @@
<bcel-bundle-version>5.2_1-SNAPSHOT</bcel-bundle-version>
<dom4j-bundle-version>1.6.1_1-SNAPSHOT</dom4j-bundle-version>
<cglib-version>2.1_3_3-SNAPSHOT</cglib-version>
- <commons-beanutils-bundle-version>1.7.0_2-SNAPSHOT</commons-beanutils-bundle-version>
+ <commons-beanutils-bundle-version>1.7.0_1</commons-beanutils-bundle-version>
<commons-dbcp-bundle-version>1.2.2_4-SNAPSHOT</commons-dbcp-bundle-version>
<commons-csv-version>1.0-r706899_2-SNAPSHOT</commons-csv-version>
<commons-codec-bundle-version>1.3_1-SNAPSHOT</commons-codec-bundle-version>
@@ -60,7 +59,7 @@
<geronimo-javamail-1.4-version>1.6_1</geronimo-javamail-1.4-version>
<geronimo-ws-metadata-spec-version>1.1.2</geronimo-ws-metadata-spec-version>
<gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
- <hamcrest-bundle-version>1.2-dev1_1</hamcrest-bundle-version>
+ <hamcrest-bundle-version>1.2-dev1_3</hamcrest-bundle-version>
<hapi-bundle-version>0.5.1_1</hapi-bundle-version>
<ibatis-bundle-version>2.3.4.726_1</ibatis-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
@@ -81,9 +80,7 @@
<jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
<juel-bundle-version>2.1.0_1</juel-bundle-version>
<junit-bundle-version>4.4_1</junit-bundle-version>
- <mvel-bundle-version>2.0.8_2-SNAPSHOT</mvel-bundle-version>
<mina-bundle-version>1.1.7_2-SNAPSHOT</mina-bundle-version>
- <mvel-bundle-version>2.0.9_1</mvel-bundle-version>
<neethi-bundle-version>2.0.4_1</neethi-bundle-version>
<ognl-bundle-version>2.7.3_2-SNAPSHOT</ognl-bundle-version>
<oro-bundle-version>2.0.8_2-SNAPSHOT</oro-bundle-version>
@@ -115,6 +112,36 @@
<woodstox-bundle-version>3.2.7_1</woodstox-bundle-version>
<wsdl4j-bundle-version>1.6.1_1</wsdl4j-bundle-version>
</properties>
+
+ <repositories>
+ <!-- ServiceMix repo (for org.osgi:org.osgi.impl.bundle.jmx) -->
+ <repository>
+ <id>servicemix</id>
+ <name>Apache ServiceMix Repository</name>
+ <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>1.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<resources>
@@ -138,6 +165,20 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.felix.karaf.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>${karaf-version}</version>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
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=830084&r1=830083&r2=830084&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 Tue Oct 27 07:30:40 2009
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<features>
+ <repository>mvn:org.apache.felix.karaf/apache-felix-karaf/${karaf-version}/xml/features</repository>
+ <feature name='camel' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-osgi</feature>
+ </feature>
<feature name='camel-core' version='${pom.version}'>
+ <feature version="${spring-version}">spring</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
@@ -9,22 +16,14 @@
</feature>
<feature name='camel-spring' version='${pom.version}'>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
- <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
+ <feature version='${spring-version}'>spring</feature>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-spring/${pom.version}</bundle>
</feature>
<feature name='camel-osgi' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
- <bundle>mvn:org.springframework.osgi/spring-osgi-io/${spring-osgi-version}</bundle>
- <bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring-osgi-version}</bundle>
- <bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring-osgi-version}</bundle>
- <bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring-osgi-version}</bundle>
+ <feature version='${spring-osgi-version}'>spring-dm</feature>
<bundle>mvn:org.apache.camel/camel-osgi/${pom.version}</bundle>
</feature>
<feature name='camel-cxf' version='${pom.version}'>
@@ -111,6 +110,7 @@
<bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle>
</feature>
<feature name='camel-bam' version='${pom.version}'>
+ <feature>http</feature>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
@@ -119,6 +119,9 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix-specs-version}</bundle>
+ <bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
@@ -147,7 +150,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ftp/${pom.version}</bundle>
</feature>
- <feature name='camel-guice' version='${pom.version}'>
+ <!--feature name='camel-guice' version='${pom.version}'>
<bundle>wrap:mvn:org.guiceyfruit/guiceyfruit-core/${guiceyfruit-version}</bundle>
<bundle>wrap:mvn:org.guiceyfruit/guice-jsr250/${guiceyfruit-version}</bundle>
<bundle>wrap:mvn:org.guiceyfruit/guice-core/${guiceyfruit-version}</bundle>
@@ -155,7 +158,7 @@
<bundle>wrap:mvn:cglib:cglib-nodep/${cglib-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-guice/${pom.version}</bundle>
- </feature>
+ </feature-->
<feature name='camel-groovy' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
@@ -166,11 +169,13 @@
<feature name='camel-hamcrest' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hamcrest/${hamcrest-bundle-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hamcrest/${pom.version}</bundle>
</feature>
<feature name='camel-hl7' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
@@ -186,6 +191,7 @@
<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-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ibatis/${pom.version}</bundle>
</feature>
@@ -279,11 +285,6 @@
<bundle>mvn:org.apache.camel/camel-msv/${pom.version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
</feature>
- <feature name='camel-mvel' version='${pom.version}'>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}</bundle>
- <feature version='${pom.version}'>camel-core</feature>
- <bundle>mvn:org.apache.camel/camel-mvel/${pom.version}</bundle>
- </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-version}</bundle>
@@ -294,37 +295,27 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <bundle>mvn:org.mortbay.jetty/servlet-api/${servlet-api-2.5-version}</bundle>
- <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-quartz/${pom.version}</bundle>
</feature>
<feature name='camel-restlet' version='${pom.version}'>
<bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
- <bundle>mvn:org.restlet/org.restlet/${restlet-version}</bundle>
- <bundle>mvn:com.noelios.restlet/com.noelios.restlet/${restlet-version}</bundle>
+ <bundle>mvn:http://maven.restlet.org!org.restlet/org.restlet/${restlet-version}</bundle>
+ <bundle>mvn:http://maven.restlet.org!com.noelios.restlet/com.noelios.restlet/${restlet-version}</bundle>
<feature version='${pom.version}'>camel-http</feature>
</feature>
<feature name='camel-rmi' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-rmi/${pom.version}</bundle>
</feature>
- <feature name='camel-rss' version='${pom.version}'>
- <feature version='${pom.version}'>camel-atom</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
- <bundle>mvn:rome/rome/1.0</bundle>
- <bundle>mvn:org.apache.camel/camel-rss/${pom.version}</bundle>
- </feature>
<feature name='camel-saxon' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-saxon/${pom.version}</bundle>
</feature>
<feature name='camel-scala' version='${pom.version}'>
- <bundle>mvn:org.scala-lang-osgi/scala-library/${scala-version}</bundle>
+ <bundle>mvn:http://www.scala-tools.com/repo-releases!org.scala-lang-osgi/scala-library/${scala-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-scala/${pom.version}</bundle>
</feature>
@@ -334,7 +325,7 @@
<bundle>mvn:org.apache.camel/camel-script/${pom.version}</bundle>
</feature>
<feature name='camel-spring-integration' version='${pom.version}'>
- <bundle>mvn:org.springframework.integration/org.springframework.integration/1.0.1.RELEASE</bundle>
+ <bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework.integration/org.springframework.integration/1.0.1.RELEASE</bundle>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.camel/camel-spring-integration/${pom.version}</bundle>
</feature>
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=830084&r1=830083&r2=830084&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/pom.xml Tue Oct 27 07:30:40 2009
@@ -34,8 +34,7 @@
<name>Camel :: Platforms :: Apache Karaf</name>
<properties>
- <features-maven-plugin-version>1.1</features-maven-plugin-version>
- <servicemix-kernel-version>1.1.0</servicemix-kernel-version>
+ <karaf-version>1.1.0-SNAPSHOT</karaf-version>
</properties>
<modules>