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 2020/10/24 14:43:42 UTC
[cxf] branch 3.3.x-fixes updated (caf65df -> 9a27e10)
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 caf65df Recording .gitmergeinfo Changes
new cefb639 Update to Apache Karaf 4.2.10 and Pax Exam 4.13.4
new 9a27e10 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 +
parent/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
[cxf] 01/02: Update to Apache Karaf 4.2.10 and Pax Exam 4.13.4
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 cefb63933c70cda9ce78681f0c0fb48a31ca5a5a
Author: reta <dr...@gmail.com>
AuthorDate: Fri Oct 23 21:36:05 2020 -0400
Update to Apache Karaf 4.2.10 and Pax Exam 4.13.4
(cherry picked from commit 84bc3830fb3d320f843b43d86e90d8a7e7e871d4)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ca2c3c..87c93e6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -241,12 +241,12 @@
<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.9</cxf.karaf.version>
+ <cxf.karaf.version>4.2.10</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.osgi.version>5.0.0</cxf.osgi.version>
- <cxf.pax.exam.version>4.13.3</cxf.pax.exam.version>
+ <cxf.pax.exam.version>4.13.4</cxf.pax.exam.version>
<cxf.reflections.bundle.version>0.9.11_2</cxf.reflections.bundle.version>
<cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
<cxf.saaj-impl.bundle.version>1.3.23_2</cxf.saaj-impl.bundle.version>
[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 9a27e102e9ac6a1454c347c608796622c3d4eb1b
Author: reta <dr...@gmail.com>
AuthorDate: Sat Oct 24 10:43:21 2020 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7b4bb15..0b29d1f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -461,6 +461,7 @@ M 7e1bc67acf02fe6049a4bfb7e13fe6933e618ae8
M 7ef814556d727c147d6f625cbb1170edfd24a752
M 7f733555945f1faed66b0b6163d24889d4cf60fc
M 83c9d2701fbf4ed54bd704ca7c4cf67f57e1048d
+M 84bc3830fb3d320f843b43d86e90d8a7e7e871d4
M 8b11d6b26369650e5f4c6f3730dbb97d60927d9b
M 90cad919d00dad2aaeede8f8475c14e2c2e76ad0
M 9115be37d5a5a76b747c03452bbbf7fb2da7be56