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/24 19:40:16 UTC

[cxf] branch 3.5.x-fixes updated (dbbdc2ce67 -> 99718a61f0)

This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


    from dbbdc2ce67 Recording .gitmergeinfo Changes
     new 8bbd98b6ce Fixed javax.servlet.ServletContainerInitializer by supplying the correct class name
     new 99718a61f0 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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 99718a61f0123f6767c81905da3f631b9ad724d4
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Sep 24 15:39:59 2022 -0400

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9f2eed6152..23f7f4d68b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -65,10 +65,12 @@ M 40d34074f87d33e430e1cf0234f3362ffa00b091
 M 51a65beda38602ff008c032aa406208df8648422
 M 5566cc4600827e08fda454c5644b9ec81251fbba
 M 56a61325089695721be79eff8afec02095d98783
+M 58dc25cb2c441511a7ca65476e7a84d5d3df167b
 M 5b9788a6dd477113da850f5eea48cde9064eac01
 M 60e202dde133752bdf2de35bb8b0ca3dda6113fa
 M 62cb388e44976da22a5beba8791cc331abcb867a
 M 62d728e7acdfc213eb461daf4dfb020855b2eb36
+M 6d00f9b2ca2f7fa6936fb3868e7e29594bbc70d6
 M 6ea9ff22de288343f78f73e44f47983888cbf0b2
 M 719c96a310c0afa62d430588cf38e77523080fa2
 M 7501891ee05153ba43eab3cdadccf789dd15de1e


[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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 8bbd98b6cef390fcc082fbf4b44ff43ff22cd11d
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)
---
 .../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