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/10/05 08:20:18 UTC
[cxf] branch 3.4.x-fixes updated (0401602 -> 1711063)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 0401602 Update Dropwizard Metrics to 4.1.26
new b710148 Updating Tomcat to 9.0.54
new 1711063 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 +
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
[cxf] 01/02: Updating Tomcat to 9.0.54
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b710148b2b2eff0699ba2d6a5c6b9a698ec43e16
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 5 09:06:37 2021 +0100
Updating Tomcat to 9.0.54
(cherry picked from commit ad194637ee3dd22f445e34b6db72d314ee650d79)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
# parent/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 1f4cb16..21438ec 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -36,7 +36,7 @@
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>3.52.1</cxf.swagger.ui.version>
<cxf.tika.version>1.27</cxf.tika.version>
- <cxf.tomcat.version>9.0.53</cxf.tomcat.version>
+ <cxf.tomcat.version>9.0.54</cxf.tomcat.version>
<graalvm.version>21.1.0</graalvm.version>
</properties>
<dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index be2da7b..36d927a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -207,7 +207,7 @@
<cxf.swagger2.version>1.6.3</cxf.swagger2.version>
<cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
<cxf.tika.version>1.27</cxf.tika.version>
- <cxf.tomcat.version>9.0.53</cxf.tomcat.version>
+ <cxf.tomcat.version>9.0.54</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.7</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
<cxf.undertow.xnio.osgi.version>[3.3,4.0)</cxf.undertow.xnio.osgi.version>
[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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 17110631add44498323553df065eaeabb802787e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 5 09:07:57 2021 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index dca52b9..12ca1ab 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -187,6 +187,7 @@ M a59dff0ba50418ced57ae8ef425f96df78af9f5c
M a7e7e62fd3c68fa3f262bd021ae62076335c359c
M a894689ac803c234bf38a59f7d845aec4f4d70e0
M ac656dd13ac54b83aeb0c877e01dfb277d38ca96
+M ad194637ee3dd22f445e34b6db72d314ee650d79
M ade1129cd94291f7fbd12cb536bc9367b19bb870
M b5c6ed22d517c217f178b4403ad367e5a3bab1bf
M b72f0ce5426eb342145611ee5529c7df172d71c7