From f29c84f77d65bcacf0dd46dd46cb88f0c2309a20 Mon Sep 17 00:00:00 2001
From: Charles Oliver Nutter <headius@headius.com>
Date: Mon, 12 Sep 2022 15:43:21 -0500
Subject: [PATCH] Update polyglot-maven and commit updated XMLs

This update brings in fixes for element ordering, which were
causing dueling XML diffs when moving back and forth between Java
8 and Java 9+, which order properties differently due to new
hashing algorithms.

There are other fixes and updates, of course, but the two most
recent polyglot-maven releases do not successfully build JRuby.
See https://github.com/takari/polyglot-maven/issues/243 for more
information on that issue.
---
 .mvn/extensions.xml |  2 +-
 core/pom.xml        | 14 ++++----
 lib/pom.xml         | 85 +++++++++++++++++++++++----------------------
 pom.xml             |  2 +-
 shaded/pom.xml      |  2 +-
 5 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 8bb9102c170..443f8482536 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.3.1.1</version>
+    <version>0.4.7</version>
   </extension>
 </extensions>
diff --git a/core/pom.xml b/core/pom.xml
index f92bc9b1920..8166089907e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-DO NOT MODIFIY - GENERATED CODE
+DO NOT MODIFY - GENERATED CODE
 
 
 -->
@@ -82,8 +82,8 @@ DO NOT MODIFIY - GENERATED CODE
       <version>1.2.0</version>
       <exclusions>
         <exclusion>
-          <artifactId>jnr-ffi</artifactId>
           <groupId>com.github.jnr</groupId>
+          <artifactId>jnr-ffi</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -93,8 +93,8 @@ DO NOT MODIFIY - GENERATED CODE
       <version>0.32.13</version>
       <exclusions>
         <exclusion>
-          <artifactId>jnr-ffi</artifactId>
           <groupId>com.github.jnr</groupId>
+          <artifactId>jnr-ffi</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -104,8 +104,8 @@ DO NOT MODIFIY - GENERATED CODE
       <version>0.38.17</version>
       <exclusions>
         <exclusion>
-          <artifactId>jnr-ffi</artifactId>
           <groupId>com.github.jnr</groupId>
+          <artifactId>jnr-ffi</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -115,8 +115,8 @@ DO NOT MODIFIY - GENERATED CODE
       <version>3.1.15</version>
       <exclusions>
         <exclusion>
-          <artifactId>jnr-ffi</artifactId>
           <groupId>com.github.jnr</groupId>
+          <artifactId>jnr-ffi</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -126,8 +126,8 @@ DO NOT MODIFIY - GENERATED CODE
       <version>0.10.3</version>
       <exclusions>
         <exclusion>
-          <artifactId>jnr-ffi</artifactId>
           <groupId>com.github.jnr</groupId>
+          <artifactId>jnr-ffi</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -229,8 +229,8 @@ DO NOT MODIFIY - GENERATED CODE
       <version>0.4.1</version>
       <exclusions>
         <exclusion>
-          <artifactId>asm-all</artifactId>
           <groupId>org.ow2.asm</groupId>
+          <artifactId>asm-all</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
diff --git a/lib/pom.xml b/lib/pom.xml
index be985e7b2c6..b2da99f2f51 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-DO NOT MODIFIY - GENERATED CODE
+DO NOT MODIFY - GENERATED CODE
 
 
 -->
@@ -39,8 +39,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -52,8 +52,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -65,8 +65,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -78,8 +78,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -91,8 +91,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -104,8 +104,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -117,8 +117,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -130,8 +130,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -143,8 +143,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -156,8 +156,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -169,8 +169,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -182,8 +182,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -195,8 +195,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -208,8 +208,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -221,8 +221,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -234,8 +234,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -247,8 +247,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -260,8 +260,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -273,8 +273,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -286,8 +286,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -299,8 +299,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -312,8 +312,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -325,8 +325,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -338,8 +338,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -351,8 +351,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -364,8 +364,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -377,8 +377,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -390,8 +390,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -403,8 +403,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -416,8 +416,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -429,8 +429,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -442,8 +442,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -455,8 +455,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -468,8 +468,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -481,8 +481,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -494,8 +494,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -507,8 +507,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -520,8 +520,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -533,8 +533,8 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <artifactId>jar-dependencies</artifactId>
           <groupId>rubygems</groupId>
+          <artifactId>jar-dependencies</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -757,7 +757,7 @@ DO NOT MODIFIY - GENERATED CODE
       <plugin>
         <groupId>io.takari.polyglot</groupId>
         <artifactId>polyglot-maven-plugin</artifactId>
-        <version>0.3.1</version>
+        <version>0.4.7</version>
         <executions>
           <execution>
             <id>install_gems</id>
@@ -808,9 +808,10 @@ DO NOT MODIFIY - GENERATED CODE
           <dependency>
             <groupId>io.takari.polyglot</groupId>
             <artifactId>polyglot-ruby</artifactId>
-            <version>0.3.1</version>
+            <version>0.4.7</version>
           </dependency>
         </dependencies>
+        <inherited>false</inherited>
       </plugin>
     </plugins>
   </build>
diff --git a/pom.xml b/pom.xml
index 7c85b22eb51..32eee180518 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-DO NOT MODIFIY - GENERATED CODE
+DO NOT MODIFY - GENERATED CODE
 
 
 -->
diff --git a/shaded/pom.xml b/shaded/pom.xml
index 77b398f2f9e..496260f952b 100644
--- a/shaded/pom.xml
+++ b/shaded/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-DO NOT MODIFIY - GENERATED CODE
+DO NOT MODIFY - GENERATED CODE
 
 
 -->