Skip to content

Updates irb to 1.4.2#7691

Closed
andsel wants to merge 3 commits intojruby:masterfrom
andsel:fix/update_irb_to_1.4.2
Closed

Updates irb to 1.4.2#7691
andsel wants to merge 3 commits intojruby:masterfrom
andsel:fix/update_irb_to_1.4.2

Conversation

@andsel
Copy link
Contributor

@andsel andsel commented Feb 27, 2023

Update irb to version 1.4.2 because doesn't require rdoc module.

Fixes #7690

Copy link
Member

@kares kares left a comment

Choose a reason for hiding this comment

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

Hey Andrea, you updated the pom.xml but the pom.rb is really the source of truth (pom.xml gets generated from the .rb version).

I would suggest to update the pom.rb line and run mvn package ... the xml should stay the same given you already have the changes.

@andsel
Copy link
Contributor Author

andsel commented Feb 28, 2023

Hi @kares ! thanks for checking :-D
I've updated the lib/pom.rb to reflect the xml version.
If I run run ./mvnw package on my local machine, it also updates lib/pom.xml and core/pom.xml just inverting of position the mvn's groupid, for example:

diff --git a/lib/pom.xml b/lib/pom.xml
index 63786be945..035ba65cbc 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -39,8 +39,8 @@ DO NOT MODIFY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <groupId>rubygems</groupId>
           <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
         </exclusion>
       </exclusions>
     </dependency>

Is it correct? Or after the mvn package should I commit also the changed lines by maven?

@andsel andsel requested a review from kares February 28, 2023 13:42
@enebo
Copy link
Member

enebo commented Feb 28, 2023

@andsel At some point maven changed something and ordering of processing a Map changes the order (Ruby stuff is put into a Map and Java side walks it). A newer Maven will put it in the same order as we have it (we all made sure we were using newer maven at one point because we were playing ping pong with the generated xml files.

If it is not possible to update maven let me know and we will merge this as-is and I will correct that ordering manually as part of the merge

Copy link
Member

@kares kares left a comment

Choose a reason for hiding this comment

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

🙇

@andsel
Copy link
Contributor Author

andsel commented Feb 28, 2023

@enebo I would have avoided playing ping pong on the xmls. However with commit 1356098 I've updated the core/pom.xml and lib/pom.xml with the new version of irb as generated by the maven wrapper.
Let me know if keep the commit or remove, before merge.

@headius headius added this to the JRuby 9.4.2.0 milestone Feb 28, 2023
@headius
Copy link
Member

headius commented Feb 28, 2023

I merged this manually to avoid the reordering commit, and it is on master as of 4a1e6fc.

Thanks for the help!

@headius headius closed this Feb 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update irb to version 1.4.2+

4 participants