Skip to content

Include in Dependency Report the path to the build file declaring the dependencies being reported on#189

Merged
sambsnyd merged 19 commits into
mainfrom
report-path
Jul 14, 2026
Merged

Include in Dependency Report the path to the build file declaring the dependencies being reported on#189
sambsnyd merged 19 commits into
mainfrom
report-path

Conversation

@sambsnyd

Copy link
Copy Markdown
Member

What's changed?

What's your motivation?

Anything in particular you'd like reviewers to focus on?

Anyone you would like to review specifically?

Have you considered any alternatives or workarounds?

Any additional context

Checklist

  • I've added unit tests to cover both positive and negative cases
  • I've read and applied the recipe conventions and best practices
  • I've used the IntelliJ IDEA auto-formatter on affected files

timtebeek and others added 16 commits July 14, 2026 12:43
…#178)

openrewrite/gh-automation#95 installs ~/.m2/settings.xml with `<mirrorOf>*</mirrorOf>` to route Maven through `artifactory.moderne.ninja` and avoid HTTP 429 from Maven Central. The mirror rewrites every repository request — including the test pom's deliberately-unreachable `<repository><url>https://nonexistent.moderne.io/maven2</url></repository>` — so the diagnostic recipe only sees the mirror and the local file cache. Neither Maven Central nor the test repo appear in the data table, and both assertions fail.

