Update Maven surefire plugin to a version which requires no additiona…

…l configuration to run JUnit 5 tests.

Remove redundant/unnecessary AddDependency operations.

src/main/resources/META-INF/rewrite/junit5.yml

@@ -117,27 +117,7 @@ recipeList:
       groupId: org.junit.jupiter
       artifactId: junit-jupiter
       version: 5.x
-      onlyIfUsing: org.junit.Test
-      scope: test
-  - org.openrewrite.java.dependencies.AddDependency:
-      groupId: org.junit.jupiter
-      artifactId: junit-jupiter
-      version: 5.x
-      onlyIfUsing: org.junit.jupiter.api.Test
-      acceptTransitive: true
-      scope: test
-  - org.openrewrite.java.dependencies.AddDependency:
-      groupId: org.junit.jupiter
-      artifactId: junit-jupiter-api
-      version: 5.x
-      onlyIfUsing: org.junit.Test
-      scope: test
-  - org.openrewrite.java.dependencies.AddDependency:
-      groupId: org.junit.jupiter
-      artifactId: junit-jupiter-api
-      version: 5.x
-      onlyIfUsing: org.junit.jupiter.api.Test
-      acceptTransitive: true
+      onlyIfUsing: org.junit..*
       scope: test
   - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.junit.jupiter
@@ -161,11 +141,11 @@ recipeList:
   - org.openrewrite.maven.UpgradePluginVersion:
       groupId: org.apache.maven.plugins
       artifactId: maven-surefire-plugin
-      newVersion: 2.22.x
+      newVersion: 3.1.x
   - org.openrewrite.maven.UpgradePluginVersion:
       groupId: org.apache.maven.plugins
       artifactId: maven-failsafe-plugin
-      newVersion: 2.22.x
+      newVersion: 3.1.x
 
 ---
 type: specs.openrewrite.org/v1beta/recipe