re-enabled integration test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f7df387f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f7df387f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f7df387f Branch: refs/heads/3.1.x-fixes Commit: f7df387f599b9f01e31ea2dc19dba843868640c0 Parents: e70b004 Author: Dennis Kieselhorst <[email protected]> Authored: Mon Jul 24 13:42:20 2017 +0200 Committer: Daniel Kulp <[email protected]> Committed: Fri Jul 28 12:09:13 2017 -0400 ---------------------------------------------------------------------- systests/wsdl_maven/codegen/pom.xml | 54 ++++++++++---------- .../wsdl_maven/codegen/src/it/cxf-4004/pom.xml | 7 ++- .../wsdl_maven/codegen/src/it/it-parent/pom.xml | 1 + 3 files changed, 33 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f7df387f/systests/wsdl_maven/codegen/pom.xml ---------------------------------------------------------------------- diff --git a/systests/wsdl_maven/codegen/pom.xml b/systests/wsdl_maven/codegen/pom.xml index cb4d197..7be42fd 100644 --- a/systests/wsdl_maven/codegen/pom.xml +++ b/systests/wsdl_maven/codegen/pom.xml @@ -102,34 +102,32 @@ </execution> </executions> </plugin> - <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-invoker-plugin</artifactId> - <version>1.5</version> - <configuration> - <projectsDirectory>src/it</projectsDirectory> - <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> - <preBuildHookScript>setup</preBuildHookScript> - <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> - <settingsFile>src/it/settings.xml</settingsFile> - <pomIncludes> - <pomInclude>*/pom.xml</pomInclude> - </pomIncludes> - </configuration> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>install</goal> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-invoker-plugin</artifactId> + <version>3.0.0</version> + <configuration> + <projectsDirectory>src/it</projectsDirectory> + <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> + <preBuildHookScript>setup</preBuildHookScript> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <pomIncludes> + <pomInclude>*/pom.xml</pomInclude> + </pomIncludes> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> http://git-wip-us.apache.org/repos/asf/cxf/blob/f7df387f/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml ---------------------------------------------------------------------- diff --git a/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml b/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml index b867edc..53b0ae5 100644 --- a/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml +++ b/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml @@ -35,7 +35,7 @@ <dependency> <groupId>org.apache.cxf.xjcplugins</groupId> <artifactId>cxf-xjc-ts</artifactId> - <version>2.4.0</version> + <version>${cxf.xjc-utils.version}</version> </dependency> <dependency> <groupId>net.java.dev.jaxb2-commons</groupId> @@ -80,5 +80,10 @@ <artifactId>cxf-rt-transports-http</artifactId> <version>${cxf.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf.xjc-utils</groupId> + <artifactId>cxf-xjc-runtime</artifactId> + <version>${cxf.xjc-utils.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/cxf/blob/f7df387f/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml ---------------------------------------------------------------------- diff --git a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml index 7a49413..3184606 100644 --- a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml +++ b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml @@ -25,6 +25,7 @@ <packaging>pom</packaging> <properties> <cxf.version>@project.version@</cxf.version> + <cxf.xjc-utils.version>3.1.0</cxf.xjc-utils.version> </properties> <build> <pluginManagement>
