diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4dca3d3149..d230c95b3a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -95,6 +95,11 @@ updates: # Shiro 2.x jars are already Java 11 bytecode; freeze automated bumps. - dependency-name: "org.apache.shiro*" - dependency-name: "org.apache.shiro:*" + # Bouncy Castle `jdk18on` 1.78+ is Java 11 bytecode; we pin the + # `jdk15to18` line via in the root pom (Java 5 bytecode). + # Block Dependabot from re-bundling the wrong artifact line. + - dependency-name: "org.bouncycastle*" + - dependency-name: "org.bouncycastle:*" # Jackrabbit 2.21+ is Java 11 (2.20.x is last Java 8 line we track). - dependency-name: "org.apache.jackrabbit*" - dependency-name: "org.apache.jackrabbit:*" diff --git a/WebUI/pom.xml b/WebUI/pom.xml index 6fec8b1582..187f289e24 100644 --- a/WebUI/pom.xml +++ b/WebUI/pom.xml @@ -434,23 +434,23 @@ org.bouncycastle - bcmail-jdk18on + bcmail-jdk15to18 org.bouncycastle - bcpg-jdk18on + bcpg-jdk15to18 org.bouncycastle - bcpkix-jdk18on + bcpkix-jdk15to18 org.bouncycastle - bcprov-jdk18on + bcprov-jdk15to18 org.bouncycastle - bctls-jdk18on + bctls-jdk15to18 javax.servlet diff --git a/deliverytiersuite/delivery-tier-suite/common/pom.xml b/deliverytiersuite/delivery-tier-suite/common/pom.xml index 74f5638960..1b24bdff95 100644 --- a/deliverytiersuite/delivery-tier-suite/common/pom.xml +++ b/deliverytiersuite/delivery-tier-suite/common/pom.xml @@ -150,7 +150,7 @@ org.bouncycastle - bcprov-jdk18on + bcprov-jdk15to18 ${bc.version} compile diff --git a/modules/CMLight-Main-cactus-tests/pom.xml b/modules/CMLight-Main-cactus-tests/pom.xml index 681cc99a1f..50fbb79c0d 100644 --- a/modules/CMLight-Main-cactus-tests/pom.xml +++ b/modules/CMLight-Main-cactus-tests/pom.xml @@ -281,15 +281,15 @@ org.bouncycastle - bcmail-jdk18on + bcmail-jdk15to18 org.bouncycastle - bcprov-jdk18on + bcprov-jdk15to18 org.bouncycastle - bcpg-jdk18on + bcpg-jdk15to18 test diff --git a/modules/perc-security-utils/pom.xml b/modules/perc-security-utils/pom.xml index 8538a38f9d..2f9f1b0c3e 100644 --- a/modules/perc-security-utils/pom.xml +++ b/modules/perc-security-utils/pom.xml @@ -54,7 +54,7 @@ org.bouncycastle - bcprov-jdk18on + bcprov-jdk15to18 org.jasypt diff --git a/pom.xml b/pom.xml index ecbdd3458e..6bb4b9583b 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 1.4.1 1.4.2 1.19 - 1.83 + 1.85 3.6.1 dev 0 @@ -1958,27 +1958,27 @@ org.bouncycastle - bcmail-jdk18on + bcmail-jdk15to18 ${bc.version} org.bouncycastle - bcpg-jdk18on + bcpg-jdk15to18 ${bc.version} org.bouncycastle - bcpkix-jdk18on + bcpkix-jdk15to18 ${bc.version} org.bouncycastle - bcprov-jdk18on + bcprov-jdk15to18 ${bc.version} org.bouncycastle - bctls-jdk18on + bctls-jdk15to18 ${bc.version} diff --git a/system/pom.xml b/system/pom.xml index d400b74d87..d9a71d4442 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -906,19 +906,19 @@ org.bouncycastle - bcprov-jdk18on + bcprov-jdk15to18 org.bouncycastle - bctls-jdk18on + bctls-jdk15to18 org.bouncycastle - bcpkix-jdk18on + bcpkix-jdk15to18 org.bouncycastle - bcpg-jdk18on + bcpg-jdk15to18 com.amazonaws