This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from de7d8ce4f5 Bump maven-resources-plugin from 3.3.0 to 3.3.1 (#1211)
new f1f32b6f58 CXF-8824: CDI beans produced by @Produces methods are
generated twice (#1163)
new 91ab6c7e75 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 | 5 ++++
.../apache/cxf/cdi/JAXRSCdiResourceExtension.java | 10 ++++----
.../cxf/systest/jaxrs/cdi/BookStoreFeed.java | 12 ++++++++--
.../jaxrs/cdi/BookStoreProducerApplication.java | 9 +++----
.../jaxrs/cdi/ServerFactoryDebugExtension.java | 28 +++++++++++++++-------
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 13 ++++++++++
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 13 ++++++++++
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 13 ++++++++++
8 files changed, 84 insertions(+), 19 deletions(-)
copy
rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/ext/SseTransportCustomizationExtension.java
=>
systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/ServerFactoryDebugExtension.java
(63%)