Bind Maven to OpenJDK 21 for runtime

Author: mizdebsk

patches/maven/0001-Add-build.properties-and-pom.properties.patch

@@ -1,7 +1,7 @@
-From d187132a9d8cf609860496abee3a4d7db4704597 Mon Sep 17 00:00:00 2001
+From 9f4ea930607f2bd2e83eb85ef8557f6cc1b1e4ba Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Fri, 7 Dec 2018 05:54:19 +0100
-Subject: [PATCH 1/3] Add build.properties and pom.properties
+Subject: [PATCH 1/2] Add build.properties and pom.properties
 
 Forwarded: not-needed
 ---
@@ -12,13 +12,13 @@ Forwarded: not-needed
 
 diff --git a/maven-core/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties b/maven-core/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties
 new file mode 100644
-index 000000000..874aac228
+index 0000000000..04f949e54d
 --- /dev/null
 +++ b/maven-core/src/main/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties
-@@ -0,0 +1,1 @@
+@@ -0,0 +1 @@
 +version=3.9.4
 diff --git a/maven-core/src/main/resources/org/apache/maven/messages/build.properties b/maven-core/src/main/resources/org/apache/maven/messages/build.properties
-index 20f386ba0..3ff0e7c9a 100644
+index 20f386ba0e..dd70c6b0ac 100644
 --- a/maven-core/src/main/resources/org/apache/maven/messages/build.properties
 +++ b/maven-core/src/main/resources/org/apache/maven/messages/build.properties
 @@ -15,8 +15,8 @@
@@ -37,5 +37,5 @@ index 20f386ba0..3ff0e7c9a 100644
 +distributionShortName=XMvn
 +distributionName=Red Hat XMvn
 -- 
-2.35.1
+2.41.0
 

…004-Bind-to-OpenJDK-17-for-runtime.patch …002-Bind-to-OpenJDK-21-for-runtime.patchpatches/maven/0004-Bind-to-OpenJDK-17-for-runtime.patch renamed to patches/maven/0002-Bind-to-OpenJDK-21-for-runtime.patch patches/maven/0004-Bind-to-OpenJDK-17-for-runtime.patch renamed to patches/maven/0002-Bind-to-OpenJDK-21-for-runtime.patch

@@ -1,18 +1,18 @@
-From ad65f62443f23076dfc520d3f0589282da9530fa Mon Sep 17 00:00:00 2001
+From 7d4e44b4f4aac8ee4691a4a390ab5a6c4430ba27 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 8 Jul 2020 09:04:57 +0200
-Subject: [PATCH 2/2] Bind to OpenJDK 17 for runtime
+Subject: [PATCH 2/2] Bind to OpenJDK 21 for runtime
 
 Forwarded: not-needed
 ---
  apache-maven/src/bin/mvn | 16 +---------------
  1 file changed, 1 insertion(+), 15 deletions(-)
 
 diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
-index dfa384b8e..2e9f10da0 100755
+index a3004f9179..176c16a3f0 100755
 --- a/apache-maven/src/bin/mvn
 +++ b/apache-maven/src/bin/mvn
-@@ -27,21 +27,7 @@
+@@ -28,21 +28,7 @@
  #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
  # -----------------------------------------------------------------------------
 
@@ -31,10 +31,10 @@ index dfa384b8e..2e9f10da0 100755
 -  fi
 -
 -fi
-+export JAVA_HOME=/usr/lib/jvm/java-17
++export JAVA_HOME=/usr/lib/jvm/java-21
 
  # OS specific support. $var _must_ be set to either true or false.
  cygwin=false;
 -- 
-2.39.1
+2.41.0