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/08/16 12:30:29 UTC
[1/2] cxf git commit: EhCache update
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 473105a03 -> 7f9e0f467
EhCache update
# 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/8c482620
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8c482620
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8c482620
Branch: refs/heads/3.1.x-fixes
Commit: 8c48262002b8b740ba241e7796928b6aa248ceee
Parents: 473105a
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Aug 16 13:29:26 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Aug 16 13:30:22 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8c482620/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2fd5f76..12e6660 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -83,7 +83,7 @@
<cxf.commons-lang3.version>3.5</cxf.commons-lang3.version>
<cxf.derby.version>10.2.2.0</cxf.derby.version>
<cxf.dropwizard.version>3.1.2</cxf.dropwizard.version>
- <cxf.ehcache.version>2.10.3</cxf.ehcache.version>
+ <cxf.ehcache.version>2.10.4</cxf.ehcache.version>
<cxf.ehcache3.version>3.0.3</cxf.ehcache3.version>
<cxf.fastinfoset.bundle.version>1.2.13_1</cxf.fastinfoset.bundle.version>
<cxf.guava.version>18.0</cxf.guava.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/7f9e0f46
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f9e0f46
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f9e0f46
Branch: refs/heads/3.1.x-fixes
Commit: 7f9e0f467679d268dcfcd2fedb243d5f3a525421
Parents: 8c48262
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Aug 16 13:30:23 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Aug 16 13:30:23 2017 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f9e0f46/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index aa744ab..0447275 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -662,6 +662,7 @@ M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
M a034e5853484a7ef0a9f0ad1ae6582178f622f31
M a1710bdd783afcd667d9e72ccb031480d3806850
M a2cbe758286d00b5c5d9c5fbe6be4cc9d7ecf225
+M a2ef88d6a489b57f286353041c92d6d517388e31
M a2efc18eff09700eded186478a7c2ae8fa543eef
M a304f27b8ad9da04dde3610932266c64baa3aa7e
M a42362e397b84d335015f7f9aa07b4f0bfb49260