Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Update Bouncycastle to 1.77.0 #5027

Merged
merged 5 commits into from
Jan 8, 2024
Merged

build: Update Bouncycastle to 1.77.0 #5027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cde68e1
build: Update Bouncycastle to 1.74.0
MMaiero Nov 27, 2023
c70e4d1
fix: updated notice file
MMaiero Nov 27, 2023
fde8c1f
chore: Updated to 1.77
MMaiero Dec 20, 2023
2604557
chore: Updated notice file
MMaiero Dec 20, 2023
1bf09ab
fix: Additional version updates in AI bundle
MMaiero Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions NOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The referenced iplab issues probably need update

* 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
Expand Down
24 changes: 12 additions & 12 deletions kura/org.eclipse.kura.ai.triton.server/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to update also the following versions for consistency?

 org.bouncycastle.openpgp;version="1.71.0",
 org.bouncycastle.openpgp.jcajce;version="1.71.0",
 org.bouncycastle.openpgp.operator.jcajce;version="1.71.0",

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! I have missed that!
I'll do it now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

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)",
Expand Down
2 changes: 1 addition & 1 deletion kura/org.eclipse.kura.api/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
42 changes: 21 additions & 21 deletions kura/org.eclipse.kura.core.keystore/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
14 changes: 7 additions & 7 deletions kura/org.eclipse.kura.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion kura/org.eclipse.kura.driver.opcua.provider/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<com.digitalpetri.netty.netty-channel-fsm.version>0.8</com.digitalpetri.netty.netty-channel-fsm.version>
<com.digitalpetri.fsm.strict-machine.version>0.6</com.digitalpetri.fsm.strict-machine.version>
<com.google.guava.failureaccess.version>1.0</com.google.guava.failureaccess.version>
<org.bouncycastle.version>1.71</org.bouncycastle.version>
<org.bouncycastle.version>1.77</org.bouncycastle.version>
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../test/org.eclipse.kura.internal.driver.opcua.test/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
</properties>

Expand Down
24 changes: 12 additions & 12 deletions kura/test/org.eclipse.kura.core.testutil/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion kura/test/org.eclipse.kura.http.server.manager.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion kura/test/org.eclipse.kura.rest.provider.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
4 changes: 2 additions & 2 deletions target-platform/config/kura.target-platform.build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading