Update maven4 to version 4.0.0-rc-4

patches/dola-gleaner/0001-Update-to-Maven-4.0.0-rc-4.patch

@@ -0,0 +1,54 @@
+From 35a9090b6ad22a9b17e9eceabe00651de19824ef Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Fri, 11 Jul 2025 13:41:16 +0200
+Subject: [PATCH] Update to Maven 4.0.0-rc-4
+
+Forwarded: https://github.com/mizdebsk/dola-gleaner/pull/11
+---
+ pom.xml                                            | 2 +-
+ src/main/java/io/kojan/dola/gleaner/Collector.java | 2 +-
+ src/main/java/io/kojan/dola/gleaner/Gleaner.java   | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 4e10b92..111576f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -32,7 +32,7 @@
+   </scm>
+   <properties>
+     <kojan.javaRelease>17</kojan.javaRelease>
+-    <mavenVersion>4.0.0-rc-3</mavenVersion>
++    <mavenVersion>4.0.0-rc-4</mavenVersion>
+   </properties>
+   <dependencies>
+     <dependency>
+diff --git a/src/main/java/io/kojan/dola/gleaner/Collector.java b/src/main/java/io/kojan/dola/gleaner/Collector.java
+index 3adee23..7bf03ba 100644
+--- a/src/main/java/io/kojan/dola/gleaner/Collector.java
++++ b/src/main/java/io/kojan/dola/gleaner/Collector.java
+@@ -38,7 +38,7 @@ public class Collector {
+                         coords.getArtifactId(),
+                         coords.getExtension(),
+                         coords.getClassifier(),
+-                        coords.getVersionConstraint().asString());
++                        coords.getVersionConstraint().toString());
+         dep.coords = coords;
+         return dep;
+     }
+diff --git a/src/main/java/io/kojan/dola/gleaner/Gleaner.java b/src/main/java/io/kojan/dola/gleaner/Gleaner.java
+index 626bbbd..5cf9acc 100644
+--- a/src/main/java/io/kojan/dola/gleaner/Gleaner.java
++++ b/src/main/java/io/kojan/dola/gleaner/Gleaner.java
+@@ -66,7 +66,7 @@ public class Gleaner {
+     private MavenProject lookupReactor(ArtifactCoordinates coords) {
+         String groupId = coords.getGroupId();
+         String artifactId = coords.getArtifactId();
+-        String version = coords.getVersionConstraint().getRecommendedVersion().asString();
++        String version = coords.getVersionConstraint().getRecommendedVersion().toString();
+         return reactorMap
+                 .getOrDefault(groupId, Map.of())
+                 .getOrDefault(artifactId, Map.of())
+-- 
+2.50.1
+

patches/jline3/0001-Load-native-library-form-usr-lib-jline.patch

@@ -1,4 +1,4 @@
-From 519aa218831e6ebf30a7d6985f5a9bef2e291a4f Mon Sep 17 00:00:00 2001
+From a9575efafc0981774b504df745040688e948fa8b Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 26 Feb 2025 07:26:26 +0100
 Subject: [PATCH 1/2] Load native library form /usr/lib/jline
@@ -9,10 +9,10 @@ Forwarded: not-needed
  1 file changed, 3 insertions(+)
 
 diff --git a/native/src/main/java/org/jline/nativ/JLineNativeLoader.java b/native/src/main/java/org/jline/nativ/JLineNativeLoader.java
-index 47a053df..98c84d28 100644
+index 6236d8f3..6684dd1d 100644
 --- a/native/src/main/java/org/jline/nativ/JLineNativeLoader.java
 +++ b/native/src/main/java/org/jline/nativ/JLineNativeLoader.java
-@@ -328,6 +328,9 @@ public class JLineNativeLoader {
+@@ -499,6 +499,9 @@ public class JLineNativeLoader {
 
          // As a last resort try from java.library.path
          String javaLibraryPath = System.getProperty("java.library.path", "");
@@ -23,5 +23,5 @@ index 47a053df..98c84d28 100644
              if (ldPath.isEmpty()) {
                  continue;
 -- 
-2.48.1
+2.50.1
 

patches/jline3/0002-Remove-optional-dependency-on-universalchardet.patch

@@ -1,4 +1,4 @@
-From be3495103741d920d5118a8db1aef5ade09e8080 Mon Sep 17 00:00:00 2001
+From 5fcacd2eaf72aa0c60d92b276ca880fe13060bbd Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 26 Feb 2025 16:26:49 +0100
 Subject: [PATCH 2/2] Remove optional dependency on universalchardet
@@ -9,18 +9,18 @@ Forwarded: not-needed
  1 file changed, 12 deletions(-)
 
 diff --git a/builtins/src/main/java/org/jline/builtins/Nano.java b/builtins/src/main/java/org/jline/builtins/Nano.java
-index 765cea7c..47501ee1 100644
+index 491d0bc3..be5748c1 100644
 --- a/builtins/src/main/java/org/jline/builtins/Nano.java
 +++ b/builtins/src/main/java/org/jline/builtins/Nano.java
-@@ -47,7 +47,6 @@ import org.jline.terminal.Terminal.Signal;
- import org.jline.terminal.Terminal.SignalHandler;
+@@ -51,7 +51,6 @@ import org.jline.terminal.impl.MouseSupport;
  import org.jline.utils.*;
  import org.jline.utils.InfoCmp.Capability;
+ import org.jline.utils.Status;
 -import org.mozilla.universalchardet.UniversalDetector;
 
  import static org.jline.builtins.SyntaxHighlighter.*;
  import static org.jline.keymap.KeyMap.KEYMAP_LENGTH;
-@@ -249,17 +248,6 @@ public class Nano implements Editor {
+@@ -380,17 +379,6 @@ public class Nano implements Editor {
              }
              byte[] bytes = bos.toByteArray();
 
@@ -39,5 +39,5 @@ index 765cea7c..47501ee1 100644
              try (BufferedReader reader =
                      new BufferedReader(new InputStreamReader(new ByteArrayInputStream(bytes), charset))) {
 -- 
-2.48.1
+2.50.1
 

patches/xmvn/0001-Update-to-Maven-4.0.0-rc-4.patch

@@ -0,0 +1,63 @@
+From cf5d03e9450603f9f05f5aaf13eb2a30c6d23449 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Fri, 11 Jul 2025 13:38:17 +0200
+Subject: [PATCH] Update to Maven 4.0.0-rc-4
+
+Forwarded: https://github.com/fedora-java/xmvn/pull/423
+---
+ .../fedoraproject/xmvn/it/ArchiveLayoutIntegrationTest.java   | 2 ++
+ .../main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java    | 4 ++--
+ xmvn-parent/pom.xml                                           | 2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/ArchiveLayoutIntegrationTest.java b/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/ArchiveLayoutIntegrationTest.java
+index c7e4eb91..7b6013cf 100644
+--- a/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/ArchiveLayoutIntegrationTest.java
++++ b/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/ArchiveLayoutIntegrationTest.java
+@@ -158,6 +158,8 @@ class ArchiveLayoutIntegrationTest extends AbstractIntegrationTest {
+         expect(1, 1, "bin/mvnenc\\.cmd");
+         expect(1, 1, "bin/mvnsh");
+         expect(1, 1, "bin/mvnsh\\.cmd");
++        expect(1, 1, "bin/mvnup");
++        expect(1, 1, "bin/mvnup\\.cmd");
+         expect(1, 1, "bin/mvnyjp");
+         expect(1, 1, "bin/m2\\.conf");
+
+diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java
+index b762c582..af04e61a 100644
+--- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java
++++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/InstallMojo.java
+@@ -134,7 +134,7 @@ public class InstallMojo extends AbstractMojo {
+         artifact.setArtifactId(mavenArtifact.getArtifactId());
+         artifact.setExtension(mavenArtifact.getExtension());
+         artifact.setClassifier(mavenArtifact.getClassifier());
+-        artifact.setVersion(mavenArtifact.getVersion().asString());
++        artifact.setVersion(mavenArtifact.getVersion().toString());
+         artifact.setPath(artifactPath.toString());
+         artifact.getProperties().put("type", type);
+
+@@ -152,7 +152,7 @@ public class InstallMojo extends AbstractMojo {
+                 dependency.setArtifactId(coords.getArtifactId());
+                 dependency.setExtension(coords.getExtension());
+                 dependency.setClassifier(coords.getClassifier());
+-                dependency.setRequestedVersion(coords.getVersionConstraint().asString());
++                dependency.setRequestedVersion(coords.getVersionConstraint().toString());
+                 dependency.setOptional(mavenDependency.isOptional());
+
+                 for (Exclusion mavenExclusion : mavenDependency.getExclusions()) {
+diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml
+index aaf47662..f724dcee 100644
+--- a/xmvn-parent/pom.xml
++++ b/xmvn-parent/pom.xml
+@@ -68,7 +68,7 @@
+
+     <asmVersion>9.8</asmVersion>
+     <mavenResolverVersion>2.0.7</mavenResolverVersion>
+-    <mavenVersion>4.0.0-rc-3</mavenVersion>
++    <mavenVersion>4.0.0-rc-4</mavenVersion>
+     <picocliVersion>4.7.7</picocliVersion>
+     <pluginToolsVersion>3.15.1</pluginToolsVersion>
+     <slf4jVersion>2.0.17</slf4jVersion>
+-- 
+2.50.1
+

project/jline3.properties

@@ -1,4 +1,3 @@
 url=https://github.com/jline/jline3
 ref=jline-@.@.@
-version=3.29.0
-#rpm_name=
+version=3.30.4

project/maven-resolver2.properties

@@ -1,3 +1,3 @@
 url=https://github.com/apache/maven-resolver.git
 ref=maven-resolver-@.@.@
-version=2.0.7
+version=2.0.9

project/maven4.properties

@@ -1,3 +1,3 @@
 url=https://github.com/apache/maven
-ref=maven-4.0.0-rc-3
-version=4.0.0-rc-3
+ref=maven-4.0.0-rc-4
+version=4.0.0-rc-4

project/maven4.xml

@@ -25,6 +25,8 @@
         <output>velocity</output>
         <velocityBasedir>../../src/mdo</velocityBasedir>
         <template>model.vm</template>
+        <param>locationTracking=true</param>
+        <param>generateLocationClasses=true</param>
         <param>packageModelV4=org.apache.maven.api.cli.extensions</param>
         <param>packageToolV4=org.apache.maven.cli.internal.extension.io</param>
       </modello>
@@ -380,34 +382,14 @@
     <dependency>maven4-artifact</dependency>
     <dependency>maven4-model</dependency>
     <dependency>maven4-xml</dependency>
+    <dependency>maven4-support</dependency>
     <dependency>plexus-xml</dependency>
     <dependency>stax2-api</dependency>
     <dependency>woodstox</dependency>
     <dependency>sisu-plexus</dependency>
     <dependency>plexus-classworlds</dependency>
     <dependency>maven-resolver2</dependency>
     <build>
-      <modello>
-        <model>../../api/maven-api-plugin/src/main/mdo/lifecycle.mdo</model>
-        <version>2.0.0</version>
-        <output>velocity</output>
-        <velocityBasedir>../../src/mdo</velocityBasedir>
-        <template>reader-stax.vm</template>
-        <template>writer-stax.vm</template>
-        <param>packageModelV4=org.apache.maven.api.plugin.descriptor.lifecycle</param>
-        <param>packageToolV4=org.apache.maven.plugin.lifecycle.io</param>
-      </modello>
-      <modello>
-        <model>../../api/maven-api-plugin/src/main/mdo/plugin.mdo</model>
-        <version>2.0.0</version>
-        <output>velocity</output>
-        <velocityBasedir>../../src/mdo</velocityBasedir>
-        <template>reader-stax.vm</template>
-        <template>writer-stax.vm</template>
-        <param>packageModelV3=org.apache.maven.plugin.descriptor</param>
-        <param>packageModelV4=org.apache.maven.api.plugin.descriptor</param>
-        <param>packageToolV4=org.apache.maven.plugin.descriptor.io</param>
-      </modello>
       <compiler>
         <release>17</release>
         <addSourceRoot>src/main/java</addSourceRoot>
@@ -559,6 +541,7 @@
     <dependency>maven4-api-annotations</dependency>
     <dependency>maven4-api-toolchain</dependency>
     <dependency>maven4-api-xml</dependency>
+    <dependency>maven4-support</dependency>
     <dependency>plexus-xml</dependency>
     <build>
       <modello>
@@ -615,6 +598,7 @@
     <dependency>maven4-api-toolchain</dependency>
     <dependency>stax2-api</dependency>
     <dependency>woodstox</dependency>
+    <dependency>jdom2</dependency>
     <build>
       <modello>
         <model>../../api/maven-api-cli/src/main/mdo/core-extensions.mdo</model>
@@ -625,6 +609,7 @@
         <template>writer-stax.vm</template>
         <param>packageModelV4=org.apache.maven.api.cli.extensions</param>
         <param>packageToolV4=org.apache.maven.cling.internal.extension.io</param>
+        <param>locationTracking=true</param>
       </modello>
       <compiler>
         <release>17</release>
@@ -714,8 +699,10 @@
     <dependency>maven4-api-spi</dependency>
     <dependency>maven4-api-toolchain</dependency>
     <dependency>maven4-api-xml</dependency>
+    <dependency>maven4-api-plugin</dependency>
     <dependency>maven4-di</dependency>
     <dependency>maven4-xml</dependency>
+    <dependency>maven4-support</dependency>
     <dependency>stax2-api</dependency>
     <dependency>woodstox</dependency>
     <dependency>maven-resolver2</dependency>
@@ -826,6 +813,7 @@
     <dependency>sisu-plexus</dependency>
     <dependency>stax2-api</dependency>
     <dependency>woodstox</dependency>
+    <dependency>maven4-api-annotations</dependency>
     <build>
       <compiler>
         <release>17</release>
@@ -843,6 +831,7 @@
     <dependency>maven4-api-xml</dependency>
     <dependency>maven4-xml</dependency>
     <dependency>maven4-api-annotations</dependency>
+    <dependency>maven4-api-plugin</dependency>
     <dependency>stax2-api</dependency>
     <dependency>woodstox</dependency>
     <build>
@@ -904,6 +893,27 @@
         <param>isMavenModel=true</param>
         <param>minimalVersion=4.0.0</param>
       </modello>
+      <modello>
+        <model>../../api/maven-api-plugin/src/main/mdo/lifecycle.mdo</model>
+        <version>2.0.0</version>
+        <output>velocity</output>
+        <velocityBasedir>../../src/mdo</velocityBasedir>
+        <template>reader-stax.vm</template>
+        <template>writer-stax.vm</template>
+        <param>packageModelV4=org.apache.maven.api.plugin.descriptor.lifecycle</param>
+        <param>packageToolV4=org.apache.maven.plugin.lifecycle.io</param>
+      </modello>
+      <modello>
+        <model>../../api/maven-api-plugin/src/main/mdo/plugin.mdo</model>
+        <version>2.0.0</version>
+        <output>velocity</output>
+        <velocityBasedir>../../src/mdo</velocityBasedir>
+        <template>reader-stax.vm</template>
+        <template>writer-stax.vm</template>
+        <param>packageModelV3=org.apache.maven.plugin.descriptor</param>
+        <param>packageModelV4=org.apache.maven.api.plugin.descriptor</param>
+        <param>packageToolV4=org.apache.maven.plugin.descriptor.io</param>
+      </modello>
       <compiler>
         <release>17</release>
       </compiler>