camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject camel git commit: CAMEL-8198: Fix the broken build
Date Tue, 30 Dec 2014 21:29:23 GMT
Repository: camel
Updated Branches:
  refs/heads/master 6e1493792 -> 94f5694d8


CAMEL-8198: Fix the broken build

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

Branch: refs/heads/master
Commit: 94f5694d8c2b604b9df5a7333fde847e2e7817ba
Parents: 6e14937
Author: Babak Vahdat <bvahdat@apache.org>
Authored: Tue Dec 30 22:28:56 2014 +0100
Committer: Babak Vahdat <bvahdat@apache.org>
Committed: Tue Dec 30 22:28:56 2014 +0100

----------------------------------------------------------------------
 components/camel-web/pom.xml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/94f5694d/components/camel-web/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-web/pom.xml b/components/camel-web/pom.xml
index 3c71f93..1607185 100644
--- a/components/camel-web/pom.xml
+++ b/components/camel-web/pom.xml
@@ -31,7 +31,6 @@
 
     <properties>
         <camel.osgi.export.pkg>org.apache.camel.web.*</camel.osgi.export.pkg>
-        <jaxb-api-version>2.1</jaxb-api-version>
         <scalate-version>1.7.0</scalate-version>
         <jersey-version>1.17.1</jersey-version>
         <jetty-port>8080</jetty-port>
@@ -355,7 +354,7 @@
                         <docletArtifact>
                             <groupId>javax.xml.bind</groupId>
                             <artifactId>jaxb-api</artifactId>
-                            <version>${jaxb-api-version}</version>
+                            <version>${jaxb-version}</version>
                         </docletArtifact>
                         <docletArtifact>
                             <groupId>com.sun.xml.bind</groupId>
@@ -454,6 +453,24 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <inherited>true</inherited>
+                <dependencies>
+                  <!-- need JAXB on the classpath to use the xjc 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>


Mime
View raw message