cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Wed, 09 Nov 2016 17:09:42 GMT
Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e558d058
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e558d058
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e558d058

Branch: refs/heads/3.0.x-fixes
Commit: e558d0588ee0ef3d23ca71a42d7b6756f0bff3d2
Parents: 0da7213
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Nov 9 17:02:29 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Nov 9 17:02:29 2016 +0000

----------------------------------------------------------------------
 services/sts/systests/sts-itests/pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e558d058/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 b7a3124..4d82385 100644
--- a/services/sts/systests/sts-itests/pom.xml
+++ b/services/sts/systests/sts-itests/pom.xml
@@ -26,11 +26,7 @@
     <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
+        <version>3.0.12-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>


Mime
View raw message