Skip to content

Do not migrate to Jakarta annotations as part of Java 17 upgrade #923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
timtebeek merged 4 commits into from
Oct 31, 2025
Merged

Do not migrate to Jakarta annotations as part of Java 17 upgrade #923

timtebeek merged 4 commits into from
Oct 31, 2025

Conversation

@Laurens-W
Copy link
Contributor

@Laurens-W Laurens-W commented Oct 29, 2025

What's changed?

Removed java-ee migration steps from java migration

What's your motivation?

The removed step caused the jakarta namespace to be adopted when perhaps a framework used hadn't adopted that yet. These steps should be separate and composed together when appropriate

Any additional context

The only time when java-ee and java migrations go hand in hand is when some modules were removed from the jdk with java 11

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

@Laurens-W Laurens-W self-assigned this Oct 29, 2025
@Laurens-W Laurens-W added the bug Something isn't working label Oct 29, 2025
@github-project-automation github-project-automation bot moved this to In Progress in OpenRewrite Oct 29, 2025
@github-project-automation github-project-automation bot moved this from In Progress to Ready to Review in OpenRewrite Oct 29, 2025
@Laurens-W
Copy link
Contributor Author

Laurens-W commented Oct 29, 2025

I think we should also remove the changing of the scope to provided during the Java 11 migration, or at least see if we can guard that against causing a non compiling state

@timtebeek timtebeek changed the title Separate java ee and java migrations Separate Java EE and Java migrations Oct 31, 2025
@timtebeek timtebeek changed the title Separate Java EE and Java migrations Do not migrate to Jakarta annotations as part of Java 17 upgrade Oct 31, 2025
@timtebeek
Copy link
Member

timtebeek commented Oct 31, 2025

Sounds ok to me; let's do that in a follow up and get this merged already.

@timtebeek timtebeek merged commit bb406cf into main Oct 31, 2025
2 checks passed
@timtebeek timtebeek deleted the separate-javaee-from-java-migration branch October 31, 2025 12:07
@github-project-automation github-project-automation bot moved this from Ready to Review to Done in OpenRewrite Oct 31, 2025
mergify bot added a commit to robfrank/linklift that referenced this pull request Nov 10, 2025
@mergify
chore(deps): bump org.openrewrite.recipe:rewrite-migrate-java from 3.…
0182546 
…20.0 to 3.21.1 [skip ci]

