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 2023/01/18 13:45:17 UTC
[cxf] branch 3.5.x-fixes updated (39edd9eb3b -> e55dfd639d)
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 39edd9eb3b Bump maven-checkstyle-plugin from 3.2.0 to 3.2.1 (#1072)
new 744e91b7f7 Update Netty to 4.1.87.Final
new a8f7ec866c Fixed Apache Karaf netty-* features due to newly intoduced dependencies on BouncyCastle
new e55dfd639d 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 | 2 ++
distribution/src/main/release/samples/pom.xml | 2 +-
osgi/karaf/features/src/main/resources/features.xml | 6 ++++++
parent/pom.xml | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
[cxf] 03/03: 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 e55dfd639d47f64a715e249fcda466db00825b88
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jan 18 08:26:45 2023 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 86b70709ac..1580b9095f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -94,6 +94,7 @@ B cf47776be516c10d72911674c9ed3c0c876658b1
B cfca13411eb72d2d07ca243e24ced6e9743e6124
B d30602dda6a86c80c58aa7665f1f6ac11b94845d
B d319f8a2f5ca93e7bcaa028f8026c402e1046037
+B d4b9280f57018cf9c910ac22963a20140f301101
B d735757f556a567f27bfa030dcd33936c5d4ce3f
B d77fd3ac9eb11bd69e5d534dffe53296e4c00ae8
B d7b9a3095d864a6b41dc0ee07dffbd0c36d7cdf6
@@ -228,4 +229,5 @@ M f55be99cd50d9d1fe527bbeb55135174b7fab79b
M fb569f0c4936f7ac7b5197ce823ef9a725453376
M fb7dc28145a243e5e269536e1dc2ee9cea70f17c
M fd261453cf08ac22d2c5be3c2fe4100438c740a5
+M fe9e88be954b889653aca8a0792552fca523dc4e
M ff640769c1e6efc175b864ade495eb8ca5dc2c7e
[cxf] 02/03: Fixed Apache Karaf netty-* features due to newly intoduced dependencies on BouncyCastle
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 a8f7ec866ce46d83999b7fe05b750e8239d9e9f6
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jan 17 22:00:06 2023 -0500
Fixed Apache Karaf netty-* features due to newly intoduced dependencies on BouncyCastle
(cherry picked from commit 894ac788f8cbaea064b0e749865f1e2e7009338d)
---
osgi/karaf/features/src/main/resources/features.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index fe577798e4..9212f2db12 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -191,6 +191,9 @@
<feature name="cxf-http-netty-client" version="${project.version}">
<feature version="${project.version}">cxf-http</feature>
<bundle dependency="true" start-level="40">mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version}</bundle>
+ <bundle start-level="40">mvn:org.bouncycastle/bcprov-jdk15on/${cxf.bcprov.version}</bundle>
+ <bundle start-level="40">mvn:org.bouncycastle/bcutil-jdk15on/${cxf.bcprov.version}</bundle>
+ <bundle start-level="40">mvn:org.bouncycastle/bctls-jdk15on/${cxf.bcprov.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-tcnative-classes/${cxf.netty.tcnative.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-common/${cxf.netty.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-transport-native-unix-common/${cxf.netty.version}</bundle>
@@ -204,6 +207,9 @@
</feature>
<feature name="cxf-http-netty-server" version="${project.version}">
<feature version="${project.version}">cxf-http</feature>
+ <bundle start-level="40">mvn:org.bouncycastle/bcprov-jdk15on/${cxf.bcprov.version}</bundle>
+ <bundle start-level="40">mvn:org.bouncycastle/bcutil-jdk15on/${cxf.bcprov.version}</bundle>
+ <bundle start-level="40">mvn:org.bouncycastle/bctls-jdk15on/${cxf.bcprov.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-tcnative-classes/${cxf.netty.tcnative.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-common/${cxf.netty.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-transport-native-unix-common/${cxf.netty.version}</bundle>
[cxf] 01/03: Update Netty to 4.1.87.Final
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 744e91b7f7ec7450e113023d504f1be4c04bd016
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jan 17 20:12:20 2023 -0500
Update Netty to 4.1.87.Final
(cherry picked from commit 3510be0065382444daf8eaf728fdf0240fd03a9b)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
(cherry picked from commit fe9e88be954b889653aca8a0792552fca523dc4e)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index aa592cdb2c..33f1fc0bc2 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -33,7 +33,7 @@
<spring.boot.version>2.6.14</spring.boot.version>
<spring.cloud.eureka.version>3.1.4</spring.cloud.eureka.version>
<cxf.jetty9.version>9.4.50.v20221201</cxf.jetty9.version>
- <cxf.netty.version>4.1.85.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.87.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>4.15.5</cxf.swagger.ui.version>
<cxf.tika.version>2.6.0</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0c9b97f089..011283ee75 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -177,7 +177,7 @@
<cxf.msv.version>2013.6.1</cxf.msv.version>
<cxf.neethi.version>3.2.0</cxf.neethi.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
- <cxf.netty.version>4.1.86.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.87.Final</cxf.netty.version>
<cxf.netty.tcnative.version>2.0.46.Final</cxf.netty.tcnative.version>
<cxf.olingo.version>2.0.12</cxf.olingo.version>
<cxf.openjpa.version>3.2.2</cxf.openjpa.version>