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 2020/05/29 08:48:55 UTC
[cxf] branch 3.3.x-fixes updated (fea1ed7 -> 105f0da)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from fea1ed7 Recording .gitmergeinfo Changes
new cfc89ae Updating to ActiveMQ 5.15.13
new 105f0da Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 105f0daef5b4d7bdfb8b6dee2035875fa288f99e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri May 29 09:48:36 2020 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6653ddf..a58432b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -293,6 +293,7 @@ M 7b50181ebc445bb84d3463b284643432399bc0f8
M 7ef814556d727c147d6f625cbb1170edfd24a752
M 8b11d6b26369650e5f4c6f3730dbb97d60927d9b
M 92a00fc05e2437d2d0cf98099060ba4e1f6dac99
+M 92d4bfe929c5d11f19c6dd2974f0f880ba7d5382
M 95c3c37092751b1d00b6f2c26642f18ebcbba878
M 972a2755ca85ba86f473b0ce46f23bf6193ced62
M 9c2721f27e9697fa0f515e0787f75c26077d0572
[cxf] 01/02: Updating to ActiveMQ 5.15.13
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit cfc89ae6260e6c6972ca71d37e7c52119039b3b5
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri May 29 09:46:02 2020 +0100
Updating to ActiveMQ 5.15.13
(cherry picked from commit 92d4bfe929c5d11f19c6dd2974f0f880ba7d5382)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e2e6f6b..e22571f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,7 +78,7 @@
<!-- please maintain alphabetical order here -->
<cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
<cxf.abdera.version>1.1.3</cxf.abdera.version>
- <cxf.activemq.version>5.15.12</cxf.activemq.version>
+ <cxf.activemq.version>5.15.13</cxf.activemq.version>
<cxf.ahc.version>2.0.40</cxf.ahc.version>
<cxf.apacheds.version>2.0.0.AM26</cxf.apacheds.version>
<cxf.arquillian.version>1.1.14.Final</cxf.arquillian.version>