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 2021/09/06 19:53:53 UTC
[cxf] branch 3.3.x-fixes updated (b532c50 -> 0a89624)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from b532c50 CXF-8588: Micrometer operation UNKNOWN for clients (#844)
new aadb48c CXF-8585: cxf-specs feature should use stax2-api 4.2 bundle with dependency=true (#843)
new 0a89624 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 +
osgi/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
[cxf] 01/02: CXF-8585: cxf-specs feature should use stax2-api 4.2
bundle with dependency=true (#843)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit aadb48c9a0c50535da2f07ad2804e869daf5a456
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Sep 4 07:04:18 2021 -0400
CXF-8585: cxf-specs feature should use stax2-api 4.2 bundle with dependency=true (#843)
(cherry picked from commit c225e8606155945ca2f9d52adf0d4e5efbd00c63)
(cherry picked from commit 861c6ae9e63ba01cd5f6ae398a83a2d09a1b1364)
# Conflicts:
# osgi/karaf/features/src/main/resources/features.xml
---
osgi/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 999a8c4..3b62806 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -31,7 +31,7 @@
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.jaxrs.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:javax.mail/mail/${cxf.javax.mail.version}</bundle>
- <bundle start-level="20">mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
+ <bundle start-level="20" dependency="true">mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
<bundle start-level="20">mvn:com.fasterxml.woodstox/woodstox-core/${cxf.woodstox.core.version}</bundle>
<bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-runtime/${cxf.jaxb.bundle.version}</bundle>
<bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
[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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0a89624b1b23850d7704f169829dd44c5567e92c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Sep 6 15:53:25 2021 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c258756..a33a736 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -891,6 +891,7 @@ M 83c9d2701fbf4ed54bd704ca7c4cf67f57e1048d
M 84bc3830fb3d320f843b43d86e90d8a7e7e871d4
M 85225069fe57849cbfac1b039014ce195a1d3bb5
M 8532499404623bd531147ee314ec65544cab34de
+M 861c6ae9e63ba01cd5f6ae398a83a2d09a1b1364
M 8751a7c9e70b23a48e6048de5d75e113218adf94
M 8798b83cef186439b72ff02d9bafa37f9658404e
M 88907f141ee80792627da3cc7846d1562f6c0238