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 2011/06/22 16:01:28 UTC
svn commit: r1138471 - in /camel/trunk: components/camel-atom/pom.xml
parent/pom.xml platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: ningjiang
Date: Wed Jun 22 14:01:28 2011
New Revision: 1138471
URL: http://svn.apache.org/viewvc?rev=1138471&view=rev
Log:
CAMEL-4131 CAMEL-4132 update the camel-cxf and camel-atom features
Modified:
camel/trunk/components/camel-atom/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-atom/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/pom.xml?rev=1138471&r1=1138470&r2=1138471&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/pom.xml (original)
+++ camel/trunk/components/camel-atom/pom.xml Wed Jun 22 14:01:28 2011
@@ -53,17 +53,127 @@
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-core</artifactId>
- <version>0.4.0-incubating</version>
+ <version>${abdera-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-parser</artifactId>
- <version>0.4.0-incubating</version>
+ <version>${abdera-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xmlParserAPIs</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xom</artifactId>
+ <groupId>xom</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xalan</artifactId>
+ <groupId>xalan</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-extensions-main</artifactId>
- <version>0.4.0-incubating</version>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xmlParserAPIs</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xom</artifactId>
+ <groupId>xom</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xalan</artifactId>
+ <groupId>xalan</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- testing -->
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1138471&r1=1138470&r2=1138471&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jun 22 14:01:28 2011
@@ -34,13 +34,14 @@
<properties>
<compiler.fork>true</compiler.fork>
+ <abdera-version>1.1.2</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
<activemq-version>5.5.0</activemq-version>
<ahc-version>1.6.3</ahc-version>
<apacheds-version>1.5.7</apacheds-version>
<aries-blueprint-version>0.3</aries-blueprint-version>
<atomikos-trascations-version>3.7.0</atomikos-trascations-version>
- <axiom-version>1.2.8</axiom-version>
+ <axiom-version>1.2.10</axiom-version>
<bouncycastle-version>140</bouncycastle-version>
<castor-bundle-version>1.3.1_1</castor-bundle-version>
<cometd-bayeux-version>6.1.11</cometd-bayeux-version>
@@ -50,7 +51,7 @@
<commons-dbcp-version>1.3</commons-dbcp-version>
<commons-exec-version>1.0.1</commons-exec-version>
<commons-io-version>1.3.2</commons-io-version>
- <commons-lang-version>2.4</commons-lang-version>
+ <commons-lang-version>2.6</commons-lang-version>
<commons-logging-version>1.1.1</commons-logging-version>
<commons-net-version>2.2</commons-net-version>
<commons-pool-version>1.5.4</commons-pool-version>
@@ -99,7 +100,7 @@
<jaxen-version>1.1.1</jaxen-version>
<jdom-version>1.1</jdom-version>
<jetty-version>7.4.1.v20110513</jetty-version>
- <jettison-version>1.2</jettison-version>
+ <jettison-version>1.3</jettison-version>
<jexcelapi-version>2.4.2</jexcelapi-version>
<jibx-version>1.2.2</jibx-version>
<jruby-version>1.5.6</jruby-version>
@@ -149,7 +150,7 @@
<tagsoup-version>1.2</tagsoup-version>
<testng-version>6.0.1</testng-version>
<velocity-version>1.7</velocity-version>
- <woodstox-version>4.0.7</woodstox-version>
+ <woodstox-version>4.1.1</woodstox-version>
<xbean-spring-version>3.5</xbean-spring-version>
<xstream-version>1.3.1</xstream-version>
<xmlsec-version>1.4.4</xmlsec-version>
@@ -168,7 +169,7 @@
org.apache.commons.logging.*;version="[1.1,2)",
org.apache.cxf.*;version="[2.4,2.5)",
org.apache.qpid.*;version="[0.5,0.6)",
- org.apache.abdera.*;version="[0.4,0.5)",
+ org.apache.abdera.*;version="[0.4,2)",
org.apache.commons.httpclient.*;version="[3.1,4.0)",
org.apache.mina.*;version="[1.1.7,2.0)",
org.apache.velocity.*;version="[1.6.2,2)",
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1138471&r1=1138470&r2=1138471&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Jun 22 14:01:28 2011
@@ -35,18 +35,17 @@
<!-- some of the bundles is located at: http://repo1.maven.org/maven2/org/apache/servicemix/bundles/ -->
<properties>
- <abdera-bundle-version>0.4.0-incubating_3</abdera-bundle-version>
<ant-bundle-version>1.7.0_4</ant-bundle-version>
<antlr-bundle-version>2.7.7_2</antlr-bundle-version>
<aopalliance-bundle-version>1.0_3</aopalliance-bundle-version>
- <asm-bundle-version>2.2.3_3</asm-bundle-version>
+ <asm-bundle-version>3.3_2</asm-bundle-version>
<aws-java-sdk-bundle-version>1.1.1_1</aws-java-sdk-bundle-version>
- <bcel-bundle-version>5.2_2</bcel-bundle-version>
+ <bcel-bundle-version>5.2_3</bcel-bundle-version>
<cglib-version>2.1_3_6</cglib-version>
<cometd-java-server-bundle-version>2.1.1_1</cometd-java-server-bundle-version>
<commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version>
<commons-csv-version>1.0-r706899_3</commons-csv-version>
- <commons-codec-version>1.4</commons-codec-version>
+ <commons-codec-version>${commons-code}</commons-codec-version>
<commons-codec-bundle-version>1.3_3</commons-codec-bundle-version>
<commons-configuration-version>1.6</commons-configuration-version>
<commons-daemon-version>1.0.5</commons-daemon-version>
@@ -54,7 +53,6 @@
<commons-httpclient-bundle-version>3.1_4</commons-httpclient-bundle-version>
<commons-io-bundle-version>1.3.2_3</commons-io-bundle-version>
<commons-jxpath-version>1.3</commons-jxpath-version>
- <commons-lang-version>2.4</commons-lang-version>
<commons-net-version>2.2</commons-net-version>
<commons-management-version>1.0</commons-management-version>
<commons-math-version>2.2</commons-math-version>
@@ -70,7 +68,7 @@
<freemarker-bundle-version>2.3.18_1</freemarker-bundle-version>
<geronimo-el-version>1.0.1</geronimo-el-version>
<geronimo-jsp-version>1.0.1</geronimo-jsp-version>
- <geronimo-ws-metadata-spec-version>1.1.2</geronimo-ws-metadata-spec-version>
+ <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
<guice-bundle-version>2.0_1</guice-bundle-version>
<hadoop-bundle-version>0.20.203.0_1-SNAPSHOT</hadoop-bundle-version>
@@ -90,7 +88,7 @@
<javax.el-bundle-version>2.1.0</javax.el-bundle-version>
<jcr-bundle-version>1.0_2</jcr-bundle-version>
<jdom-bundle-version>1.1_3</jdom-bundle-version>
- <jettison-bundle-version>1.2</jettison-bundle-version>
+ <jettison-bundle-version>1.3</jettison-bundle-version>
<jing-bundle-version>20030619_1</jing-bundle-version>
<jibx-bundle-version>1.2.2_1</jibx-bundle-version>
<jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
@@ -108,7 +106,8 @@
<neethi-bundle-version>3.0.0</neethi-bundle-version>
<oro-bundle-version>2.0.8_3</oro-bundle-version>
<openjpa-bundle-version>1.2.1_2</openjpa-bundle-version>
- <opensaml-version>1.1_3</opensaml-version>
+ <opensaml-version>2.4.1_1</opensaml-version>
+ <joda-time-version>1.6.2</joda-time-version>
<oscache-bundle-version>2.4_3</oscache-bundle-version>
<osgi.compendium.version>4.2.0</osgi.compendium.version>
<protobuf-java-bundle-version>2.3.0_1</protobuf-java-bundle-version>
@@ -131,20 +130,20 @@
<stringtemplate-bundle-version>3.2_3</stringtemplate-bundle-version>
<tagsoup-bundle-version>1.2_3</tagsoup-bundle-version>
<velocity-bundle-version>1.7_2</velocity-bundle-version>
- <xalan-bundle-version>2.7.1_2</xalan-bundle-version>
- <xerces-bundle-version>2.9.1_3</xerces-bundle-version>
+ <xalan-bundle-version>2.7.1_3</xalan-bundle-version>
+ <xerces-bundle-version>2.9.1_4</xerces-bundle-version>
<xmlbeans-bundle-version>2.5.0_1</xmlbeans-bundle-version>
<xmlschema-version>2.0</xmlschema-version>
- <xmlsec-bundle-version>1.4.4_1</xmlsec-bundle-version>
- <xmlresolver-bundle-version>1.2_2</xmlresolver-bundle-version>
+ <xmlsec-bundle-version>1.4.5_1</xmlsec-bundle-version>
+ <xmlresolver-bundle-version>1.2_3</xmlresolver-bundle-version>
<xpp3-bundle-version>1.1.4c_3</xpp3-bundle-version>
<xstream-bundle-version>1.3_3</xstream-bundle-version>
<werken-xpath-bundle-version>0.9.4_3</werken-xpath-bundle-version>
- <woodstox-core-bundle-version>4.0.7</woodstox-core-bundle-version>
- <stax2-api-bundle-version>3.0.1</stax2-api-bundle-version>
- <saaj-impl-version>1.3.2_1</saaj-impl-version>
+ <woodstox-core-bundle-version>${woodstox-version}</woodstox-core-bundle-version>
+ <stax2-api-bundle-version>3.1.1</stax2-api-bundle-version>
+ <saaj-impl-version>1.3.2_2</saaj-impl-version>
<wsdl4j-bundle-version>1.6.2_3</wsdl4j-bundle-version>
- <wss4j-version>1.6.0</wss4j-version>
+ <wss4j-version>1.6.1</wss4j-version>
</properties>
<!-- The validate plugin will export these provided dependencies bundles' export packages first -->
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=1138471&r1=1138470&r2=1138471&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Jun 22 14:01:28 2011
@@ -49,7 +49,7 @@
<bundle>mvn:org.apache.camel/camel-test/${pom.version}</bundle>
</feature>
<feature name='camel-cxf' version='${pom.version}' resolver='(obr)' start-level='50'>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
+ <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-jms/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>
@@ -57,7 +57,6 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
@@ -69,23 +68,29 @@
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${xmlschema-version}</bundle>
<bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
<bundle dependency="true">mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle>
<bundle dependency="true">mvn:org.apache.neethi/neethi/${neethi-bundle-version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.ws.commons.axiom/axiom-api/${axiom-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.abdera/abdera-core/${abdera-version}</bundle>
+ <!--bundle dependency="true">mvn:org.apache.abdera/abdera-extensions-json/${abdera-version}</bundle-->
+ <bundle dependency="true">mvn:org.apache.abdera/abdera-extensions-main/${abdera-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.abdera/abdera-i18n/${abdera-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.abdera/abdera-parser/${abdera-version}</bundle>
+
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix-specs-version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${wss4j-version}</bundle>
+ <bundle>mvn:joda-time/joda-time/${joda-time-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${opensaml-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${servicemix-specs-version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-bundle/${cxf-version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
<feature>jetty</feature>
<bundle>mvn:org.apache.camel/camel-cxf-transport/${pom.version}</bundle>
@@ -177,7 +182,14 @@
</feature> -->
<feature name='camel-atom' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
+ <bundle dependency="true">mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.ws.commons.axiom/axiom-api/${axiom-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.abdera/abdera-core/${abdera-version}</bundle>
+ <!--bundle dependency="true">mvn:org.apache.abdera/abdera-extensions-json/${abdera-version}</bundle-->
+ <bundle dependency="true">mvn:org.apache.abdera/abdera-extensions-main/${abdera-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.abdera/abdera-i18n/${abdera-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.abdera/abdera-parser/${abdera-version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle>
</feature>