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 20:28:12 UTC
[cxf] branch 3.4.x-fixes updated (890fb7c68b -> 1dc7593516)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 890fb7c68b Bump maven-checkstyle-plugin from 3.2.0 to 3.2.1 (#1072)
new c54a3d5361 Update Netty to 4.1.87.Final
new aba03b45bc Fixed Apache Karaf netty-* features due to newly intoduced dependencies on BouncyCastle
new 1dc7593516 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] 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit aba03b45bca493f2560362a781c32e6a5f6b48e9
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)
(cherry picked from commit a8f7ec866ce46d83999b7fe05b750e8239d9e9f6)
---
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 3e6c897990..8bc8534a1e 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c54a3d53614da90b48ebf716901697a4fea88f4f
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
(cherry picked from commit 744e91b7f7ec7450e113023d504f1be4c04bd016)
---
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 f487f45c79..40e41aa2d3 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.3.12.RELEASE</spring.boot.version>
<spring.cloud.eureka.version>2.2.10.RELEASE</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>1.28.5</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 21fac39b79..fb344ca60e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -179,7 +179,7 @@
<cxf.msv.version>2013.6.1</cxf.msv.version>
<cxf.neethi.version>3.1.1</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.oauth.version>20100527</cxf.oauth.version>
<cxf.olingo.version>2.0.12</cxf.olingo.version>
[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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1dc7593516efff516c2a51de894ae3e0174d8b1b
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jan 18 15:21:06 2023 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 03d36c830d..d907309728 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -225,6 +225,7 @@ B dfbc4575f45fb22d4a7417914f87ea585e64d6b1
B e35fa6609a4a6cb204d337bab4124288422cc616
B e441840c0212b8559ad406595fa4174a29124652
B e4b56ffecdb410df90d7fb5a8c12982d9e421c0d
+B e55dfd639d47f64a715e249fcda466db00825b88
B e713fd34837af629711a16a7e376b0a090a393c7
B e7f7b2154ed9f5668a62a7e99f862ca1aef7cd43
B e81cd0987fe134227487c6398e746f4ad90ff9bf
@@ -440,6 +441,7 @@ M 72bca068a9a2efd5be8a5e24bbff688ae27cb781
M 72fee532816746a107f32cacad53f391b89073eb
M 7381411c96166c7320e07f9809182e060d52e7df
M 73c22d0a0c0f98a6def324f28c4eee10bda917ea
+M 744e91b7f7ec7450e113023d504f1be4c04bd016
M 74d2a97deb62742559facb0f4693e0f65d3ace5d
M 752a8a2dafff76ed8098cd73f1e071ffa0514754
M 76009494143e7e10ad1d47e07ead384d5ba06086