From f3861d9e9c9c86c6907a1a8a8a3b41d88d738c55 Mon Sep 17 00:00:00 2001 From: DovOps Date: Sun, 16 Nov 2025 11:05:57 +0000 Subject: [PATCH 1/2] Updated to support gradle version support in FindDependencies --- .../java/dependencies/FindDependency.java | 2 +- .../java/dependencies/FindDependencyTest.java | 49 ++++++++++++++++++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/openrewrite/java/dependencies/FindDependency.java b/src/main/java/org/openrewrite/java/dependencies/FindDependency.java index 7a26afe..23256bf 100644 --- a/src/main/java/org/openrewrite/java/dependencies/FindDependency.java +++ b/src/main/java/org/openrewrite/java/dependencies/FindDependency.java @@ -75,7 +75,7 @@ public TreeVisitor getVisitor() { final TreeVisitor mavenFindDependency = new org.openrewrite.maven.search.FindDependency(groupId,artifactId,version,versionPattern) .getVisitor(); - final TreeVisitor gradleFindDependency = new org.openrewrite.gradle.search.FindDependency(groupId, artifactId, configuration) + final TreeVisitor gradleFindDependency = new org.openrewrite.gradle.search.FindDependency(groupId, artifactId, configuration, version, versionPattern) .getVisitor(); @Override diff --git a/src/test/java/org/openrewrite/java/dependencies/FindDependencyTest.java b/src/test/java/org/openrewrite/java/dependencies/FindDependencyTest.java index 5d0b14c..d06c5e8 100644 --- a/src/test/java/org/openrewrite/java/dependencies/FindDependencyTest.java +++ b/src/test/java/org/openrewrite/java/dependencies/FindDependencyTest.java @@ -19,7 +19,7 @@ class FindDependencyTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { - spec.recipe(new FindDependency("org.openrewrite", "rewrite-core", null, null, null)); + spec.recipe(new FindDependency("org.openrewrite", "rewrite-core", "8.0.0", null, null)); } @DocumentExample @@ -60,6 +60,30 @@ void findMavenDependency() { ); } + @DocumentExample + @Test + void findMavenDependencyDoesNotFindWrongVersion() { + rewriteRun( + //language=xml + pomXml( + """ + + com.mycompany.app + my-app + 1 + + + org.openrewrite + rewrite-core + 8.1.0 + + + + """ + ) + ); + } + @Test void findGradleDependency() { rewriteRun( @@ -95,4 +119,27 @@ void findGradleDependency() { ) ); } + + @Test + void findGradleDependencyDoesntFindWrongVersion() { + rewriteRun( + spec -> spec.beforeRecipe(withToolingApi()), + //language=groovy + buildGradle( + """ + plugins { + id 'java-library' + } + + repositories { + mavenCentral() + } + + dependencies { + api "org.openrewrite:rewrite-core:8.1.0" + } + """ + ) + ); + } } From 7ab620c7c63f6b2a6211779e5476a318bde02f42 Mon Sep 17 00:00:00 2001 From: DovOps Date: Sun, 16 Nov 2025 16:35:34 +0200 Subject: [PATCH 2/2] Update src/test/java/org/openrewrite/java/dependencies/FindDependencyTest.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../org/openrewrite/java/dependencies/FindDependencyTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/org/openrewrite/java/dependencies/FindDependencyTest.java b/src/test/java/org/openrewrite/java/dependencies/FindDependencyTest.java index d06c5e8..170cc43 100644 --- a/src/test/java/org/openrewrite/java/dependencies/FindDependencyTest.java +++ b/src/test/java/org/openrewrite/java/dependencies/FindDependencyTest.java @@ -60,7 +60,6 @@ void findMavenDependency() { ); } - @DocumentExample @Test void findMavenDependencyDoesNotFindWrongVersion() { rewriteRun(