From 1f777af3a1ba4bf9bf086062c26b9421f532dab6 Mon Sep 17 00:00:00 2001 From: Christian Pape Date: Wed, 18 Sep 2024 13:18:54 +0200 Subject: [PATCH 1/2] NMS-16514: Bumped bouncycastle version to 1.78.1 --- opennms-full-assembly/src/assembly/components/osgi.xml | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/opennms-full-assembly/src/assembly/components/osgi.xml b/opennms-full-assembly/src/assembly/components/osgi.xml index 30dfab7f7154..887c6c57d97b 100644 --- a/opennms-full-assembly/src/assembly/components/osgi.xml +++ b/opennms-full-assembly/src/assembly/components/osgi.xml @@ -24,6 +24,7 @@ **/sshd-*/2.8.0/* **/*xstream*/1.4.8_1 **/*xstream*/1.4.8_1/* + %regex[.*org\/bouncycastle\/(bcprov|bctls|bcutil|bcpkix)-jdk18on/1.7[56]/?.*] diff --git a/pom.xml b/pom.xml index 234da1d8a7f2..3687c89031f7 100644 --- a/pom.xml +++ b/pom.xml @@ -1610,7 +1610,7 @@ 5.15.16 3.9.2 1.17 - 1.76 + 1.78.1 2.4.0 3.5.0 2.8.0 From 4885ffe46bcaeaa0c26d00dd1746735c45b4264d Mon Sep 17 00:00:00 2001 From: Christian Pape Date: Thu, 19 Sep 2024 10:40:25 +0200 Subject: [PATCH 2/2] NMS-16514: Review changes --- opennms-full-assembly/src/assembly/components/osgi.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opennms-full-assembly/src/assembly/components/osgi.xml b/opennms-full-assembly/src/assembly/components/osgi.xml index 887c6c57d97b..c2e1ba8ae8dc 100644 --- a/opennms-full-assembly/src/assembly/components/osgi.xml +++ b/opennms-full-assembly/src/assembly/components/osgi.xml @@ -24,7 +24,7 @@ **/sshd-*/2.8.0/* **/*xstream*/1.4.8_1 **/*xstream*/1.4.8_1/* - %regex[.*org\/bouncycastle\/(bcprov|bctls|bcutil|bcpkix)-jdk18on/1.7[56]/?.*] + %regex[.*org\/bouncycastle\/(bcprov|bctls|bcutil|bcpkix)-jdk18on\/1.7[56]\/?.*]