[jbossws-commits] JBossWS SVN: r19365 - in stack/cxf/branches/arquillian/modules/testsuite: cxf-tests and 1 other directories.

Author: asoldano Date: 2015-01-13 03:56:37 -0500 (Tue, 13 Jan 2015) New Revision: 19365 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml Log: Replace maven-resource-plugin with a proper execution of maven-dependency-plugin to copy the jbossws-cxf-factories jar into endorsed (this solves issues caused by poms accessing resources outside their module) Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-13 07:24:05 UTC (rev 19364) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-13 08:56:37 UTC (rev 19365) @@ -72,27 +72,27 @@ </activation> <build> <plugins> - <plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run --> - <artifactId>maven-resources-plugin</artifactId> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> <executions> - <execution> - <id>copy-factories-jar</id> - <phase>pre-integration-test</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../../endorsed/target/</directory> - <includes> - <include>jbossws-cxf-factories-${project.version}.jar</include> - </includes> - </resource> - </resources> - </configuration> - </execution> + <execution> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run --> + <id>copy-endorsed</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-factories</artifactId> + <version>${project.version}</version> + </artifactItem> + </artifactItems> + <outputDirectory>target/endorsed</outputDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-13 07:24:05 UTC (rev 19364) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-13 08:56:37 UTC (rev 19365) @@ -36,6 +36,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-factories</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.picketlink</groupId> <artifactId>picketlink-common</artifactId> <scope>test</scope> @@ -125,34 +130,28 @@ </execution> </executions> </plugin> - <plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run --> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-factories-jar</id> - <phase>pre-integration-test</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../../endorsed/target/</directory> - <includes> - <include>jbossws-cxf-factories-${project.version}.jar</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <!-- This downloads and copies some Spring libs into target/spring to be later picked up and included in some test jars --> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> - <execution> + <execution> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run --> + <id>copy-endorsed</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-factories</artifactId> + <version>${project.version}</version> + </artifactItem> + </artifactItems> + <outputDirectory>target/endorsed</outputDirectory> + </configuration> + </execution> + <execution> <!-- This downloads and copies some Spring libs into target/spring to be later picked up and included in some test jars --> <id>copy-spring</id> <phase>process-test-resources</phase> <goals> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-13 07:24:05 UTC (rev 19364) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-13 08:56:37 UTC (rev 19365) @@ -135,27 +135,27 @@ </executions> </plugin> - <plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run --> - <artifactId>maven-resources-plugin</artifactId> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> <executions> - <execution> - <id>copy-factories-jar</id> - <phase>pre-integration-test</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../../endorsed/target/</directory> - <includes> - <include>jbossws-cxf-factories-${project.version}.jar</include> - </includes> - </resource> - </resources> - </configuration> - </execution> + <execution> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run --> + <id>copy-endorsed</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-factories</artifactId> + <version>${project.version}</version> + </artifactItem> + </artifactItems> + <outputDirectory>target/endorsed</outputDirectory> + </configuration> + </execution> </executions> </plugin> </plugins>