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 2017/06/07 11:00:50 UTC
[1/2] cxf git commit: Updating Apache DS
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 4b88582c4 -> 355ad864f
Updating Apache DS
# Conflicts:
# parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f3e4aa1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f3e4aa1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f3e4aa1
Branch: refs/heads/3.1.x-fixes
Commit: 6f3e4aa162c2ec1c78256b57d98f735cfb15a2fb
Parents: 4b88582
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jun 7 11:59:53 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jun 7 12:00:38 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f3e4aa1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index be1f265..ab1c7db 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -69,7 +69,7 @@
<cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
<cxf.activemq.version>5.14.4</cxf.activemq.version>
<cxf.ahc.version>1.9.8</cxf.ahc.version>
- <cxf.apacheds.version>2.0.0-M23</cxf.apacheds.version>
+ <cxf.apacheds.version>2.0.0-M24</cxf.apacheds.version>
<cxf.atmosphere.version>2.3.7</cxf.atmosphere.version>
<cxf.atmosphere.version.range>[2.0,2.4)</cxf.atmosphere.version.range>
<cxf.axiom.version>1.2.14</cxf.axiom.version>
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
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/355ad864
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/355ad864
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/355ad864
Branch: refs/heads/3.1.x-fixes
Commit: 355ad864fef9f17d53b5c7ccf1aaa96ae24ec4d1
Parents: 6f3e4aa
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jun 7 12:00:39 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jun 7 12:00:39 2017 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/355ad864/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f5d13a1..88433c0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -602,6 +602,7 @@ M cbf0ca69edb54ce58fc8063dfaa03fa497004ec6
M cd782fef123d2147a6f5cb04fb6cdfe8cf0ac81a
M cf806d5cba74e47c6e5ba3231df4228cbaad3e90
M cf8ac102e728b8745da265ec969f7b5160829fdb
+M cfe59def64bdfa2f73b6c05668602ee3cdf75b1d
M d0821bce5faa119c882a9000dbe03a124df5b033
M d0915da312bc97841f48be2b2b2d423f0082f977
M d187ef6f3906d867a8c30a991d9074d170bca487