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:40 UTC
[1/3] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 35ad8ab21 -> e558d0588
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0da72138
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0da72138
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0da72138
Branch: refs/heads/3.0.x-fixes
Commit: 0da72138e1c1f90c25059b70ca13f385ed6e880d
Parents: 5408578
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Nov 9 17:02:09 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Nov 9 17:02:09 2016 +0000
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0da72138/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 213c205..1824926 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -688,6 +688,7 @@ B 895f9b0ff0b43f775309bfc5d064ca22ec7b2df4
B 897d81dc292eb6159aab96390cb3fbfed1c34a6b
B 89b7bb172804ebaffaa69c9207065e50eb5a5d36
B 89e055d3ad175002bce936b62d2fddf97044ca35
+B 8a40a05adb01d318eff0e32430f36b267ca6019c
B 8a82bbfb59141801864e74ebe92f499f117ba6ef
B 8a9f6cdafc87a22314c805e995fc5d286fe8beed
B 8ab75c2dc7d99d09d47e9413c5ef89d58f1d4d7a
@@ -1560,6 +1561,7 @@ M bc3ee954f0796c82d9ff59c4d45f13382d84d4e8
M bc5e828cd8a25c4c4107c76e1582f807e75c9a77
M bd1d31f195caab56fbe565fbfb63d9170a0c9406
M bd7babd656fc06f3e5839bf11e186ec12fdeb6fa
+M be7f5239128e5255ce7d617e0fc62556f4f33459
M beae71f1d6d60921d79c7d2275dd8ce90bbd21e4
M bee82ba7d1766b555d965a75b3846ead4686239e
M bfa97ebf03e8ab6b29129f31d76fa469b054f843
[2/3] cxf git commit: Re-enabling STS itests
Posted by co...@apache.org.
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>
[3/3] cxf git commit: Fixing merge
Posted by co...@apache.org.
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 <co...@apache.org>
Authored: Wed Nov 9 17:02:29 2016 +0000
Committer: Colm O hEigeartaigh <co...@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>