You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2016/06/07 16:05:59 UTC
cxf git commit: Use a "keys" classifier for the jar containing the
test keys. Make sure that is build in package phase for -Pfastinstall to
work.
Repository: cxf
Updated Branches:
refs/heads/master 1b9056ceb -> e6d42f6d6
Use a "keys" classifier for the jar containing the test keys. Make sure that is build in package phase for -Pfastinstall to work.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e6d42f6d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e6d42f6d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e6d42f6d
Branch: refs/heads/master
Commit: e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
Parents: 1b9056c
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Jun 7 12:05:25 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Jun 7 12:05:25 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/transport-undertow/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 ++++++++++++++
15 files changed, 28 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e6d42f6d/services/sts/sts-core/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 14bfdda..72d0917 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/e6d42f6d/services/sts/systests/advanced/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/pom.xml b/services/sts/systests/advanced/pom.xml
index d7502dd..49800aa 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/e6d42f6d/services/sts/systests/basic/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/pom.xml b/services/sts/systests/basic/pom.xml
index 9acab84..6cf92bb 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/e6d42f6d/services/xkms/xkms-client/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml
index 6d60ace..f338df2 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/e6d42f6d/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index d036dcd..3c2194c 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -305,7 +305,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/e6d42f6d/systests/kerberos/pom.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml
index ceeab08..209d6d8 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/e6d42f6d/systests/rs-security/pom.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
index 823979e..72fb35b 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/e6d42f6d/systests/transport-jms/pom.xml
----------------------------------------------------------------------
diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml
index cab837f..a95bacb 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/e6d42f6d/systests/transport-undertow/pom.xml
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/pom.xml b/systests/transport-undertow/pom.xml
index 542d71b..c2c2b7a 100644
--- a/systests/transport-undertow/pom.xml
+++ b/systests/transport-undertow/pom.xml
@@ -146,7 +146,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/e6d42f6d/systests/transports-ssl3/pom.xml
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/pom.xml b/systests/transports-ssl3/pom.xml
index 92779b5..7e162bc 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/e6d42f6d/systests/transports/pom.xml
----------------------------------------------------------------------
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index 6846759..8d03faa 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/e6d42f6d/systests/ws-rm/pom.xml
----------------------------------------------------------------------
diff --git a/systests/ws-rm/pom.xml b/systests/ws-rm/pom.xml
index 107ce67..d35e299 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/e6d42f6d/systests/ws-security-examples/pom.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/pom.xml b/systests/ws-security-examples/pom.xml
index 363c00d..bc521a0 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/e6d42f6d/systests/ws-security/pom.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/pom.xml b/systests/ws-security/pom.xml
index c0ad1fe..171217d 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/e6d42f6d/testutils/pom.xml
----------------------------------------------------------------------
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 44602eb..1adfc0b 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>