You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/09/25 01:09:15 UTC
[cxf] branch 3.4.x-fixes updated (a38159634f -> 149ff00426)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from a38159634f Recording .gitmergeinfo Changes
new 88765dad7c Fixed javax.servlet.ServletContainerInitializer by supplying the correct class name
new 149ff00426 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 | 2 ++
.../META-INF/services/javax.servlet.ServletContainerInitializer | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 149ff0042662d083e3bc6f41391917d1af9fcd89
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Sep 24 21:08:58 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index effec2277a..cccbc53b37 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -116,6 +116,7 @@ B 9485e3b46125c9102610aa6dcab6e330952b2fb0
B 951ee01baae5540cf99a29396fe649f25fc5a6b0
B 983d15c06dafbfb883250b2d763bd3d6956ad114
B 9940b6f38d5380fc150cf6409c99197a595c840a
+B 99718a61f0123f6767c81905da3f631b9ad724d4
B 9af2b5a79664da5e8b21cf30a53309489be8326a
B 9ba0178cc44b2b5babafccf056bfc96aa9eea0eb
B 9c5658b9b39403cc95d38a61de900af0591222d5
@@ -415,6 +416,7 @@ M b31779839e148b756d31ffac3886e291a03ef5f5
M b3d7e81a260a02b66f2fc9b98474efe0c1e8968a
M b3fc1996eada7b808d8e8e629e12e07f989be495
M b5c6ed22d517c217f178b4403ad367e5a3bab1bf
+M b5ff2d8eb91ab76381157934cf574f13c9a5e3a2
M b683d4ee1194d8efeae8bef4050bf34abf82501e
M b6d097b020b69d62ee63703b68fb5ad9f8203a2a
M b72f0ce5426eb342145611ee5529c7df172d71c7
[cxf] 01/02: Fixed javax.servlet.ServletContainerInitializer by supplying the correct class name
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 88765dad7c9911d2244285f81009730604050986
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Sep 24 14:20:21 2022 -0400
Fixed javax.servlet.ServletContainerInitializer by supplying the correct class name
(cherry picked from commit 3e17a4ceb8dab1ee4f7917c0b6511cdb6a789ef1)
(cherry picked from commit 8bbd98b6cef390fcc082fbf4b44ff43ff22cd11d)
---
.../META-INF/services/javax.servlet.ServletContainerInitializer | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
index 3d22cbc135..48979d74e8 100644
--- a/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
+++ b/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
@@ -1 +1 @@
-org.apache.cxf.jaxrs.servlet.JaxrsServletContainerInitializer
\ No newline at end of file
+org.apache.cxf.jaxrs.servlet.sci.JaxrsServletContainerInitializer
\ No newline at end of file