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 2021/03/09 14:57:49 UTC
[cxf] branch 3.3.x-fixes updated (635d6d9 -> 9795bc9)
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 635d6d9 Recording .gitmergeinfo Changes
new 4762533 Updating Velocity to 2.3
new 9795bc9 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 9795bc98d3da71a0b0ab1d2aa53c81176bcee16b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 9 13:47:23 2021 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ebe6fd1..86d8a66 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -585,6 +585,7 @@ M 601939d43496c5a1da0e6ff14434f5a50bb3f6a9
M 61aeaff2d747379c64cdad40f82cf51e3bfaecf6
M 64e772e56271ed2dd588317646e1ef0796c77635
M 651a0068441d4ecea57e0400559bd439f357e677
+M 66f420a27b7b4b18a78f0dbc39b4e68f5b54dc53
M 67643a4fe883f5d6067d4ce07f48cf4de10be9f7
M 69b805a97fa96716c8f76278e577ba122c2727e2
M 6a77819f4bc141fcddd53a36b178972f1f68fe97
[cxf] 01/02: Updating Velocity to 2.3
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 4762533fb18ee1922ea9c29ef2bcedcc09dc2847
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 9 13:46:16 2021 +0000
Updating Velocity to 2.3
(cherry picked from commit 66f420a27b7b4b18a78f0dbc39b4e68f5b54dc53)
# 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 7c0a201..26a89cd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -213,7 +213,7 @@
with a qualifier. We do want a range. -->
<cxf.validation.api.package.version>[1.0.0,2)</cxf.validation.api.package.version>
<cxf.validation.api.version>1.1.0.Final</cxf.validation.api.version>
- <cxf.velocity.version>2.2</cxf.velocity.version>
+ <cxf.velocity.version>2.3</cxf.velocity.version>
<cxf.wiremock.version>2.23.2</cxf.wiremock.version>
<cxf.woodstox.core.version>5.0.3</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>