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 2021/05/06 16:20:42 UTC
[cxf] branch 3.3.x-fixes updated (0e66d11 -> ee6e19c)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 0e66d11 Recording .gitmergeinfo Changes
new 94e8a27 Update karaf to 4.2.11
new ef62338 cxf-rt-rs-extension-search: update dependency exclusion for tika
new ee6e19c Recording .gitmergeinfo Changes
The 3 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 | 7 +++++++
osgi/karaf/features/src/main/resources/features.xml | 2 +-
parent/pom.xml | 2 +-
rt/rs/extensions/search/pom.xml | 4 ++--
4 files changed, 11 insertions(+), 4 deletions(-)
[cxf] 01/03: Update karaf to 4.2.11
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 94e8a27aae52f6f9c94bb9fa50e092d0b1b15e74
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Tue Mar 16 23:46:43 2021 +0300
Update karaf to 4.2.11
(cherry picked from commit 2cc034360947d3fc2e1087192cbaeee3131b5eca)
(cherry picked from commit 2eab747e67a2172614b5d63fa7f7557029e48c42)
---
osgi/karaf/features/src/main/resources/features.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 5826a0b..999a8c4 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -18,7 +18,7 @@
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="cxf-${project.version}">
- <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/1.0.0/xml/features</repository>
+ <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/1.1.4/xml/features</repository>
<feature name="cxf-specs" version="${project.version}">
<bundle start-level="9">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
diff --git a/parent/pom.xml b/parent/pom.xml
index de786a1..073fa41 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -241,7 +241,7 @@
<cxf.jaxb.bundle.version>2.3.1_1</cxf.jaxb.bundle.version>
<cxf.jaxb.context.class.property>none</cxf.jaxb.context.class.property>
<cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
- <cxf.karaf.version>4.2.10</cxf.karaf.version>
+ <cxf.karaf.version>4.2.11</cxf.karaf.version>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
<cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version>
<cxf.osgi.saaj.version>[1.3,2)</cxf.osgi.saaj.version>
[cxf] 02/03: cxf-rt-rs-extension-search: update dependency
exclusion for tika
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ef6233895e19c137bbe496434606adb989e8ba89
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Mon Mar 29 22:50:37 2021 +0300
cxf-rt-rs-extension-search: update dependency exclusion for tika
(cherry picked from commit ca5d02bf9581a28971c8b8d021732972dce5377e)
(cherry picked from commit f4a9d3152c23c12c6e4d63d6a8ba328d0778f3a0)
---
rt/rs/extensions/search/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index ee61d01..83b3c46 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -120,8 +120,8 @@
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
[cxf] 03/03: 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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ee6e19c5fc0d240bb270e0dcdc3fd559929505b7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu May 6 16:10:18 2021 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 37d6dc2..1c55342 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -89,6 +89,7 @@ B 212b83f2da31deff076e5869a30563a90d633aea
B 214e375e1a3771ece687294c4313da0641bea99b
B 218fec091a7626adc6dba9e25454c2b080576ea6
B 21a297f885b486022705065001f418d28263a516
+B 221223da61d1b7ba3dce3b1d73db84ba646c3629
B 22b225fbad422134b7ea14e6b20693bbfcc0a2e9
B 22df51a8d75e3807e4765efd89cb5e5b76b3ef7e
B 23e18bb6dfbe081027609c8d5efcb296eefcdb3b
@@ -198,6 +199,7 @@ B 4ba0fad3a07b3861f542cb14d2e82b4362ce1fb8
B 4ba8ca20314da9a581f1e9a17cec5f14a210f55f
B 4bae9bec5790652c8d91fab66510ae7395c1f32f
B 4c39a21a06edc779a91d5dc86cf85257d7a7d5d4
+B 4d3cf6105c1e5c8906b899296bd493b9890d55e1
B 4d46618c17cb5c1386d493c75faf0f89dbece267
B 4dfd51045436d16f94c422d20f930244bb819e2c
B 4e981b1f5bb19bc85e3b92e325216148ef043e8c
@@ -409,6 +411,7 @@ B a207359e74b2f664dbd78855e7e49e0efe3972b8
B a276fd2cfd6e78326cda060779d9d8568e796313
B a29109410e8427d1fb8edf5fb88c955aaca0b79a
B a2c07c91d9df7849dc58d3b2e68fb17384cf2711
+B a37f192c93be370fde6ff2f00ca9047f94f7abf2
B a421613ce5b5bb21bfa22c94a3b3fd42b77c9079
B a44960c899ed754f2192fcc62b4320b6bbb4b184
B a4b0113d99e5831d994e1b04f9f7b260ee45512e
@@ -663,6 +666,7 @@ M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
M 0b69090f97e262d8c107d82781dcba49fa15626d
M 0bdb9613d9fb15feaea5e925ab86122194aa6843
M 0c182f592250fe03fec460cbc15727e22b96675c
+M 0fbdfd6519dd3e0759a0a5a1fdf625314392bc3e
M 10251d33f0f379a5bebc640466b639382cbe42bb
M 10e1322cfb148d8ebc37b43ef2d3afd74dcdd226
M 113e426f6b717925736433fe04a1b72f801dd574
@@ -681,6 +685,7 @@ M 180578d01f361d77ce7f42dd760fa8d5f245ce7e
M 1820f1a94b08ba840c3868ac3e1f3b7751540a08
M 1a14a904c9f8af53650860ff94af2ef50f4260ed
M 1b3296e55205c19727a89476f442b3adab9a731a
+M 1b49a198212c1798b7755df2591c948f599f5bef
M 1b51787d4680a03ac1fa72be40c9fe76064089c5
M 1ceb6d0928a62d8c6b07fad0db25e92d2d4b273d
M 1d055e6c5c0783c4c7a28ff36849efa5d010fa4c
@@ -704,6 +709,7 @@ M 2c7b64383d81db5e7bd14abc90fbbbf0597044af
M 2cde96f38fc835f7d0eb1e303037e572110c3399
M 2e3258cfa57a93b92d5ab17ce85a66ce9bdd5ffe
M 2e3631a3a7ddb4551c12ef67aef04ce90d635fe1
+M 2eab747e67a2172614b5d63fa7f7557029e48c42
M 2f392a68ed59b0a73ffdc3ff114bba1041ae3f63
M 2f844e251362ab62923cfc6b7061591375a1cb44
M 325ed0436bc9cfa9150b3504a54b5911b47e3266
@@ -917,6 +923,7 @@ M f315acdde42f967102c7503d46d1edbb3affc210
M f355b9b3ec8b6f77198baefa051bd817807e5a94
M f3e2a52faec1210b1a45eaa36e3812ca03a4969d
M f4a82cd5ebf2675085e7aa48bbcd10b50b1dd337
+M f4a9d3152c23c12c6e4d63d6a8ba328d0778f3a0
M f5899862b61bc39a7e2bb7945071ebfa3e6a8153
M f58b24b5a56526ca051fe0b296fef73a982a1b86
M f5919bbdb97dfaedba6847d1e8d27e42f2de843d