camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-8198: Upgrade to JAXB 2.2.11
Date Tue, 30 Dec 2014 11:53:13 GMT
Repository: camel
Updated Branches:
  refs/heads/master d4f7185c1 -> c971733d8


CAMEL-8198: Upgrade to JAXB 2.2.11


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c971733d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c971733d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c971733d

Branch: refs/heads/master
Commit: c971733d8a0fa84991a195b1f518dd75865ac5f4
Parents: d4f7185
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Dec 30 12:09:37 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Dec 30 12:11:59 2014 +0100

----------------------------------------------------------------------
 components/camel-blueprint/pom.xml | 18 ++++++++++++++++++
 components/camel-spring/pom.xml    | 18 ++++++++++++++++++
 parent/pom.xml                     |  8 ++++++--
 pom.xml                            |  2 +-
 4 files changed, 43 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c971733d/components/camel-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 0eea213..6ef1170 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -264,6 +264,24 @@
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-antrun-plugin</artifactId>
                   <inherited>true</inherited>
+                  <dependencies>
+                    <!-- need JAXB on the classpath to use the jxc SchemaGenTask -->
+                    <dependency>
+                      <groupId>com.sun.xml.bind</groupId>
+                      <artifactId>jaxb-core</artifactId>
+                      <version>${jaxb-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>
                   <executions>
                       <execution>
                           <id>process-sources</id>

http://git-wip-us.apache.org/repos/asf/camel/blob/c971733d/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index fdfc1d2..def923e 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -235,6 +235,24 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <dependencies>
+          <!-- need JAXB on the classpath to use the jxc SchemaGenTask -->
+          <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${jaxb-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>
         <executions>
           <execution>
             <id>package</id>

http://git-wip-us.apache.org/repos/asf/camel/blob/c971733d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 61c6e56..230045e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2607,7 +2607,7 @@
               <nature>org.eclipse.jdt.core.javanature</nature>
               <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
             </projectnatures>
-            <!-- exclude the old JSR173 1.0 transitive dependency through com.sun.xml.bind:jaxb-impl:jar:2.2.7
-->
+            <!-- exclude the old JSR173 1.0 transitive dependency through com.sun.xml.bind:jaxb-impl:jar:2.2.11
-->
             <excludes>
               <exclude>javax.xml.bind:jsr173_api</exclude>
             </excludes>
@@ -3073,12 +3073,16 @@
       </activation>
 
       <properties>
-        <jaxb-version>2.2.7</jaxb-version>
+        <jaxb-version>2.2.11</jaxb-version>
       </properties>
 
       <dependencies>
         <dependency>
           <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-core</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.sun.xml.bind</groupId>
           <artifactId>jaxb-impl</artifactId>
         </dependency>
       </dependencies>

http://git-wip-us.apache.org/repos/asf/camel/blob/c971733d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4a11b63..eb08215 100755
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
     <maven-compiler-plugin-version>2.5.1</maven-compiler-plugin-version>
 
     <!-- eclipse plugin need the jaxb in this pom.xml file -->
-    <jaxb-version>2.2.7</jaxb-version>
+    <jaxb-version>2.2.11</jaxb-version>
   </properties>
 
   <mailingLists>


Mime
View raw message