Repository: camel Updated Branches: refs/heads/master 050e22d94 -> d5b596403
JAXB needs both core and impl to work on Java8 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/56db9c0b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/56db9c0b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/56db9c0b Branch: refs/heads/master Commit: 56db9c0bb0602b62ea4b5b8581abbb23ebdf26ff Parents: 050e22d Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Feb 22 13:31:44 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Feb 22 13:36:50 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 24 ++++++++++++++++++++++++ pom.xml | 6 ++++++ 2 files changed, 30 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/56db9c0b/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 21b9019..1f77e5e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3054,6 +3054,30 @@ <jdk>1.7</jdk> </activation> + <!-- Update JAXB version here --> + <properties> + <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> + </profile> + + <profile> + <id>jdk1.8</id> + <activation> + <jdk>1.8</jdk> + </activation> + + <!-- Update JAXB version here --> <properties> <jaxb-version>2.2.11</jaxb-version> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/56db9c0b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 49c4ffa..55de237 100755 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,7 @@ <maven-compiler-plugin-version>2.5.1</maven-compiler-plugin-version> <!-- eclipse plugin need the jaxb in this pom.xml file --> + <!-- Make sure to keep JAXB version up to date in parent/pom.xml in the bottom of the file --> <jaxb-version>2.2.11</jaxb-version> </properties> @@ -422,6 +423,11 @@ <dependencies> <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>
