You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/11/14 21:13:42 UTC
svn commit: r1201867 - in /camel/branches/camel-2.8.x: ./
components/camel-atom/pom.xml parent/pom.xml
Author: dkulp
Date: Mon Nov 14 20:13:42 2011
New Revision: 1201867
URL: http://svn.apache.org/viewvc?rev=1201867&view=rev
Log:
Merged revisions 1198565 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1198565 | cmueller | 2011-11-06 16:21:57 -0500 (Sun, 06 Nov 2011) | 1 line
fixed the unnecessary dependency to axiom-impl 1.2.8
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-atom/pom.xml
camel/branches/camel-2.8.x/parent/pom.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-atom/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-atom/pom.xml?rev=1201867&r1=1201866&r2=1201867&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-atom/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-atom/pom.xml Mon Nov 14 20:13:42 2011
@@ -112,7 +112,6 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>${axiom-version}</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -155,7 +154,6 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>${axiom-version}</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1201867&r1=1201866&r2=1201867&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Mon Nov 14 20:13:42 2011
@@ -1383,8 +1383,13 @@
<!-- optional Axiom -->
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.8</version>
+ <version>${axiom-version}</version>
</dependency>
<!-- optional misc -->