You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/08/31 15:28:07 UTC
git commit: CAMEL-7764 Try to fix the test errors camel-cxf-transport
Repository: camel
Updated Branches:
refs/heads/master 2ebd766b9 -> 58b890fa0
CAMEL-7764 Try to fix the test errors camel-cxf-transport
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/58b890fa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/58b890fa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/58b890fa
Branch: refs/heads/master
Commit: 58b890fa03723ca6cb27bf4caa026643d54d8cb8
Parents: 2ebd766
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Aug 31 21:26:32 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Aug 31 21:27:30 2014 +0800
----------------------------------------------------------------------
components/camel-cxf-transport/pom.xml | 18 ++++++++++++++++++
parent/pom.xml | 19 +------------------
2 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/58b890fa/components/camel-cxf-transport/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 8885d95..26e5dc4 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -194,6 +194,24 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jdk1.8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <properties>
+ <jaxb-version>2.2.10-b140310.1920</jaxb-version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/58b890fa/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 523482e..21c6512 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1978,7 +1978,7 @@
<artifactId>pax-exam-invoker-junit</artifactId>
<version>${pax-exam-version}</version>
</dependency>
-
+
<!-- optional Saxon support -->
@@ -2919,23 +2919,6 @@
</dependencies>
</profile>
- <profile>
- <id>jdk1.8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
-
- <properties>
- <jaxb-version>2.2.10-b140310.1920</jaxb-version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>