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 2020/12/07 11:16:05 UTC
[cxf] branch 3.4.x-fixes updated (baf1657 -> 76ff1e8)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from baf1657 [CXF-8361] Added support for jakarta NS in AnnotationHandlerChainBuilder (#718)
new 14976f9 [CXF-8386]:Upgrade BouncyCastle to 1.67 (#734)
new 700f1c8 Recording .gitmergeinfo Changes
new 76ff1e8 update bouncycastle dependency
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 | 1 +
parent/pom.xml | 2 +-
rt/rs/security/jcs-parent/jcs/pom.xml | 7 -------
rt/rs/security/jose-parent/jose/pom.xml | 3 +--
systests/rs-security/pom.xml | 6 ------
5 files changed, 3 insertions(+), 16 deletions(-)
[cxf] 03/03: update bouncycastle dependency
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 76ff1e8c3d049d1db2e12789acbfbd3b9a85eb19
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Mon Dec 7 11:08:38 2020 +0300
update bouncycastle dependency
(cherry picked from commit 8b69843219f4a2387992c46f6555da2eee7073a6)
---
rt/rs/security/jcs-parent/jcs/pom.xml | 7 -------
rt/rs/security/jose-parent/jose/pom.xml | 3 +--
systests/rs-security/pom.xml | 6 ------
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/rt/rs/security/jcs-parent/jcs/pom.xml b/rt/rs/security/jcs-parent/jcs/pom.xml
index aa4f765..6bfeabe 100644
--- a/rt/rs/security/jcs-parent/jcs/pom.xml
+++ b/rt/rs/security/jcs-parent/jcs/pom.xml
@@ -44,13 +44,6 @@
<artifactId>cxf-rt-security</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-ext-jdk15on</artifactId>
- <version>${cxf.bcprov.version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
<!--test dependencies-->
<dependency>
<groupId>junit</groupId>
diff --git a/rt/rs/security/jose-parent/jose/pom.xml b/rt/rs/security/jose-parent/jose/pom.xml
index 9c47d06..b3f9dd9 100644
--- a/rt/rs/security/jose-parent/jose/pom.xml
+++ b/rt/rs/security/jose-parent/jose/pom.xml
@@ -51,8 +51,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-ext-jdk15on</artifactId>
- <version>${cxf.bcprov.version}</version>
+ <artifactId>bcprov-jdk15on</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
index c1ccede..213b739 100644
--- a/systests/rs-security/pom.xml
+++ b/systests/rs-security/pom.xml
@@ -85,12 +85,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-ext-jdk15on</artifactId>
- <version>${cxf.bcprov.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${project.version}</version>
[cxf] 02/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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 700f1c85b01f3bf14ad20e1dd57f89a812109894
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Dec 7 07:04:16 2020 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 72b44dc..44ed9b4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -3,6 +3,7 @@ origin/master
B 0e235a4d7ca094ebd2a8afc6b22c00a841e2e554
B 27d9f6ac75162f9bbcfcf2bb2f5b569baf424a5d
B 28780a99ff888d6e27c1c6d92dda0046bf513d33
+B 837401d8b08449ea34304df68600514d1132c499
B 9485e3b46125c9102610aa6dcab6e330952b2fb0
B c58d2cd38003a90608aa04e40756c042cbaf7e03
B f5f08c838e1d52f17bcc8422fac38831a63e6e30
[cxf] 01/03: [CXF-8386]:Upgrade BouncyCastle to 1.67 (#734)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 14976f9896a89f00e22629420636991b2e0f95fa
Author: jimma <em...@apache.org>
AuthorDate: Mon Dec 7 15:01:13 2020 +0800
[CXF-8386]:Upgrade BouncyCastle to 1.67 (#734)
(cherry picked from commit f5d43600b33b10cc9e4168f792423724131e7e6f)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f0b3cdc..c7ea338 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -85,7 +85,7 @@
<cxf.aspectj.version>1.9.1</cxf.aspectj.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.6.1</cxf.atmosphere.version>
- <cxf.bcprov.version>1.66</cxf.bcprov.version>
+ <cxf.bcprov.version>1.67</cxf.bcprov.version>
<cxf.brave.reporter.version>2.15.4</cxf.brave.reporter.version>
<cxf.brave.version>5.13.0</cxf.brave.version>
<cxf.brave.zipkin.version>2.22.1</cxf.brave.zipkin.version>