Repository: camel Updated Branches: refs/heads/master b82839e32 -> ac1d6eca0
CAMEL-10141 Make xsd schema generation via ant tasks work on Java 9 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/73f92943 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/73f92943 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/73f92943 Branch: refs/heads/master Commit: 73f929435b5a417d01343139192118b2d942ff38 Parents: 4896c31 Author: jpoth <[email protected]> Authored: Tue Feb 21 10:50:04 2017 +0100 Committer: Claus Ibsen <[email protected]> Committed: Tue Feb 21 15:57:28 2017 +0100 ---------------------------------------------------------------------- components/camel-blueprint/pom.xml | 12 ++++++++++++ components/camel-spring/pom.xml | 31 +++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/73f92943/components/camel-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml index 968d626..18bd4d4 100644 --- a/components/camel-blueprint/pom.xml +++ b/components/camel-blueprint/pom.xml @@ -340,6 +340,16 @@ <artifactId>jaxb-xjc</artifactId> <version>${jaxb-version}</version> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + </dependency> </dependencies> <executions> <execution> @@ -375,6 +385,8 @@ <echo>Generating XSD schema</echo> <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema"> <schema namespace="http://camel.apache.org/schema/spring"; file="camel-blueprint.xsd" /> + <compilerarg line="-target ${jdk.version}"/> + <compilerarg line="-source ${jdk.version}"/> <classpath refid="maven.compile.classpath" /> </schemagen> http://git-wip-us.apache.org/repos/asf/camel/blob/73f92943/components/camel-spring/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml index bc175c5..386b8c3 100644 --- a/components/camel-spring/pom.xml +++ b/components/camel-spring/pom.xml @@ -328,6 +328,8 @@ <mkdir dir="${project.build.directory}/schema" /> <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema"> <schema namespace="http://camel.apache.org/schema/spring"; file="camel-spring.xsd" /> + <compilerarg line="-target ${jdk.version}"/> + <compilerarg line="-source ${jdk.version}"/> <classpath refid="maven.compile.classpath" /> </schemagen> @@ -554,6 +556,35 @@ </dependency> </dependencies> </profile> + + <profile> + <id>jdk9-build</id> + <activation> + <jdk>9</jdk> + </activation> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> </profiles> <reporting>
