Remove explicit dependency on bouncy castle Bouncy Castle was added explicitly as a test dependency. This caused the tests to fail, because a version gap between Gerrit core and the plugin happened. Since the Gerrit plugin API does also provide Bouncy Castle, it is not required to add it explicitly. Change-Id: Ia1c97b143bee6912ea0d4211ee20d130e2ffad8c
diff --git a/BUILD b/BUILD index a8ced75..23c98f9 100644 --- a/BUILD +++ b/BUILD
@@ -40,7 +40,6 @@ deps = [ ":events-log__plugin", "@events-log_plugin_deps//:com_zaxxer_HikariCP", - "@events-log_plugin_deps//:org_bouncycastle_bcpg_jdk18on", ], )
diff --git a/MODULE.bazel b/MODULE.bazel index 70b7fa2..2f688c9 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -32,15 +32,15 @@ name = "events-log_plugin_deps", artifacts = [ "com.zaxxer:HikariCP:5.1.0", - # Required only for tests in standalone build mode. In Gerrit tree mode, - # this dependency is provided transitively by the acceptance framework. - "org.bouncycastle:bcpg-jdk18on:1.83", ], duplicate_version_warning = "error", excluded_artifacts = [ # Gerrit core already provides slf4j-api. Exclude it here to avoid # bundling duplicate classes or causing runtime version conflicts. "org.slf4j:slf4j-api", + "org.bouncycastle:bcpg-jdk18on", + "org.bouncycastle:bcprov-jdk18on", + "org.bouncycastle:bcutil-jdk18on", ], fail_if_repin_required = True, fail_on_missing_checksum = True,
diff --git a/events-log_plugin_deps.lock.json b/events-log_plugin_deps.lock.json index bbe3569..da823ec 100644 --- a/events-log_plugin_deps.lock.json +++ b/events-log_plugin_deps.lock.json
@@ -2,19 +2,15 @@ "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", "__INPUT_ARTIFACTS_HASH": { "com.zaxxer:HikariCP": -1716240896, - "org.bouncycastle:bcpg-jdk18on": 235240928, + "org.bouncycastle:bcpg-jdk18on": 1081280574, + "org.bouncycastle:bcprov-jdk18on": -2812240, + "org.bouncycastle:bcutil-jdk18on": -959681207, "org.slf4j:slf4j-api": 2145585153, "repositories": -1949687017 }, "__RESOLVED_ARTIFACTS_HASH": { "com.zaxxer:HikariCP": -89325074, - "com.zaxxer:HikariCP:jar:sources": -2072681843, - "org.bouncycastle:bcpg-jdk18on": 1472652726, - "org.bouncycastle:bcpg-jdk18on:jar:sources": -1811198484, - "org.bouncycastle:bcprov-jdk18on": 1775002659, - "org.bouncycastle:bcprov-jdk18on:jar:sources": -1585504180, - "org.bouncycastle:bcutil-jdk18on": 2088191088, - "org.bouncycastle:bcutil-jdk18on:jar:sources": -297807544 + "com.zaxxer:HikariCP:jar:sources": -2072681843 }, "artifacts": { "com.zaxxer:HikariCP": { @@ -23,38 +19,9 @@ "sources": "1fa555b1bbd28921666f2cd397a3d25af618d9530245aeed1dd3e6160c6705fa" }, "version": "5.1.0" - }, - "org.bouncycastle:bcpg-jdk18on": { - "shasums": { - "jar": "4077fd4517761c98a81944c70a376ce73f4eb3e44c03db1eb5d699fc28ab48aa", - "sources": "fd5057e4ae59e8ac68917e6bf865ad92c335ec9e8b0fd973e0bb82f7d8e9d79b" - }, - "version": "1.83" - }, - "org.bouncycastle:bcprov-jdk18on": { - "shasums": { - "jar": "82cf3a2af766c3bc874f6d36b9f20a8b99a8f09762dc776e8a227a45d8daaafb", - "sources": "0c335c8d599b92e264f4591087ca104615de0339bbba46ecc3a51af032de0b16" - }, - "version": "1.83" - }, - "org.bouncycastle:bcutil-jdk18on": { - "shasums": { - "jar": "ee7d0eb4e74de70a735f7fb36b604dd5c6ad35720d50b914604db042114a0185", - "sources": "935984a8b1d1893dd033a9f237b85898bcfa6ae7890a214f10bade935cd3536f" - }, - "version": "1.83" } }, - "dependencies": { - "org.bouncycastle:bcpg-jdk18on": [ - "org.bouncycastle:bcprov-jdk18on", - "org.bouncycastle:bcutil-jdk18on" - ], - "org.bouncycastle:bcutil-jdk18on": [ - "org.bouncycastle:bcprov-jdk18on" - ] - }, + "dependencies": {}, "packages": { "com.zaxxer:HikariCP": [ "com.zaxxer.hikari", @@ -75,289 +42,14 @@ "com.zaxxer.hikari.metrics.prometheus", "com.zaxxer.hikari.pool", "com.zaxxer.hikari.util" - ], - "org.bouncycastle:bcpg-jdk18on": [ - "org.bouncycastle.apache.bzip2", - "org.bouncycastle.bcpg", - "org.bouncycastle.bcpg.attr", - "org.bouncycastle.bcpg.sig", - "org.bouncycastle.gpg", - "org.bouncycastle.gpg.keybox", - "org.bouncycastle.gpg.keybox.bc", - "org.bouncycastle.gpg.keybox.jcajce", - "org.bouncycastle.openpgp", - "org.bouncycastle.openpgp.api", - "org.bouncycastle.openpgp.api.bc", - "org.bouncycastle.openpgp.api.exception", - "org.bouncycastle.openpgp.api.jcajce", - "org.bouncycastle.openpgp.api.util", - "org.bouncycastle.openpgp.bc", - "org.bouncycastle.openpgp.examples", - "org.bouncycastle.openpgp.jcajce", - "org.bouncycastle.openpgp.operator", - "org.bouncycastle.openpgp.operator.bc", - "org.bouncycastle.openpgp.operator.jcajce" - ], - "org.bouncycastle:bcprov-jdk18on": [ - "org.bouncycastle", - "org.bouncycastle.asn1", - "org.bouncycastle.asn1.anssi", - "org.bouncycastle.asn1.bc", - "org.bouncycastle.asn1.cryptopro", - "org.bouncycastle.asn1.gm", - "org.bouncycastle.asn1.nist", - "org.bouncycastle.asn1.ocsp", - "org.bouncycastle.asn1.pkcs", - "org.bouncycastle.asn1.sec", - "org.bouncycastle.asn1.teletrust", - "org.bouncycastle.asn1.ua", - "org.bouncycastle.asn1.util", - "org.bouncycastle.asn1.x500", - "org.bouncycastle.asn1.x500.style", - "org.bouncycastle.asn1.x509", - "org.bouncycastle.asn1.x509.qualified", - "org.bouncycastle.asn1.x509.sigi", - "org.bouncycastle.asn1.x9", - "org.bouncycastle.crypto", - "org.bouncycastle.crypto.agreement", - "org.bouncycastle.crypto.agreement.ecjpake", - "org.bouncycastle.crypto.agreement.jpake", - "org.bouncycastle.crypto.agreement.kdf", - "org.bouncycastle.crypto.agreement.srp", - "org.bouncycastle.crypto.commitments", - "org.bouncycastle.crypto.constraints", - "org.bouncycastle.crypto.digests", - "org.bouncycastle.crypto.ec", - "org.bouncycastle.crypto.encodings", - "org.bouncycastle.crypto.engines", - "org.bouncycastle.crypto.examples", - "org.bouncycastle.crypto.fpe", - "org.bouncycastle.crypto.generators", - "org.bouncycastle.crypto.hpke", - "org.bouncycastle.crypto.io", - "org.bouncycastle.crypto.kems", - "org.bouncycastle.crypto.macs", - "org.bouncycastle.crypto.modes", - "org.bouncycastle.crypto.modes.gcm", - "org.bouncycastle.crypto.modes.kgcm", - "org.bouncycastle.crypto.paddings", - "org.bouncycastle.crypto.params", - "org.bouncycastle.crypto.parsers", - "org.bouncycastle.crypto.prng", - "org.bouncycastle.crypto.prng.drbg", - "org.bouncycastle.crypto.signers", - "org.bouncycastle.crypto.threshold", - "org.bouncycastle.crypto.tls", - "org.bouncycastle.crypto.util", - "org.bouncycastle.i18n", - "org.bouncycastle.i18n.filter", - "org.bouncycastle.iana", - "org.bouncycastle.internal.asn1.bsi", - "org.bouncycastle.internal.asn1.cms", - "org.bouncycastle.internal.asn1.cryptlib", - "org.bouncycastle.internal.asn1.eac", - "org.bouncycastle.internal.asn1.edec", - "org.bouncycastle.internal.asn1.gnu", - "org.bouncycastle.internal.asn1.iana", - "org.bouncycastle.internal.asn1.isara", - "org.bouncycastle.internal.asn1.isismtt", - "org.bouncycastle.internal.asn1.iso", - "org.bouncycastle.internal.asn1.kisa", - "org.bouncycastle.internal.asn1.microsoft", - "org.bouncycastle.internal.asn1.misc", - "org.bouncycastle.internal.asn1.nsri", - "org.bouncycastle.internal.asn1.ntt", - "org.bouncycastle.internal.asn1.oiw", - "org.bouncycastle.internal.asn1.rosstandart", - "org.bouncycastle.jcajce", - "org.bouncycastle.jcajce.interfaces", - "org.bouncycastle.jcajce.io", - "org.bouncycastle.jcajce.provider.asymmetric", - "org.bouncycastle.jcajce.provider.asymmetric.compositesignatures", - "org.bouncycastle.jcajce.provider.asymmetric.dh", - "org.bouncycastle.jcajce.provider.asymmetric.dsa", - "org.bouncycastle.jcajce.provider.asymmetric.dstu", - "org.bouncycastle.jcajce.provider.asymmetric.ec", - "org.bouncycastle.jcajce.provider.asymmetric.ecgost", - "org.bouncycastle.jcajce.provider.asymmetric.ecgost12", - "org.bouncycastle.jcajce.provider.asymmetric.edec", - "org.bouncycastle.jcajce.provider.asymmetric.elgamal", - "org.bouncycastle.jcajce.provider.asymmetric.gost", - "org.bouncycastle.jcajce.provider.asymmetric.ies", - "org.bouncycastle.jcajce.provider.asymmetric.mldsa", - "org.bouncycastle.jcajce.provider.asymmetric.mlkem", - "org.bouncycastle.jcajce.provider.asymmetric.rsa", - "org.bouncycastle.jcajce.provider.asymmetric.slhdsa", - "org.bouncycastle.jcajce.provider.asymmetric.util", - "org.bouncycastle.jcajce.provider.asymmetric.x509", - "org.bouncycastle.jcajce.provider.config", - "org.bouncycastle.jcajce.provider.digest", - "org.bouncycastle.jcajce.provider.drbg", - "org.bouncycastle.jcajce.provider.kdf", - "org.bouncycastle.jcajce.provider.kdf.hkdf", - "org.bouncycastle.jcajce.provider.kdf.pbepbkdf2", - "org.bouncycastle.jcajce.provider.kdf.scrypt", - "org.bouncycastle.jcajce.provider.keystore", - "org.bouncycastle.jcajce.provider.keystore.bc", - "org.bouncycastle.jcajce.provider.keystore.bcfks", - "org.bouncycastle.jcajce.provider.keystore.pkcs12", - "org.bouncycastle.jcajce.provider.keystore.util", - "org.bouncycastle.jcajce.provider.symmetric", - "org.bouncycastle.jcajce.provider.symmetric.util", - "org.bouncycastle.jcajce.provider.util", - "org.bouncycastle.jcajce.spec", - "org.bouncycastle.jcajce.util", - "org.bouncycastle.jce", - "org.bouncycastle.jce.exception", - "org.bouncycastle.jce.interfaces", - "org.bouncycastle.jce.netscape", - "org.bouncycastle.jce.provider", - "org.bouncycastle.jce.spec", - "org.bouncycastle.math", - "org.bouncycastle.math.ec", - "org.bouncycastle.math.ec.custom.djb", - "org.bouncycastle.math.ec.custom.gm", - "org.bouncycastle.math.ec.custom.sec", - "org.bouncycastle.math.ec.endo", - "org.bouncycastle.math.ec.rfc7748", - "org.bouncycastle.math.ec.rfc8032", - "org.bouncycastle.math.ec.tools", - "org.bouncycastle.math.field", - "org.bouncycastle.math.raw", - "org.bouncycastle.pqc.asn1", - "org.bouncycastle.pqc.crypto", - "org.bouncycastle.pqc.crypto.bike", - "org.bouncycastle.pqc.crypto.cmce", - "org.bouncycastle.pqc.crypto.crystals.dilithium", - "org.bouncycastle.pqc.crypto.falcon", - "org.bouncycastle.pqc.crypto.frodo", - "org.bouncycastle.pqc.crypto.hqc", - "org.bouncycastle.pqc.crypto.lms", - "org.bouncycastle.pqc.crypto.mayo", - "org.bouncycastle.pqc.crypto.mldsa", - "org.bouncycastle.pqc.crypto.mlkem", - "org.bouncycastle.pqc.crypto.newhope", - "org.bouncycastle.pqc.crypto.ntru", - "org.bouncycastle.pqc.crypto.ntruprime", - "org.bouncycastle.pqc.crypto.picnic", - "org.bouncycastle.pqc.crypto.rainbow", - "org.bouncycastle.pqc.crypto.saber", - "org.bouncycastle.pqc.crypto.slhdsa", - "org.bouncycastle.pqc.crypto.snova", - "org.bouncycastle.pqc.crypto.sphincs", - "org.bouncycastle.pqc.crypto.sphincsplus", - "org.bouncycastle.pqc.crypto.util", - "org.bouncycastle.pqc.crypto.xmss", - "org.bouncycastle.pqc.crypto.xwing", - "org.bouncycastle.pqc.jcajce.interfaces", - "org.bouncycastle.pqc.jcajce.provider", - "org.bouncycastle.pqc.jcajce.provider.bike", - "org.bouncycastle.pqc.jcajce.provider.cmce", - "org.bouncycastle.pqc.jcajce.provider.dilithium", - "org.bouncycastle.pqc.jcajce.provider.falcon", - "org.bouncycastle.pqc.jcajce.provider.frodo", - "org.bouncycastle.pqc.jcajce.provider.hqc", - "org.bouncycastle.pqc.jcajce.provider.kyber", - "org.bouncycastle.pqc.jcajce.provider.lms", - "org.bouncycastle.pqc.jcajce.provider.mayo", - "org.bouncycastle.pqc.jcajce.provider.newhope", - "org.bouncycastle.pqc.jcajce.provider.ntru", - "org.bouncycastle.pqc.jcajce.provider.ntruprime", - "org.bouncycastle.pqc.jcajce.provider.picnic", - "org.bouncycastle.pqc.jcajce.provider.saber", - "org.bouncycastle.pqc.jcajce.provider.snova", - "org.bouncycastle.pqc.jcajce.provider.sphincs", - "org.bouncycastle.pqc.jcajce.provider.sphincsplus", - "org.bouncycastle.pqc.jcajce.provider.util", - "org.bouncycastle.pqc.jcajce.provider.xmss", - "org.bouncycastle.pqc.jcajce.spec", - "org.bouncycastle.pqc.math.ntru", - "org.bouncycastle.pqc.math.ntru.parameters", - "org.bouncycastle.util", - "org.bouncycastle.util.encoders", - "org.bouncycastle.util.io", - "org.bouncycastle.util.io.pem", - "org.bouncycastle.util.test", - "org.bouncycastle.x509", - "org.bouncycastle.x509.extension", - "org.bouncycastle.x509.util" - ], - "org.bouncycastle:bcutil-jdk18on": [ - "org.bouncycastle.asn1.bsi", - "org.bouncycastle.asn1.cmc", - "org.bouncycastle.asn1.cmp", - "org.bouncycastle.asn1.cms", - "org.bouncycastle.asn1.cms.ecc", - "org.bouncycastle.asn1.crmf", - "org.bouncycastle.asn1.cryptlib", - "org.bouncycastle.asn1.dvcs", - "org.bouncycastle.asn1.eac", - "org.bouncycastle.asn1.edec", - "org.bouncycastle.asn1.esf", - "org.bouncycastle.asn1.ess", - "org.bouncycastle.asn1.est", - "org.bouncycastle.asn1.gnu", - "org.bouncycastle.asn1.iana", - "org.bouncycastle.asn1.icao", - "org.bouncycastle.asn1.isara", - "org.bouncycastle.asn1.isismtt", - "org.bouncycastle.asn1.isismtt.ocsp", - "org.bouncycastle.asn1.isismtt.x509", - "org.bouncycastle.asn1.iso", - "org.bouncycastle.asn1.kisa", - "org.bouncycastle.asn1.microsoft", - "org.bouncycastle.asn1.misc", - "org.bouncycastle.asn1.mod", - "org.bouncycastle.asn1.mozilla", - "org.bouncycastle.asn1.nsri", - "org.bouncycastle.asn1.ntt", - "org.bouncycastle.asn1.oiw", - "org.bouncycastle.asn1.rosstandart", - "org.bouncycastle.asn1.smime", - "org.bouncycastle.asn1.tsp", - "org.bouncycastle.oer", - "org.bouncycastle.oer.its", - "org.bouncycastle.oer.its.etsi102941", - "org.bouncycastle.oer.its.etsi102941.basetypes", - "org.bouncycastle.oer.its.etsi103097", - "org.bouncycastle.oer.its.etsi103097.extension", - "org.bouncycastle.oer.its.ieee1609dot2", - "org.bouncycastle.oer.its.ieee1609dot2.basetypes", - "org.bouncycastle.oer.its.ieee1609dot2dot1", - "org.bouncycastle.oer.its.template.etsi102941", - "org.bouncycastle.oer.its.template.etsi102941.basetypes", - "org.bouncycastle.oer.its.template.etsi103097", - "org.bouncycastle.oer.its.template.etsi103097.extension", - "org.bouncycastle.oer.its.template.ieee1609dot2", - "org.bouncycastle.oer.its.template.ieee1609dot2.basetypes", - "org.bouncycastle.oer.its.template.ieee1609dot2dot1" ] }, "repositories": { "https://repo1.maven.org/maven2/": [ "com.zaxxer:HikariCP", - "com.zaxxer:HikariCP:jar:sources", - "org.bouncycastle:bcpg-jdk18on", - "org.bouncycastle:bcpg-jdk18on:jar:sources", - "org.bouncycastle:bcprov-jdk18on", - "org.bouncycastle:bcprov-jdk18on:jar:sources", - "org.bouncycastle:bcutil-jdk18on", - "org.bouncycastle:bcutil-jdk18on:jar:sources" + "com.zaxxer:HikariCP:jar:sources" ] }, - "services": { - "org.bouncycastle:bcprov-jdk18on": { - "java.security.Provider": [ - "org.bouncycastle.jce.provider.BouncyCastleProvider", - "org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider" - ] - }, - "org.bouncycastle:bcprov-jdk18on:jar:sources": { - "java.security.Provider": [ - "org.bouncycastle.jce.provider.BouncyCastleProvider", - "org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider" - ] - } - }, + "services": {}, "version": "3" }