Author: ningjiang
Date: Fri Feb 5 11:36:36 2010
New Revision: 906904
URL: http://svn.apache.org/viewvc?rev=906904&view=rev
Log:
CAMEL-2411 clean up the dependency of jaxb 2.1.5-DEV
Modified:
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=906904&r1=906903&r2=906904&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Feb 5 11:36:36 2010
@@ -1215,17 +1215,17 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.1</version>
+ <version>${jaxb-api-version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.12</version>
+ <version>${jaxb-version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>2.1.12</version>
+ <version>${jaxb-version}</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=906904&r1=906903&r2=906904&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Fri Feb 5 11:36:36 2010
@@ -44,6 +44,8 @@
<site-repo-url>scpexe://people.apache.org/www/camel.apache.org/maven/</site-repo-url>
<felix-version>2.0.1</felix-version>
<jetty-version>6.1.22</jetty-version>
+ <jaxb-version>2.1.12</jaxb-version>
+ <jaxb-api-version>2.1</jaxb-api-version>
</properties>
<mailingLists>
@@ -242,6 +244,23 @@
<groupId>com.sun.tools.jxc.maven2</groupId>
<artifactId>maven-jaxb-schemagen-plugin</artifactId>
<version>1.3-dev</version>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
@@ -519,17 +538,17 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.1</version>
+ <version>${jaxb-api-version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.12</version>
+ <version>${jaxb-version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>2.1.12</version>
+ <version>${jaxb-version}</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
