Repository: camel Updated Branches: refs/heads/master 094348372 -> 2a67ab7e4
CAMEL-11173 Integration tests for camel-restdsl... ...-swagger-plugin fail on JDK 9 This adds the needed dependencies and sets the source and target Java version for the integration tests to Java 8. The Groovy dependency needed to be upgraded because of GROOVY-7587[1]. [1] https://issues.apache.org/jira/browse/GROOVY-7587 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2a67ab7e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2a67ab7e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2a67ab7e Branch: refs/heads/master Commit: 2a67ab7e414d7ab3c1dc70147ebfd3b4ebea812a Parents: 0943483 Author: Zoran Regvart <zregv...@apache.org> Authored: Thu Apr 20 10:40:45 2017 +0200 Committer: Zoran Regvart <zregv...@apache.org> Committed: Thu Apr 20 10:41:07 2017 +0200 ---------------------------------------------------------------------- .../maven/camel-restdsl-swagger-plugin/pom.xml | 25 +++++++++++++++++++- .../src/it/customized/pom.xml | 4 +++- .../src/it/simple/pom.xml | 4 +++- 3 files changed, 30 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2a67ab7e/tooling/maven/camel-restdsl-swagger-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml index 3034769..743f0e5 100644 --- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml +++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml @@ -58,6 +58,13 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>${groovy-version}</version> + </dependency> + </dependencies> </plugin> </plugins> </build> @@ -95,4 +102,20 @@ </dependency> </dependencies> -</project> \ No newline at end of file + <profiles> + <profile> + <id>jigsaw</id> + <activation> + <jdk>[1.9,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3</version> + </dependency> + </dependencies> + </profile> + </profiles> + +</project> http://git-wip-us.apache.org/repos/asf/camel/blob/2a67ab7e/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml index 3065d55..3a71aec 100644 --- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml +++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml @@ -27,6 +27,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <build> @@ -63,4 +65,4 @@ <version>@project.version@</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/camel/blob/2a67ab7e/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple/pom.xml index 6e04e2b..2d3e3f1 100644 --- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple/pom.xml +++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple/pom.xml @@ -27,6 +27,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> </properties> <build> @@ -46,4 +48,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project>