Skip to content
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.

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

Upgrade RESTEasy from 4.6.1.Final to 4.7.0.Final #18623

Merged
merged 1 commit into from
Jul 14, 2021

Conversation

jamezp
Copy link
Contributor

@jamezp jamezp commented Jul 12, 2021

Resolves #18622

@quarkus-bot
Copy link

quarkus-bot bot commented Jul 12, 2021

Thanks for your pull request!

The title of your pull request does not follow our editorial rules. Could you have a look?

  • title should preferably start with an uppercase character (if it makes sense!)

This message is automatically generated by a bot.

@quarkus-bot quarkus-bot bot added the area/dependencies Pull requests that update a dependency file label Jul 12, 2021
@jamezp jamezp changed the title [18622] Upgrade RESTEasy from 4.6.1.Final to 4.7.0.Final Upgrade RESTEasy from 4.6.1.Final to 4.7.0.Final Jul 12, 2021
Copy link
Member

@gsmet gsmet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I added a small comment.

<version>${resteasy.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you move the BOM? The BOM order is important so I wouldn't move it except if we have a good reason.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a conflict with the version of Vert.x the RESTEasy BOM was importing. It was causing compile errors. I just moved it below the Vert.x import.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the RESTEasy BOM including a version of Vert.x? This doesn't seem like a normal behavior.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RESTEasy has a Vert.x module (that is different to the Vert.x support we provide).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes sure but it shouldn't include a version for Vert.x artifacts.

I put the BOM back where it was and I don't have any compilation issue.

I'll push to a branch in my fork to see what CI has to say.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I made a diff of the effective POM and there's no difference except for the position. BOMs are a sensible matter so I prefer not changing it if we can avoid it.

Copy link
Member

@gsmet gsmet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's sort out this ordering issue before thinking about merging this PR.

@quarkus-bot
Copy link

quarkus-bot bot commented Jul 12, 2021

This workflow status is outdated as a new workflow run has been triggered.

Failing Jobs - Building 91e2237

Status Name Step Test failures Logs Raw logs
✔️ JVM Tests - JDK 11
JVM Tests - JDK 11 Windows Build Test failures Logs Raw logs
✔️ JVM Tests - JDK 16

Full information is available in the Build summary check run.

Test Failures

⚙️ JVM Tests - JDK 11 Windows #

📦 extensions/arc/deployment

io.quarkus.arc.test.config.ConfigPropertiesTest. - More details - Source on GitHub

@jamezp
Copy link
Contributor Author

jamezp commented Jul 12, 2021

Let's sort out this ordering issue before thinking about merging this PR.

I'm not too sure what could be done to sort it out short of using the same version of Vert.x in Quarkus and RESTEasy. Even then it just hides it until it diverges again.

@gsmet
Copy link
Member

gsmet commented Jul 13, 2021

@jamezp the RESTEasy BOM doesn't enforce any Vert.x version AFAICS so it shouldn't change anything. And indeed, I moved it back and it doesn't change anything.

I pushed the old order to CI, let's see how it goes.

@jamezp
Copy link
Contributor Author

jamezp commented Jul 13, 2021

@gsmet I think that's because of this fix https://github.com/resteasy/Resteasy/pull/2856/files#diff-804f7d09a86dc42c94770466e216189fa8816942d41764cb4d31a69b2013f37dR30-R31. If you use 4.7.0.Beta1 which doesn't include that and uses Vert.x 4.0.3 you'll see a compile error in extensions/vertx-http/runtime.

I will admittedly do not understand how the dependency:tree shows the right version with Final, but not Beta.

Anyway whatever you prefer. If an upgrade to Vert.x breaks it in the future we'll know how to fix it :)

@@ -256,6 +256,7 @@

<!-- RESTEasy dependencies, imported as a BOM -->
<!-- As RESTEasy also imports Jackson, we need to import its BOM after the Jackson BOM -->
<!-- As RESTEasy also imports Vert.x transitively, we need to import its BOM after the Vert.x BOM -->
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be removed now since we didn't move the import.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'll clean everything if I can get CI to pass. If not I'll dig a bit more.

Copy link
Member

@gsmet gsmet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Things are looking good. I squashed the commits.

@gsmet gsmet added the triage/waiting-for-ci Ready to merge when CI successfully finishes label Jul 13, 2021
@quarkus-bot
Copy link

quarkus-bot bot commented Jul 13, 2021

This workflow status is outdated as a new workflow run has been triggered.

🚫 This workflow run has been cancelled.

Failing Jobs - Building c244733

⚠️ Artifacts of the workflow run were not available thus the report misses some details.

Status Name Step Test failures Logs Raw logs
✔️ JVM Tests - JDK 11
JVM Tests - JDK 11 Windows Build ⚠️ Check → Logs Raw logs
✔️ JVM Tests - JDK 16

@famod
Copy link
Member

famod commented Jul 14, 2021

CI is happy, so let's merge.

I'll follow up with re-enabling those rest-client TCK tests that had to be disabled for Java 16.

@famod famod merged commit e96bab6 into quarkusio:main Jul 14, 2021
@quarkus-bot quarkus-bot bot added this to the 2.1 - main milestone Jul 14, 2021
@quarkus-bot quarkus-bot bot removed the triage/waiting-for-ci Ready to merge when CI successfully finishes label Jul 14, 2021
@jamezp jamezp deleted the resteasy-upgrade branch August 27, 2021 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade RESTEasy from 4.6.1.Final to 4.7.0.Final
5 participants