Cover legacy Bouncy Castle artifacts and their API changes

build.gradle.kts

@@ -103,6 +103,7 @@ dependencies {
     testRuntimeOnly("javax.mail:mail:1.4.7")
     testRuntimeOnly("javax.mail:javax.mail-api:1.6.2")
     testRuntimeOnly("javax.ws.rs:javax.ws.rs-api:2.1.1")
+    testRuntimeOnly("org.bouncycastle:bcprov-jdk15on:1.70")
     testRuntimeOnly(gradleApi())
 }
 

src/main/resources/META-INF/rewrite/bouncycastle-jdk15to18.yml

@@ -17,21 +17,29 @@
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.migrate.BouncyCastleFromJdk15OnToJdk15to18
-displayName: Migrate Bouncy Castle from `jdk15on` to `jdk15to18` for Java < 8
+displayName: Migrate Bouncy Castle to `jdk15to18` for Java < 8
 description: >-
-  This recipe replaces the Bouncy Castle artifacts from `jdk15on` to `jdk15to18`.
-  `jdk15on` isn't maintained anymore and `jdk18on` is only for Java 8 and above.
-  The `jdk15to18` artifact is the up-to-date replacement of the unmaintained `jdk15on` for Java < 8.
+  This recipe replaces the Bouncy Castle artifacts from any of the legacy artifact suffixes
+  `-jdk12`, `-jdk14`, `-jdk15`, `-jdk15+`, `-jdk16` or `-jdk15on` to `-jdk15to18`.
+  Those artifacts aren't maintained anymore and `jdk18on` is only for Java 8 and above.
+  The `jdk15to18` artifact is the up-to-date replacement for Java < 8.
+  The `bctsp` artifacts map onto `bcpkix`, which absorbed the time stamp protocol support in 1.47.
 tags:
   - bouncycastle
 preconditions:
   - org.openrewrite.Singleton
 recipeList:
+  # -jdk15on migration
   - org.openrewrite.java.dependencies.ChangeDependency:
       oldGroupId: org.bouncycastle
       oldArtifactId: bcprov-jdk15on
       newArtifactId: bcprov-jdk15to18
       newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcprov-ext-jdk15on
+      newArtifactId: bcprov-ext-jdk15to18
+      newVersion: latest.release
   - org.openrewrite.java.dependencies.ChangeDependency:
       oldGroupId: org.bouncycastle
       oldArtifactId: bcutil-jdk15on
@@ -62,3 +70,140 @@ recipeList:
       oldArtifactId: bctls-jdk15on
       newArtifactId: bctls-jdk15to18
       newVersion: latest.release
+
+  # -jdk16 migration
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcprov-jdk16
+      newArtifactId: bcprov-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcprov-ext-jdk16
+      newArtifactId: bcprov-ext-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcmail-jdk16
+      newArtifactId: bcmail-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcpg-jdk16
+      newArtifactId: bcpg-jdk15to18
+      newVersion: latest.release
+
+  # -jdk15+ migration
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcprov-jdk15+
+      newArtifactId: bcprov-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcmail-jdk15+
+      newArtifactId: bcmail-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcpg-jdk15+
+      newArtifactId: bcpg-jdk15to18
+      newVersion: latest.release
+
+  # -jdk15 migration
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcprov-jdk15
+      newArtifactId: bcprov-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcprov-ext-jdk15
+      newArtifactId: bcprov-ext-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcmail-jdk15
+      newArtifactId: bcmail-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcpg-jdk15
+      newArtifactId: bcpg-jdk15to18
+      newVersion: latest.release
+
+  # -jdk14 migration
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcprov-jdk14
+      newArtifactId: bcprov-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcprov-ext-jdk14
+      newArtifactId: bcprov-ext-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcutil-jdk14
+      newArtifactId: bcutil-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcpkix-jdk14
+      newArtifactId: bcpkix-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcmail-jdk14
+      newArtifactId: bcmail-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcpg-jdk14
+      newArtifactId: bcpg-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bctls-jdk14
+      newArtifactId: bctls-jdk15to18
+      newVersion: latest.release
+
+  # -jdk12 migration
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcprov-jdk12
+      newArtifactId: bcprov-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bcpg-jdk12
+      newArtifactId: bcpg-jdk15to18
+      newVersion: latest.release
+
+  # bctsp migration; folded into bcpkix in 1.47
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bctsp-jdk15on
+      newArtifactId: bcpkix-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bctsp-jdk16
+      newArtifactId: bcpkix-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bctsp-jdk15+
+      newArtifactId: bcpkix-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bctsp-jdk15
+      newArtifactId: bcpkix-jdk15to18
+      newVersion: latest.release
+  - org.openrewrite.java.dependencies.ChangeDependency:
+      oldGroupId: org.bouncycastle
+      oldArtifactId: bctsp-jdk14
+      newArtifactId: bcpkix-jdk15to18
+      newVersion: latest.release