From 9102980c7a569707b5d0f85a6695276c02810380 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Mon, 12 Aug 2024 11:00:09 +0200
Subject: [PATCH 1/5] Mild updates, align to latest Maven

---
 polyglot-kotlin/pom.xml                                   | 6 ++++++
 .../org/sonatype/maven/polyglot/kotlin/dsl/DSLSupport.kt  | 2 +-
 polyglot-ruby/pom.xml                                     | 2 +-
 polyglot-scala/pom.xml                                    | 2 +-
 polyglot-xml/pom.xml                                      | 1 +
 pom.xml                                                   | 8 ++++----
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/polyglot-kotlin/pom.xml b/polyglot-kotlin/pom.xml
index a5473455..42952746 100644
--- a/polyglot-kotlin/pom.xml
+++ b/polyglot-kotlin/pom.xml
@@ -58,6 +58,12 @@
       <artifactId>kotlin-script-runtime</artifactId>
       <version>${kotlin.version}</version>
     </dependency>
+    <!-- Maven Core dropped commons-lang3 dependency; also, "best practice" is to declare what you code against -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+      <version>1.12.0</version>
+    </dependency>
 
     <!-- Test -->
     <dependency>
diff --git a/polyglot-kotlin/src/main/kotlin/org/sonatype/maven/polyglot/kotlin/dsl/DSLSupport.kt b/polyglot-kotlin/src/main/kotlin/org/sonatype/maven/polyglot/kotlin/dsl/DSLSupport.kt
index d2181277..d83b8018 100644
--- a/polyglot-kotlin/src/main/kotlin/org/sonatype/maven/polyglot/kotlin/dsl/DSLSupport.kt
+++ b/polyglot-kotlin/src/main/kotlin/org/sonatype/maven/polyglot/kotlin/dsl/DSLSupport.kt
@@ -1,6 +1,6 @@
 package org.sonatype.maven.polyglot.kotlin.dsl
 
-import org.apache.commons.lang3.StringEscapeUtils.escapeJava
+import org.apache.commons.text.StringEscapeUtils.escapeJava
 
 internal var propertiesFactory: () -> java.util.Properties = { java.util.Properties() }
 
diff --git a/polyglot-ruby/pom.xml b/polyglot-ruby/pom.xml
index 2248c17d..c1d9c5bf 100644
--- a/polyglot-ruby/pom.xml
+++ b/polyglot-ruby/pom.xml
@@ -158,7 +158,7 @@
       </dependencies>
 
       <properties>
-        <jruby.plugins.version>3.0.2</jruby.plugins.version>
+        <jruby.plugins.version>3.0.3</jruby.plugins.version>
       </properties>
 
       <build>
diff --git a/polyglot-scala/pom.xml b/polyglot-scala/pom.xml
index e5e00e5e..67c8f9ae 100644
--- a/polyglot-scala/pom.xml
+++ b/polyglot-scala/pom.xml
@@ -103,7 +103,7 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>4.9.1</version>
+        <version>4.9.2</version>
         <executions>
           <execution>
             <goals>
diff --git a/polyglot-xml/pom.xml b/polyglot-xml/pom.xml
index c1908ec4..9dd2f6cb 100644
--- a/polyglot-xml/pom.xml
+++ b/polyglot-xml/pom.xml
@@ -38,6 +38,7 @@
 					<plugin>
 						<groupId>org.codehaus.modello</groupId>
 						<artifactId>modello-maven-plugin</artifactId>
+						<version>2.4.0</version>
 						<configuration>
 							<models>
 								<model>src/main/mdo/maven.mdo</model>
diff --git a/pom.xml b/pom.xml
index b0ba91c5..b6c47d60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,8 @@
   </licenses>
 
   <properties>
-    <mavenVersion>3.9.5</mavenVersion>
-    <sisuInjectVersion>0.9.0.M2</sisuInjectVersion>
+    <mavenVersion>3.9.8</mavenVersion>
+    <sisuInjectVersion>0.9.0.M3</sisuInjectVersion>
     <plexusUtilsVersion>3.5.1</plexusUtilsVersion>
     <!-- last that works with Java 8: FIXED to this version as long we insist on Java 8 building this project -->
     <!-- BUT: signArtifacts goal with this version is busted, so we need to use other means to sign -->
@@ -223,7 +223,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>3.6.1</version>
+          <version>3.7.0</version>
           <configuration>
             <scope>test</scope>
             <postBuildHookScript>verify</postBuildHookScript>
@@ -276,7 +276,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.2.4</version>
+            <version>3.2.5</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>

From 194f0ab8e9e5cb05144faf062ab23a2014d0127e Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Mon, 12 Aug 2024 12:20:06 +0200
Subject: [PATCH 2/5] Experiment: create custom Ruby distro

Just for testing some stuff
---
 polyglot-ruby/pom.xml                      | 64 ++++++++++++++++++++++
 polyglot-ruby/src/main/assembly/distro.xml | 54 ++++++++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 polyglot-ruby/src/main/assembly/distro.xml

