deps: switch bounctycastle to jdk15to18

jreleaser · Sep 13, 2023 · e4a487d · e4a487d
1 parent f5bc529
commit e4a487d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/api/jreleaser-utils/jreleaser-utils.gradle b/api/jreleaser-utils/jreleaser-utils.gradle
@@ -31,7 +31,7 @@ dependencies {
     // checksum
     api "commons-codec:commons-codec:$commonsCodecVersion"
     api "org.apache.commons:commons-compress:$commonsCompressVersion"
-    api "org.bouncycastle:bcpg-jdk18on:$bouncyCastleVersion"
+    api "org.bouncycastle:bcpg-jdk15to18:$bouncyCastleVersion"
     api "org.slf4j:jcl-over-slf4j:$slf4jVersion"
     api "org.tukaani:xz:$xzVersion"
     api "com.github.luben:zstd-jni:$zstdVersion"

diff --git a/sdks/jreleaser-graalvm-sdk/jreleaser-graalvm-sdk.gradle b/sdks/jreleaser-graalvm-sdk/jreleaser-graalvm-sdk.gradle
@@ -16,6 +16,6 @@
  * limitations under the License.
  */
 dependencies {
-    api "org.bouncycastle:bcpg-jdk18on:$bouncyCastleVersion"
+    api "org.bouncycastle:bcpg-jdk15to18:$bouncyCastleVersion"
     compileOnly "org.graalvm.nativeimage:svm:$graalVersion"
 }
diff --git a/sdks/jreleaser-signing-java-sdk/jreleaser-signing-java-sdk.gradle b/sdks/jreleaser-signing-java-sdk/jreleaser-signing-java-sdk.gradle
@@ -19,5 +19,5 @@ dependencies {
     api project(':jreleaser-command-java-sdk')
     api project(':jreleaser-tool-java-sdk')
 
-    api "org.bouncycastle:bcpg-jdk18on:$bouncyCastleVersion"
+    api "org.bouncycastle:bcpg-jdk15to18:$bouncyCastleVersion"
 }
diff --git a/sdks/jreleaser-ssh-java-sdk/jreleaser-ssh-java-sdk.gradle b/sdks/jreleaser-ssh-java-sdk/jreleaser-ssh-java-sdk.gradle
@@ -20,5 +20,13 @@ dependencies {
     annotationProcessor "org.kordamp.jipsy:jipsy-processor:${jipsyVersion}"
 
     api project(':jreleaser-java-sdk-commons')
-    api "com.hierynomus:sshj:$sshjVersion"
+    api("com.hierynomus:sshj:$sshjVersion") {
+        exclude group: 'org.bouncycastle', module: 'bcprov-jdk18on'
+        exclude group: 'org.bouncycastle', module: 'bcpkix-jdk18on'
+        exclude group: 'org.bouncycastle', module: 'bcutil-jdk18on'
+    }
+    api "org.bouncycastle:bcpg-jdk15to18:$bouncyCastleVersion"
+    api "org.bouncycastle:bcprov-jdk15to18:$bouncyCastleVersion"
+    api "org.bouncycastle:bcpkix-jdk15to18:$bouncyCastleVersion"
+    api "org.bouncycastle:bcutil-jdk15to18:$bouncyCastleVersion"
 }
diff --git a/settings.gradle b/settings.gradle
@@ -142,10 +142,10 @@ enforce {
             "org.apache.maven:maven-core:$mavenVersion",
             "org.apache.maven:maven-model:$mavenVersion",
             "org.apache.maven:maven-plugin-api:$mavenVersion",
-            "org.bouncycastle:bcpg-jdk18on:$bouncyCastleVersion",
-            "org.bouncycastle:bcpkix-jdk18on:$bouncyCastleVersion",
-            "org.bouncycastle:bcprov-jdk18on:$bouncyCastleVersion",
-            "org.bouncycastle:bcutil-jdk18on:$bouncyCastleVersion",
+            "org.bouncycastle:bcpg-jdk15to18:$bouncyCastleVersion",
+            "org.bouncycastle:bcpkix-jdk15to18:$bouncyCastleVersion",
+            "org.bouncycastle:bcprov-jdk15to18:$bouncyCastleVersion",
+            "org.bouncycastle:bcutil-jdk15to18:$bouncyCastleVersion",
             "org.checkerframework:checker-qual:$checkerqualVersion",
             "org.codehaus.plexus:plexus-classworlds:$classworldsVersion",
             "org.codehaus.plexus:plexus-component-annotations:$plexusAnnotationsVersion",