Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 2ceb8351e -> 2e7e04b54
Use a "keys" classifier for the jar containing the test keys. Make sure that is build in package phase for -Pfastinstall to work. # Conflicts: # systests/transport-undertow/pom.xml Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/83846d08 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/83846d08 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/83846d08 Branch: refs/heads/3.1.x-fixes Commit: 83846d088d78a03159b259fb9969052a33904faa Parents: 2ceb835 Author: Daniel Kulp <[email protected]> Authored: Tue Jun 7 12:05:25 2016 -0400 Committer: Daniel Kulp <[email protected]> Committed: Fri Jun 10 13:35:26 2016 -0400 ---------------------------------------------------------------------- services/sts/sts-core/pom.xml | 2 +- services/sts/systests/advanced/pom.xml | 2 +- services/sts/systests/basic/pom.xml | 2 +- services/xkms/xkms-client/pom.xml | 2 +- systests/jaxrs/pom.xml | 2 +- systests/kerberos/pom.xml | 2 +- systests/rs-security/pom.xml | 2 +- systests/transport-jms/pom.xml | 2 +- systests/transports-ssl3/pom.xml | 2 +- systests/transports/pom.xml | 2 +- systests/ws-rm/pom.xml | 2 +- systests/ws-security-examples/pom.xml | 2 +- systests/ws-security/pom.xml | 2 +- testutils/pom.xml | 14 ++++++++++++++ 14 files changed, 27 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/services/sts/sts-core/pom.xml ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml index ca941b2..04b9c22 100644 --- a/services/sts/sts-core/pom.xml +++ b/services/sts/sts-core/pom.xml @@ -145,7 +145,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/services/sts/systests/advanced/pom.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/pom.xml b/services/sts/systests/advanced/pom.xml index c083aa6..55c9b1d 100644 --- a/services/sts/systests/advanced/pom.xml +++ b/services/sts/systests/advanced/pom.xml @@ -95,7 +95,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>org.bouncycastle</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/services/sts/systests/basic/pom.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/pom.xml b/services/sts/systests/basic/pom.xml index 037ed7e..01b9a4b 100644 --- a/services/sts/systests/basic/pom.xml +++ b/services/sts/systests/basic/pom.xml @@ -89,7 +89,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>org.apache.cxf</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/services/xkms/xkms-client/pom.xml ---------------------------------------------------------------------- diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml index 116e35d..30b5aae 100644 --- a/services/xkms/xkms-client/pom.xml +++ b/services/xkms/xkms-client/pom.xml @@ -106,7 +106,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/systests/jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index d5654e6..84567ed 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -300,7 +300,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>org.apache.cxf</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/systests/kerberos/pom.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml index 6e87c46..96796ae 100644 --- a/systests/kerberos/pom.xml +++ b/systests/kerberos/pom.xml @@ -168,7 +168,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>org.springframework</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/systests/rs-security/pom.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml index e755aed..05ea9e9 100644 --- a/systests/rs-security/pom.xml +++ b/systests/rs-security/pom.xml @@ -130,7 +130,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>javax.annotation</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/systests/transport-jms/pom.xml ---------------------------------------------------------------------- diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml index f94b64a..88f404a 100644 --- a/systests/transport-jms/pom.xml +++ b/systests/transport-jms/pom.xml @@ -168,7 +168,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>org.springframework</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/systests/transports-ssl3/pom.xml ---------------------------------------------------------------------- diff --git a/systests/transports-ssl3/pom.xml b/systests/transports-ssl3/pom.xml index 62f4fa1..ee82ce1 100644 --- a/systests/transports-ssl3/pom.xml +++ b/systests/transports-ssl3/pom.xml @@ -112,7 +112,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>org.springframework</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/systests/transports/pom.xml ---------------------------------------------------------------------- diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml index ffe0d56..9e1713e 100644 --- a/systests/transports/pom.xml +++ b/systests/transports/pom.xml @@ -174,7 +174,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>org.springframework</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/systests/ws-rm/pom.xml ---------------------------------------------------------------------- diff --git a/systests/ws-rm/pom.xml b/systests/ws-rm/pom.xml index ad91225..1b4497b 100644 --- a/systests/ws-rm/pom.xml +++ b/systests/ws-rm/pom.xml @@ -97,7 +97,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>${cxf.asm.groupId}</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/systests/ws-security-examples/pom.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/pom.xml b/systests/ws-security-examples/pom.xml index 35f8560..261a60f 100644 --- a/systests/ws-security-examples/pom.xml +++ b/systests/ws-security-examples/pom.xml @@ -158,7 +158,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>org.springframework</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/systests/ws-security/pom.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/pom.xml b/systests/ws-security/pom.xml index 5be6b83..afcf5be 100644 --- a/systests/ws-security/pom.xml +++ b/systests/ws-security/pom.xml @@ -172,7 +172,7 @@ <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> - <classifier>tests</classifier> + <classifier>keys</classifier> </dependency> <dependency> <groupId>org.springframework</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/83846d08/testutils/pom.xml ---------------------------------------------------------------------- diff --git a/testutils/pom.xml b/testutils/pom.xml index 1416ac5..c162d4b 100644 --- a/testutils/pom.xml +++ b/testutils/pom.xml @@ -284,6 +284,20 @@ <version>2.4</version> <executions> <execution> + <id>key-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>keys</classifier> + <classesDirectory>${basedir}/src/test/resources</classesDirectory> + <includes> + <include>**/*.*</include> + </includes> + </configuration> + </execution> + <execution> <goals> <goal>test-jar</goal> </goals>
