You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/11/09 17:09:41 UTC
[2/3] cxf git commit: Re-enabling STS itests
Re-enabling STS itests
# Conflicts:
# services/sts/systests/sts-itests/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5408578e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5408578e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5408578e
Branch: refs/heads/3.0.x-fixes
Commit: 5408578e79a68c199f3430975dbca57fcc0283b6
Parents: 35ad8ab
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Nov 9 17:01:12 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Nov 9 17:02:09 2016 +0000
----------------------------------------------------------------------
services/sts/systests/pom.xml | 2 +-
services/sts/systests/sts-itests/pom.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5408578e/services/sts/systests/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/pom.xml b/services/sts/systests/pom.xml
index 03cbbf1..d14a8d4 100644
--- a/services/sts/systests/pom.xml
+++ b/services/sts/systests/pom.xml
@@ -34,6 +34,6 @@
<module>advanced</module>
<module>sts-osgi</module>
<module>sts-features</module>
-<!-- <module>sts-itests</module>-->
+ <module>sts-itests</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5408578e/services/sts/systests/sts-itests/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/sts-itests/pom.xml b/services/sts/systests/sts-itests/pom.xml
index 9fe2d3f..b7a3124 100644
--- a/services/sts/systests/sts-itests/pom.xml
+++ b/services/sts/systests/sts-itests/pom.xml
@@ -26,7 +26,11 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
+<<<<<<< HEAD
<version>3.0.11-SNAPSHOT</version>
+=======
+ <version>3.1.9-SNAPSHOT</version>
+>>>>>>> be7f523... Re-enabling STS itests
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
<dependencies>