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 2022/03/15 09:13:27 UTC
[cxf] branch 3.4.x-fixes updated (9d4e5fb -> 65a6b52)
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 9d4e5fb CXF-8673: Bump httpasyncclient version to 4.1.5 (#922)
new 4ac0479 Updating Tomcat to 9.0.60
new 65a6b52 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] 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 65a6b524938fbbde998831cc4f1cd8597eddfa1f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 15 09:04:57 2022 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6729293..9d14753 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -146,6 +146,7 @@ M 1955e0d57557bd682d0e7fe6bd68d3fb973c4af0
M 1b48b239be3807e843c56939f663ae935a53f6f5
M 1c7c39771adb05f1fa8678e20b97f1c735f2601c
M 1f7d72caf45c4351e27d3b04458cc523ccd3bfdf
+M 25dbe8466e60e3d8df8d9aecb392fe5026875890
M 27f8e28b8415b370d34e46df0d83587d634560c2
M 2871e80043c2452cf9aca3925a07360b8775c508
M 287f3a8a5a4cacbdf6be86e72251ef0f20bcb251
[cxf] 01/02: Updating Tomcat to 9.0.60
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 4ac0479a110dbe52b147fcb9203006ea650cce2b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 15 09:03:33 2022 +0000
Updating Tomcat to 9.0.60
(cherry picked from commit dd6599bf4082b681c52f4f3879820fd15e300acd)
(cherry picked from commit 25dbe8466e60e3d8df8d9aecb392fe5026875890)
# 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 315809e..b9e80a0 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -37,7 +37,7 @@
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>4.5.0</cxf.swagger.ui.version>
<cxf.tika.version>1.28</cxf.tika.version>
- <cxf.tomcat.version>9.0.59</cxf.tomcat.version>
+ <cxf.tomcat.version>9.0.60</cxf.tomcat.version>
<graalvm.version>21.1.0</graalvm.version>
</properties>
<dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index d10dd4c..4b195ff 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -216,7 +216,7 @@
<cxf.swagger2.guava.version>31.0.1-jre</cxf.swagger2.guava.version>
<cxf.swagger2.guava.failureaccess.version>1.0.1</cxf.swagger2.guava.failureaccess.version>
<cxf.tika.version>1.28</cxf.tika.version>
- <cxf.tomcat.version>9.0.59</cxf.tomcat.version>
+ <cxf.tomcat.version>9.0.60</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>