Author: dkulp
Date: Tue May 8 18:14:26 2012
New Revision: 1335673
URL: http://svn.apache.org/viewvc?rev=1335673&view=rev
Log:
No point defining jaxb-api on Java6 and Java7 as you'll always just get
the version provided by the JDK anyway.
Modified:
camel/trunk/components/camel-blueprint/pom.xml
camel/trunk/components/camel-jaxb/pom.xml
camel/trunk/components/camel-test-blueprint/pom.xml
camel/trunk/components/camel-web/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
Modified: camel/trunk/components/camel-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1335673&r1=1335672&r2=1335673&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Tue May 8 18:14:26 2012
@@ -76,10 +76,6 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
<!-- for testing -->
<dependency>
Modified: camel/trunk/components/camel-jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/pom.xml?rev=1335673&r1=1335672&r2=1335673&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/pom.xml (original)
+++ camel/trunk/components/camel-jaxb/pom.xml Tue May 8 18:14:26 2012
@@ -43,10 +43,6 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
Modified: camel/trunk/components/camel-test-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/pom.xml?rev=1335673&r1=1335672&r2=1335673&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-test-blueprint/pom.xml Tue May 8 18:14:26 2012
@@ -49,12 +49,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-blueprint</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- the ordering of the dependencies can matter as we load the
dependencies from the classpath
Modified: camel/trunk/components/camel-web/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1335673&r1=1335672&r2=1335673&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Tue May 8 18:14:26 2012
@@ -369,7 +369,7 @@
<docletArtifact>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb-api-version}</version>
+ <version>2.1</version>
</docletArtifact>
<docletArtifact>
<groupId>com.sun.xml.bind</groupId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1335673&r1=1335672&r2=1335673&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue May 8 18:14:26 2012
@@ -1024,25 +1024,6 @@
<!-- optional dependencies -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb-api-version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>${stax-api-version}</version>
@@ -1793,16 +1774,11 @@
</activation>
<properties>
- <jaxb-api-version>2.2</jaxb-api-version>
<jaxb-version>2.2.5</jaxb-version>
</properties>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1335673&r1=1335672&r2=1335673&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue May 8 18:14:26 2012
@@ -47,7 +47,6 @@
<!-- eclipse plugin need the jaxb in this pom.xml file -->
<jaxb-version>2.1.13</jaxb-version>
- <jaxb-api-version>2.1</jaxb-api-version>
<maven-bundle-version>2.3.6</maven-bundle-version>
<openjpa-version>2.2.0</openjpa-version>
@@ -283,11 +282,6 @@
<version>1.6</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>
@@ -769,11 +763,6 @@
<version>1.6</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>
