This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push: new 3d7ae59 [CXF-7714]Codegen-Plugin no longer works with Toolchains 3d7ae59 is described below commit 3d7ae5999c55ac9db8f157b1c87efcf0e5b75dfa Author: Freeman Fang <freeman.f...@gmail.com> AuthorDate: Mon Sep 10 16:54:23 2018 +0800 [CXF-7714]Codegen-Plugin no longer works with Toolchains --- maven-plugins/codegen-plugin/pom.xml | 2 +- .../src/it/jdk-cxf-with-toolchain/pom.xml | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml index 1a01041..e87aad1 100644 --- a/maven-plugins/codegen-plugin/pom.xml +++ b/maven-plugins/codegen-plugin/pom.xml @@ -187,7 +187,7 @@ </goals> <configuration> <pomIncludes> - <!-- Enable listed it's. Exclude toolchain till https://issues.apache.org/jira/browse/CXF-7714 is fixed --> + <pomInclude>jdk-cxf-with-toolchain</pomInclude> <pomInclude>wsdl-artifact-resolution/pom.xml</pomInclude> <pomInclude>mark-generated/pom.xml</pomInclude> </pomIncludes> diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml index 2b6bf20..7829c3a 100644 --- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml +++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml @@ -8,7 +8,10 @@ <packaging>jar</packaging> <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> <plugins> <plugin> @@ -108,5 +111,33 @@ </plugins> </build> </profile> + <profile> + <id>java9</id> + <activation> + <jdk>[9,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.1</version> + </dependency> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>2.2.9</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-ws-metadata_2.0_spec</artifactId> + <version>1.1.3</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2.11</version> + </dependency> + </dependencies> + </profile> </profiles> </project>