Bumps [org.openrewrite.recipe:rewrite-migrate-java](https://github.com/openrewrite/rewrite-migrate-java) from 3.20.0 to 3.21.1.
Release notes

*Sourced from [org.openrewrite.recipe:rewrite-migrate-java's releases](https://github.com/openrewrite/rewrite-migrate-java/releases).*

> v3.21.1
> -------
>
> What's Changed
> --------------
>
> * Instance main should not be used for certain test cases by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#891](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/891)
> * Update expected indentation for `LombokValueToRecordTest` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#892](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/892)
> * OpenRewrite recipe best practices by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#894](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/894)
> * Convert Guava `Iterables.any` and `.filter` by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#896](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/896)
> * Support varargs for Predicates.and() and Predicates.or() by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#901](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/901)
> * Convert Guava `Functions.compose` by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#906](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/906)
> * Convert Guava `Sets.filter` by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#898](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/898)
> * Only convert Guava Predicate when not used as method argument by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#902](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/902)
> * OpenRewrite recipe best practices by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#907](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/907)
> * Support Lambda for Predicates.and() and Predicates.or() by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#910](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/910)
> * Convert Guava `Predicates.equalTo` by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#911](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/911)
> * Only change Guava `Predicate.apply` to `test` when not using `filter` or similar methods by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#909](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/909)
> * Cover more cases for Predicates.and/or methods by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#912](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/912)
> * Prefer `Optional.stream().collect(toSet())` over `Optional.asSet()` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#915](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/915)
> * Fix indentation calculation by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#916](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/916)
> * Convert Guava `Iterables.transform` and `Collections2.transform` by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#917](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/917)
> * Ignore `java.util.Iterator` in NoGuavaSetsNewHashSet recipe by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#921](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/921)
> * Gradle 9.1.0 by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#922](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/922)
> * Dependencies for `javax.jws..*` in Java 11 Migration by [`@​MBoegers`](https://github.com/MBoegers) in [openrewrite/rewrite-migrate-java#925](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/925)
> * Set build tools to use Java 8 when running Java 8 upgrade by [`@​MBoegers`](https://github.com/MBoegers) in [openrewrite/rewrite-migrate-java#924](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/924)
> * Update SDKMan Java version by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#926](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/926)
> * Do not migrate to Jakarta annotations as part of Java 17 upgrade by [`@​Laurens-W`](https://github.com/Laurens-W) in [openrewrite/rewrite-migrate-java#923](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/923)
> * Gradle 9.2.0 by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#930](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/930)
> * Change the Jetty dependency coordinates going from EE9 to EE10 by [`@​ChenyuWang98`](https://github.com/ChenyuWang98) in [openrewrite/rewrite-migrate-java#914](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/914)
> * Move the `@InlineMe` recipes to rewrite-third-party by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#931](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/931)
>
> **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.20.0...v3.21.1>
>
> 3.21.0
> ------
>
> What's Changed
> --------------
>
> * Instance main should not be used for certain test cases by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#891](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/891)
> * Update expected indentation for `LombokValueToRecordTest` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#892](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/892)
> * OpenRewrite recipe best practices by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#894](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/894)
> * Convert Guava `Iterables.any` and `.filter` by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#896](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/896)
> * Support varargs for Predicates.and() and Predicates.or() by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#901](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/901)
> * Convert Guava `Functions.compose` by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#906](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/906)
> * Convert Guava `Sets.filter` by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#898](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/898)
> * Only convert Guava Predicate when not used as method argument by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#902](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/902)
> * OpenRewrite recipe best practices by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#907](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/907)
> * Support Lambda for Predicates.and() and Predicates.or() by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#910](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/910)
> * Convert Guava `Predicates.equalTo` by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#911](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/911)
> * Only change Guava `Predicate.apply` to `test` when not using `filter` or similar methods by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#909](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/909)
> * Cover more cases for Predicates.and/or methods by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#912](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/912)
> * Prefer `Optional.stream().collect(toSet())` over `Optional.asSet()` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#915](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/915)
> * Fix indentation calculation by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#916](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/916)
> * Convert Guava `Iterables.transform` and `Collections2.transform` by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#917](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/917)
> * Ignore `java.util.Iterator` in NoGuavaSetsNewHashSet recipe by [`@​lredor`](https://github.com/lredor) in [openrewrite/rewrite-migrate-java#921](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/921)

... (truncated)


Commits

* [`29e071d`](openrewrite/rewrite-migrate-java@29e071d) Handle new Java 17 fx zulu images going forward
* [`abce128`](openrewrite/rewrite-migrate-java@abce128) OpenRewrite recipe best practices
* [`5fe85a4`](openrewrite/rewrite-migrate-java@5fe85a4) [Auto] SDKMAN! Java candidates as of 2025-11-03T1018
* [`fc5ae22`](openrewrite/rewrite-migrate-java@fc5ae22) Move the `@InlineMe` recipes to rewrite-third-party ([#931](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/931))
* [`a5af8f1`](openrewrite/rewrite-migrate-java@a5af8f1) Add `NoGuavaMapsNewLinkedHashMap` to `NoGuava`
* [`19ba363`](openrewrite/rewrite-migrate-java@19ba363) Change the Jetty dependency coordinates going from EE9 to EE10 ([#914](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/914))
* [`d802221`](openrewrite/rewrite-migrate-java@d802221) Gradle 9.2.0 ([#930](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/930))
* [`bb406cf`](openrewrite/rewrite-migrate-java@bb406cf) Do not migrate to Jakarta annotations as part of Java 17 upgrade ([#923](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/923))
* [`926d84d`](openrewrite/rewrite-migrate-java@926d84d) Update SDKMan Java version ([#926](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/926))
* [`bd5eecf`](openrewrite/rewrite-migrate-java@bd5eecf) Set build tools to use Java 8 when running Java 8 upgrade ([#924](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/924))
* Additional commits viewable in [compare view](openrewrite/rewrite-migrate-java@v3.20.0...v3.21.1)
  
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility\_score?dependency-name=org.openrewrite.recipe:rewrite-migrate-java&package-manager=maven&previous-version=3.20.0&new-version=3.21.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
  
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@timtebeek timtebeek timtebeek approved these changes

Assignees

@Laurens-W Laurens-W

Labels

bug Something isn't working

Projects

OpenRewrite
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Laurens-W @timtebeek