diff --git a/polyglot-ruby/pom.xml b/polyglot-ruby/pom.xml
index c1d9c5bf..ec38602a 100644
--- a/polyglot-ruby/pom.xml
+++ b/polyglot-ruby/pom.xml
@@ -180,6 +180,70 @@
             </configuration>
           </plugin>
 
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>3.7.1</version>
+            <executions>
+              <execution>
+                <id>unpack-maven</id>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <artifact>org.apache.maven:apache-maven:${mavenVersion}:zip:bin</artifact>
+                </configuration>
+              </execution>
+              <execution>
+                <id>add-polyglot-ruby</id>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>${project.artifactId}</artifactId>
+                      <version>${project.version}</version>
+                      <type>${project.packaging}</type>
+                    </artifactItem>
+                  </artifactItems>
+                  <outputDirectory>${project.build.directory}/dependency/apache-maven-${mavenVersion}/lib/ext</outputDirectory>
+                </configuration>
+              </execution>
+              <execution>
+                <id>add-polyglot-ruby-dependencies</id>
+                <goals>
+                  <goal>copy-dependencies</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <includeScope>runtime</includeScope>
+                  <outputDirectory>${project.build.directory}/dependency/apache-maven-${mavenVersion}/lib/ext</outputDirectory>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>create-distro-packages</id>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/main/assembly/distro.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
 
diff --git a/polyglot-ruby/src/main/assembly/distro.xml b/polyglot-ruby/src/main/assembly/distro.xml
new file mode 100644
index 00000000..17a18f31
--- /dev/null
+++ b/polyglot-ruby/src/main/assembly/distro.xml
@@ -0,0 +1,54 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <id>distro</id>
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>target/dependency/apache-maven-${mavenVersion}</directory>
+            <outputDirectory>./</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/dependency/apache-maven-${mavenVersion}/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>*.cmd</include>
+                <include>*.conf</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>target/dependency/apache-maven-${mavenVersion}/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>mvn</include>
+                <include>mvnDebug</include>
+                <!-- This is so that CI systems can periodically run the profiler -->
+                <include>mvnyjp</include>
+            </includes>
+            <lineEnding>unix</lineEnding>
+            <fileMode>0755</fileMode>
+        </fileSet>
+    </fileSets>
+</assembly>

From 01033007092766dece5602f0f8a2ea961fa1126d Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 6 Sep 2024 17:26:47 +0200
Subject: [PATCH 3/5] Fix model processor

---
 polyglot-common/pom.xml                                   | 6 ++++++
 .../org/sonatype/maven/polyglot/TeslaModelProcessor.java  | 8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/polyglot-common/pom.xml b/polyglot-common/pom.xml
index 8b1a4c61..55515c75 100644
--- a/polyglot-common/pom.xml
+++ b/polyglot-common/pom.xml
@@ -24,6 +24,12 @@
       <version>${plexusUtilsVersion}</version>
       <scope>provided</scope>
     </dependency>
+      <dependency>
+          <groupId>org.scala-lang</groupId>
+          <artifactId>scala-library</artifactId>
+          <version>2.13.14</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
 
   <build>
diff --git a/polyglot-common/src/main/java/org/sonatype/maven/polyglot/TeslaModelProcessor.java b/polyglot-common/src/main/java/org/sonatype/maven/polyglot/TeslaModelProcessor.java
index a7a96bda..b58c1c3f 100644
--- a/polyglot-common/src/main/java/org/sonatype/maven/polyglot/TeslaModelProcessor.java
+++ b/polyglot-common/src/main/java/org/sonatype/maven/polyglot/TeslaModelProcessor.java
@@ -31,8 +31,7 @@
 import org.apache.maven.model.io.ModelReader;
 import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-import org.eclipse.sisu.Priority;
+import org.eclipse.sisu.Typed;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.codehaus.plexus.util.ReaderFactory;
@@ -44,10 +43,9 @@
  *
  * @since 0.7
  */
-//@Component(role = ModelProcessor.class, hint = "tesla-polyglot")
 @Singleton
-@Named
-@Priority(10)
+@Named("tesla-polyglot")
+@Typed(ModelProcessor.class)
 public class TeslaModelProcessor implements ModelProcessor {
 
   private static final String DEFAULT_POM_FILE = "pom.xml";

From 8e51f09ec8da0c6f7c8213d041fe3b9683db6a17 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 6 Sep 2024 17:29:04 +0200
Subject: [PATCH 4/5] Remove added by mistake

---
 polyglot-common/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/polyglot-common/pom.xml b/polyglot-common/pom.xml
index 55515c75..8b1a4c61 100644
--- a/polyglot-common/pom.xml
+++ b/polyglot-common/pom.xml
@@ -24,12 +24,6 @@
       <version>${plexusUtilsVersion}</version>
       <scope>provided</scope>
     </dependency>
-      <dependency>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-library</artifactId>
-          <version>2.13.14</version>
-          <scope>compile</scope>
-      </dependency>
   </dependencies>
 
   <build>

From 8df3e81ce9abb71f4a4fb12f03cbe97731700ef4 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Sat, 7 Sep 2024 20:21:12 +0200
Subject: [PATCH 5/5] Latest plugin

---
 polyglot-ruby/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/polyglot-ruby/pom.xml b/polyglot-ruby/pom.xml
index ec38602a..1d65e165 100644
--- a/polyglot-ruby/pom.xml
+++ b/polyglot-ruby/pom.xml
@@ -183,7 +183,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
-            <version>3.7.1</version>
+            <version>3.8.0</version>
             <executions>
               <execution>
                 <id>unpack-maven</id>