From a73c7af6c1d08872c7b5b1aeba544eca0ea09601 Mon Sep 17 00:00:00 2001 From: Matteo Maiero Date: Mon, 8 Jan 2024 15:25:06 +0100 Subject: [PATCH] build: Update Bouncycastle to 1.77.0 (#5027) * build: Update Bouncycastle to 1.74.0 Signed-off-by: MMaiero * fix: updated notice file Signed-off-by: MMaiero * chore: Updated to 1.77 Signed-off-by: MMaiero * chore: Updated notice file Signed-off-by: MMaiero * fix: Additional version updates in AI bundle Signed-off-by: MMaiero --------- Signed-off-by: MMaiero --- NOTICE.md | 10 ++--- .../META-INF/MANIFEST.MF | 24 +++++------ .../org.eclipse.kura.api/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 42 +++++++++---------- .../META-INF/MANIFEST.MF | 14 +++---- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 24 +++++------ .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../kura.target-platform.build.properties | 4 +- 10 files changed, 63 insertions(+), 63 deletions(-) diff --git a/NOTICE.md b/NOTICE.md index ee97e081b8e..837a79dd443 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -124,11 +124,11 @@ This project leverages the following third party content. * maven/mavencentral/org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/4.3.20.RELEASE_1, Apache-2.0, approved, CQ16242 * maven/mavencentral/org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/4.3.20.RELEASE_1, Apache-2.0, approved, CQ16243 * maven/mavencentral/org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/4.3.20.RELEASE_1, Apache-2.0, approved, CQ16244 -* maven/mavencentral/org.bouncycastle/bcpg-jdk18on/1.71, Apache-2.0, approved, #2665 -* maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.71, MIT, approved, #2662 -* maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.71, MIT AND LicenseRef-scancode-ocb-open-source-2013, approved, #2666 -* maven/mavencentral/org.bouncycastle/bctls-jdk18on/1.71, MIT, approved, #2664 -* maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.71, MIT, approved, #2663 +* maven/mavencentral/org.bouncycastle/bcpg-jdk18on/1.77, Apache-2.0, approved, #11594 +* maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.77, MIT, approved, #11593 +* maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.77, MIT AND CC0-1.0, approved, #11595 +* maven/mavencentral/org.bouncycastle/bctls-jdk18on/1.77, MIT, approved, #11702 +* maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.77, MIT, approved, #11596 * maven/mavencentral/org.eclipse.jetty/jetty-continuation/9.4.53.v20231009, EPL-2.0 OR Apache-2.0, approved, rt.jetty * maven/mavencentral/org.eclipse.jetty/jetty-http/9.4.53.v20231009, EPL-2.0 OR Apache-2.0, approved, rt.jetty * maven/mavencentral/org.eclipse.jetty/jetty-io/9.4.53.v20231009, EPL-2.0 OR Apache-2.0, approved, rt.jetty diff --git a/kura/org.eclipse.kura.ai.triton.server/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.ai.triton.server/META-INF/MANIFEST.MF index 5d25f96fd8f..7387b464106 100644 --- a/kura/org.eclipse.kura.ai.triton.server/META-INF/MANIFEST.MF +++ b/kura/org.eclipse.kura.ai.triton.server/META-INF/MANIFEST.MF @@ -25,18 +25,18 @@ Import-Package: com.google.common.base;version="25.0.0", javax.annotation;version="1.2.0", org.apache.commons.io;version="2.4.0", org.apache.commons.io.filefilter;version="2.11.0", - org.bouncycastle.jcajce;version="1.68.0", - org.bouncycastle.jcajce.interfaces;version="1.68.0", - org.bouncycastle.jcajce.io;version="1.68.0", - org.bouncycastle.jcajce.spec;version="1.68.0", - org.bouncycastle.jcajce.util;version="1.68.0", - org.bouncycastle.jce.provider;version="1.68.0", - org.bouncycastle.openpgp;version="1.71.0", - org.bouncycastle.openpgp.jcajce;version="1.71.0", - org.bouncycastle.openpgp.operator.jcajce;version="1.71.0", - org.bouncycastle.util;version="1.68.0", - org.bouncycastle.util.encoders;version="1.68.0", - org.bouncycastle.util.io;version="1.68.0", + org.bouncycastle.jcajce;version="1.77.0", + org.bouncycastle.jcajce.interfaces;version="1.77.0", + org.bouncycastle.jcajce.io;version="1.77.0", + org.bouncycastle.jcajce.spec;version="1.77.0", + org.bouncycastle.jcajce.util;version="1.77.0", + org.bouncycastle.jce.provider;version="1.77.0", + org.bouncycastle.openpgp;version="1.77.0", + org.bouncycastle.openpgp.jcajce;version="1.77.0", + org.bouncycastle.openpgp.operator.jcajce;version="1.77.0", + org.bouncycastle.util;version="1.77.0", + org.bouncycastle.util.encoders;version="1.77.0", + org.bouncycastle.util.io;version="1.77.0", org.eclipse.kura;version="[1.0,2.0)", org.eclipse.kura.ai.inference;version="[1.0,1.1)", org.eclipse.kura.configuration;version="[1.1,2.0)", diff --git a/kura/org.eclipse.kura.api/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.api/META-INF/MANIFEST.MF index 208ffc13344..0dcfb514914 100644 --- a/kura/org.eclipse.kura.api/META-INF/MANIFEST.MF +++ b/kura/org.eclipse.kura.api/META-INF/MANIFEST.MF @@ -90,7 +90,7 @@ Import-Package: javax.comm;version="1.2.0", javax.usb;version="1.0.2", org.apache.commons.io.output;version="2.4.0", org.apache.logging.log4j;version="2.8.2", - org.bouncycastle.pkcs;version="1.71.0", + org.bouncycastle.pkcs;version="1.77.0", org.osgi.annotation.versioning;version="[1.0.0,2.0.0)";resolution:=optional, org.osgi.framework;version="[1.5.0,2.0.0)", org.osgi.service.component;version="1.2.0", diff --git a/kura/org.eclipse.kura.core.keystore/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.core.keystore/META-INF/MANIFEST.MF index 246f712ee1a..dc1cb325008 100644 --- a/kura/org.eclipse.kura.core.keystore/META-INF/MANIFEST.MF +++ b/kura/org.eclipse.kura.core.keystore/META-INF/MANIFEST.MF @@ -11,27 +11,27 @@ Import-Package: com.eclipsesource.json;version="0.9.5", javax.annotation.security;version="1.2.0", javax.ws.rs;version="2.0.1", javax.ws.rs.core;version="2.0.1", - org.bouncycastle.asn1;version="1.71.0", - org.bouncycastle.asn1.cms;version="1.71.0", - org.bouncycastle.asn1.pkcs;version="1.71.0", - org.bouncycastle.asn1.x500;version="1.71.0", - org.bouncycastle.asn1.x509;version="1.71.0", - org.bouncycastle.cert;version="1.71.0", - org.bouncycastle.cert.jcajce;version="1.71.0", - org.bouncycastle.cms;version="1.71.0", - org.bouncycastle.jcajce.provider.asymmetric.dsa;version="1.71.0", - org.bouncycastle.jcajce.provider.asymmetric.ec;version="1.71.0", - org.bouncycastle.jcajce.provider.asymmetric.rsa;version="1.71.0", - org.bouncycastle.jce.provider;version="1.71.0", - org.bouncycastle.openssl;version="1.71.0", - org.bouncycastle.openssl.bc;version="1.71.0", - org.bouncycastle.openssl.jcajce;version="1.71.0", - org.bouncycastle.operator;version="1.71.0", - org.bouncycastle.operator.jcajce;version="1.71.0", - org.bouncycastle.pkcs;version="1.71.0", - org.bouncycastle.pkcs.jcajce;version="1.71.0", - org.bouncycastle.util;version="1.71.0", - org.bouncycastle.util.io.pem;version="1.71.0", + org.bouncycastle.asn1;version="1.77.0", + org.bouncycastle.asn1.cms;version="1.77.0", + org.bouncycastle.asn1.pkcs;version="1.77.0", + org.bouncycastle.asn1.x500;version="1.77.0", + org.bouncycastle.asn1.x509;version="1.77.0", + org.bouncycastle.cert;version="1.77.0", + org.bouncycastle.cert.jcajce;version="1.77.0", + org.bouncycastle.cms;version="1.77.0", + org.bouncycastle.jcajce.provider.asymmetric.dsa;version="1.77.0", + org.bouncycastle.jcajce.provider.asymmetric.ec;version="1.77.0", + org.bouncycastle.jcajce.provider.asymmetric.rsa;version="1.77.0", + org.bouncycastle.jce.provider;version="1.77.0", + org.bouncycastle.openssl;version="1.77.0", + org.bouncycastle.openssl.bc;version="1.77.0", + org.bouncycastle.openssl.jcajce;version="1.77.0", + org.bouncycastle.operator;version="1.77.0", + org.bouncycastle.operator.jcajce;version="1.77.0", + org.bouncycastle.pkcs;version="1.77.0", + org.bouncycastle.pkcs.jcajce;version="1.77.0", + org.bouncycastle.util;version="1.77.0", + org.bouncycastle.util.io.pem;version="1.77.0", org.eclipse.kura;version="[1.6,2.0)", org.eclipse.kura.certificate;version="[2.1,3.0)", org.eclipse.kura.cloudconnection.message;version="[1.0,2.0)", diff --git a/kura/org.eclipse.kura.core/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.core/META-INF/MANIFEST.MF index 8b52b295361..ceac3d6c3ea 100644 --- a/kura/org.eclipse.kura.core/META-INF/MANIFEST.MF +++ b/kura/org.eclipse.kura.core/META-INF/MANIFEST.MF @@ -22,13 +22,13 @@ Import-Package: javax.crypto, org.apache.commons.exec.util;version="1.3.0", org.apache.commons.io;version="[2.4,3.0)", org.apache.commons.io.output;version="2.4.0", - org.bouncycastle.asn1.x500;version="1.68.0", - org.bouncycastle.openssl.jcajce;version="1.68.0", - org.bouncycastle.operator;version="1.68.0", - org.bouncycastle.operator.jcajce;version="1.68.0", - org.bouncycastle.pkcs;version="1.68.0", - org.bouncycastle.pkcs.jcajce;version="1.68.0", - org.bouncycastle.util.io.pem;version="1.68.0", + org.bouncycastle.asn1.x500;version="1.77.0", + org.bouncycastle.openssl.jcajce;version="1.77.0", + org.bouncycastle.operator;version="1.77.0", + org.bouncycastle.operator.jcajce;version="1.77.0", + org.bouncycastle.pkcs;version="1.77.0", + org.bouncycastle.pkcs.jcajce;version="1.77.0", + org.bouncycastle.util.io.pem;version="1.77.0", org.eclipse.kura;version="[1.0,2.0)", org.eclipse.kura.certificate;version="[2.0,3.0)", org.eclipse.kura.configuration;version="[1.1,2.0)", diff --git a/kura/org.eclipse.kura.driver.opcua.provider/pom.xml b/kura/org.eclipse.kura.driver.opcua.provider/pom.xml index 2394165c3d6..3bb4d22b666 100644 --- a/kura/org.eclipse.kura.driver.opcua.provider/pom.xml +++ b/kura/org.eclipse.kura.driver.opcua.provider/pom.xml @@ -37,7 +37,7 @@ 0.8 0.6 1.0 - 1.71 + 1.77 ${project.basedir}/../test/org.eclipse.kura.internal.driver.opcua.test/target/site/jacoco-aggregate/jacoco.xml diff --git a/kura/test/org.eclipse.kura.core.testutil/META-INF/MANIFEST.MF b/kura/test/org.eclipse.kura.core.testutil/META-INF/MANIFEST.MF index 0564f722b31..64350f73654 100644 --- a/kura/test/org.eclipse.kura.core.testutil/META-INF/MANIFEST.MF +++ b/kura/test/org.eclipse.kura.core.testutil/META-INF/MANIFEST.MF @@ -10,18 +10,18 @@ Import-Package: com.eclipsesource.json;version="0.9.5", javax.servlet.http;version="3.1.0", junit.framework;version="[4.12.0,5.0.0)", org.apache.commons.io;version="2.4.0", - org.bouncycastle.asn1;version="1.68.0", - org.bouncycastle.asn1.x500;version="1.68.0", - org.bouncycastle.asn1.x509;version="1.68.0", - org.bouncycastle.cert;version="1.68.0", - org.bouncycastle.cert.bc;version="1.68.0", - org.bouncycastle.cert.jcajce;version="1.68.0", - org.bouncycastle.jce.provider;version="1.68.0", - org.bouncycastle.openssl;version="1.68.0", - org.bouncycastle.openssl.jcajce;version="1.68.0", - org.bouncycastle.operator;version="1.68.0", - org.bouncycastle.operator.jcajce;version="1.68.0", - org.bouncycastle.x509.extension;version="1.68.0", + org.bouncycastle.asn1;version="1.77.0", + org.bouncycastle.asn1.x500;version="1.77.0", + org.bouncycastle.asn1.x509;version="1.77.0", + org.bouncycastle.cert;version="1.77.0", + org.bouncycastle.cert.bc;version="1.77.0", + org.bouncycastle.cert.jcajce;version="1.77.0", + org.bouncycastle.jce.provider;version="1.77.0", + org.bouncycastle.openssl;version="1.77.0", + org.bouncycastle.openssl.jcajce;version="1.77.0", + org.bouncycastle.operator;version="1.77.0", + org.bouncycastle.operator.jcajce;version="1.77.0", + org.bouncycastle.x509.extension;version="1.77.0", org.eclipse.jetty.server;version="9.4.41", org.eclipse.jetty.server.handler;version="9.4.41", org.eclipse.jetty.servlet;version="9.4.41", diff --git a/kura/test/org.eclipse.kura.http.server.manager.test/META-INF/MANIFEST.MF b/kura/test/org.eclipse.kura.http.server.manager.test/META-INF/MANIFEST.MF index fe9430e0145..c03373050ac 100644 --- a/kura/test/org.eclipse.kura.http.server.manager.test/META-INF/MANIFEST.MF +++ b/kura/test/org.eclipse.kura.http.server.manager.test/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Kura Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.kura.http.server.manager;bundle-version="1.1.0" -Import-Package: org.bouncycastle.asn1.x500;version="1.68.0", +Import-Package: org.bouncycastle.asn1.x500;version="1.77.0", org.eclipse.kura;version="1.6.0", org.eclipse.kura.configuration;version="1.2.0", org.eclipse.kura.core.testutil.event;version="[1.0,2.0)", diff --git a/kura/test/org.eclipse.kura.rest.provider.test/META-INF/MANIFEST.MF b/kura/test/org.eclipse.kura.rest.provider.test/META-INF/MANIFEST.MF index 0538b7ed765..19e6dd31e94 100644 --- a/kura/test/org.eclipse.kura.rest.provider.test/META-INF/MANIFEST.MF +++ b/kura/test/org.eclipse.kura.rest.provider.test/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Import-Package: com.eclipsesource.json;version="0.9.5", javax.ws.rs.container;version="2.0.1", javax.ws.rs.ext;version="2.0.1", org.apache.commons.io;version="2.4.0", - org.bouncycastle.asn1.x500;version="1.71.0", + org.bouncycastle.asn1.x500;version="1.77.0", org.eclipse.kura;version="1.6.0", org.eclipse.kura.configuration;version="[1.2,2.0)", org.eclipse.kura.configuration.metatype;version="[1.1,2.0)", diff --git a/target-platform/config/kura.target-platform.build.properties b/target-platform/config/kura.target-platform.build.properties index 38c9279f388..41e6d02cd9a 100644 --- a/target-platform/config/kura.target-platform.build.properties +++ b/target-platform/config/kura.target-platform.build.properties @@ -83,8 +83,8 @@ jakarta.xml.soap-api.version=1.4.2 jaxb-osgi.version=2.3.3 osgi-resource-locator.version=1.0.3 -org.bouncycastle.version=1.71 -org.bouncycastle.jar.version=1.71.0 +org.bouncycastle.version=1.77 +org.bouncycastle.jar.version=1.77.0 com.eurotech.gpsd4java.version=1.0.0 libsocket-can-osgi.version=1.3.0-SNAPSHOT