Inject an explicit empty `MavenSettings` via `MavenExecutionContextView` (same pattern as `mavenSettingsWithMirrors`) so the recipe ignores `~/.m2/settings.xml` and sees the pom-declared repositories directly. The original three assertions are restored unchanged.
…DependencyInsight (#176)

* Speed up ModuleHasDependency and RepositoryHasDependency by removing DependencyInsight

Both recipes ran a fresh DependencyInsight visitor against every source file during
scanning, which performs exhaustive Gradle + Maven dependency analysis just to answer
a binary yes/no question about whether the module contains a given GAV.

Replace the visitor with a direct check against MavenResolutionResult.findDependencies
for Maven modules, and against GradleProject's configurations + ResolvedDependency.findDependency
for Gradle modules. This mirrors the pattern Sam applied to the single-build-system versions
of ModuleHasDependency in openrewrite/rewrite (commit 919c9f5 / PR #6664).

These recipes are used as preconditions in many declarative migration recipes.
Avoiding the DependencyInsight allocation + traversal per source file substantially
reduces scanner time on repositories with many Java files.

* Skip dependency scan in ModuleHasDependency once project is known to match

Avoids re-running the per-tree dependency lookup for every source file in a
module after the JavaProject has already been added to the accumulator.

---------

Co-authored-by: Tim te Beek <tim@moderne.io>
* Trust resolved version over declared dep in dependency search

PR #179 extended ModuleHasDependency / RepositoryHasDependency to also
match against requested/declared dependencies so they still match when
resolution fails. This introduced false positives whenever a version
range is supplied: the declared version string could satisfy the
comparator even when the resolved version did not (e.g. a Gradle
resolutionStrategy.force or platform alignment overriding the declared
coordinate).

- When a coordinate is present in the resolved dependencies, trust the
  resolved check and skip the declared-dependency fallback for that
  group:artifact. Only fall back for declared deps not already resolved.
- Tighten versionMatches so a null declared version no longer
  auto-matches when a version constraint is supplied (same treatment as
  a ${...} property reference).

Adds regression tests covering both rules in ModuleHasDependencyTest and
RepositoryHasDependencyTest.

* Apply suggestions from code review

Co-authored-by: Jente Sondervorst <jentesondervorst@gmail.com>

* Add Maven regression tests for BOM-managed dependency version range

---------

Co-authored-by: Jente Sondervorst <jentesondervorst@gmail.com>
* Fix `RemoveDependency.unlessUsing` for multi-module Maven projects

`RemoveDependency` scans every source file and records whether `unlessUsing`
matched against the file's `JavaProject` marker. In a multi-module Maven
project the parent pom carries its own `JavaProject` distinct from the
children, so the parent module's accumulator entry never reflects type
usages found in child modules. The visitor would then strip the
`<dependency>` from the parent pom even though child modules in the same
reactor still relied on inheriting it.

Now the scanner additionally records the `MavenResolutionResult.id ->
JavaProject` mapping for every pom it visits. When the visitor is about to
remove a `<dependency>` from a pom, it walks that pom's descendant modules
via `MavenResolutionResult.getModules()` and preserves the declaration if
any descendant's `JavaProject` shows the type in use.

* Allow `RemoveDependency` to remove ancestor decl when descendants self-declare

The descendant-aware preservation introduced in the previous commit was
intentionally conservative: any descendant module whose Java sources used
the `unlessUsing` type blocked removal of the dep from an ancestor pom.
That over-preserves when a descendant module also declares the same
dependency directly in its own `<dependencies>` — in that case the
descendant is self-sufficient and the ancestor's declaration is dead
weight.

Refine the check: a descendant only blocks removal if it uses the type AND
does not declare the dependency itself. The self-declaration check looks
at the raw `requested` pom (as-written), not the resolved/inherited
dependency list, so a child that inherits the dep from the ancestor we
might modify still correctly blocks removal.
…tion (#184)

The Gradle/Maven dependency wrapper recipes (`AddDependency`, `ChangeDependency`, `UpgradeDependencyVersion`, `UpgradeTransitiveDependencyVersion`) each delegate to a Gradle and a Maven `ScanningRecipe`. Previously a fresh delegate instance was constructed on every `getInitialValue`/`getScanner`/`getVisitor`/`validate` call (and, in `AddDependency`, once per source file inside the scanner's `visit`).

Each `ScanningRecipe` construction runs `UUID.randomUUID()` for its accumulator-message key, which draws from `SecureRandom` and dominated profiles of recipe-heavy runs.

Memoize each delegate lazily on the wrapper recipe instance (a `final transient AtomicReference` that is excluded from the generated constructor and from `equals`/`hashCode`) so it is built at most once per wrapper instance and reused across the scanning and editing phases. The delegate is derived from the wrapper's options, so it belongs to the recipe instance rather than the accumulator: callers such as `rewrite-spring` deliberately reuse a single accumulator across two wrapper instances that have different options, so caching the delegate on the accumulator would reuse the wrong options.

The `Accumulator` types are left unchanged, preserving their public constructors for downstream callers that build them directly.
The [Auto] Old GroupId migrations update (5253cf5) added a context note
to the software.amazon.ion:ion-java relocation in migrations.csv. The
RelocatedDependencyCheck recipe now surfaces that context both in the
RelocatedDependencyReport data table row and in the inline search-result
marker comment, so update the test expectations to match.

Fixes the scheduled CI failure in run 28122079598.
…ansitive one (#188)

* Keep direct dependencies whose scope or exclusions differ from the transitive one

RemoveRedundantDependencies removed a direct dependency whenever a matched
parent provided the same coordinate transitively, ignoring scope and
exclusions. This silently changed the effective classpath when the direct
declaration carried information the transitive entry did not.

A direct dependency is now only removed when the transitive one provides it
at the exact same effective scope and with the same exclusions:

- Track each transitive dependency's effective exclusions and only treat a
  direct dependency as redundant when its exclusions match exactly.
- Key Maven transitives by the parent dependency's own effective scope and
  compare against the direct dependency's effective scope, rather than
  treating a broader transitive scope as covering a narrower direct one.

Fixes the five scenarios from openrewrite/rewrite#8235.

* Simplify test POMs: drop XML declaration and project attributes

* Extract handleGradle/handleMaven and trim comments

* Rename getCompatibleTransitives to getCompatibleGradleTransitives
@github-project-automation github-project-automation Bot moved this from In Progress to Ready to Review in OpenRewrite Jul 14, 2026
@sambsnyd
sambsnyd merged commit decb8db into main Jul 14, 2026
1 check passed
@sambsnyd
sambsnyd deleted the report-path branch July 14, 2026 20:09
@github-project-automation github-project-automation Bot moved this from Ready to Review to Done in OpenRewrite Jul 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

7 participants