3.9.13 is being voted on

0001-Adapt-mvn-script.patch

@@ -1,4 +1,4 @@
-From 2b3b2007375d73aec09cc0687392cdeaac938a21 Mon Sep 17 00:00:00 2001
+From e9df9156e0953b04e00c191eb7faaa9333a8f71d Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Wed, 1 Feb 2017 14:54:26 +0100
 Subject: [PATCH 1/5] Adapt mvn script
@@ -65,5 +65,5 @@ index 47dc7d7f4e..01632abd29 100755
  
  # For Cygwin, switch paths to Windows format before running java
 -- 
-2.52.0
+2.53.0
 

0002-Invoke-logback-via-reflection.patch

@@ -1,4 +1,4 @@
-From 33ffcbcb1ed2dc9450ecb2f54d744379339572da Mon Sep 17 00:00:00 2001
+From 78eea6718316f99993d303d1d8cc878a81ee920a Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Tue, 6 Jun 2017 13:47:43 +0200
 Subject: [PATCH 2/5] Invoke logback via reflection
@@ -47,5 +47,5 @@ index 4dc5a37b88..a977ba0854 100644
  
      @Override
 -- 
-2.52.0
+2.53.0
 

0003-Remove-dependency-on-powermock.patch

@@ -1,29 +1,30 @@
-From c8e2ec01fd4080225ef54cc394b15d14a4d54ff4 Mon Sep 17 00:00:00 2001
+From 8ea520fbd09c890a75e82b3d614e21c4fbbecbe6 Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
 Date: Thu, 5 Sep 2019 15:21:04 +0200
 Subject: [PATCH 3/5] Remove dependency on powermock
 
 ---
- .../StringSearchModelInterpolatorTest.java    | 59 -------------------
- 1 file changed, 59 deletions(-)
+ .../StringSearchModelInterpolatorTest.java    | 62 -------------------
+ 1 file changed, 62 deletions(-)
 
 diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
-index 9bfd685101..d8c51e2fdd 100644
+index 039c0ee2a9..f15cb2b537 100644
 --- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
 +++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
-@@ -40,8 +40,6 @@
- import static org.hamcrest.CoreMatchers.anyOf;
- import static org.hamcrest.CoreMatchers.is;
- import static org.junit.Assert.assertThat;
+@@ -44,8 +44,6 @@
+ import static org.hamcrest.MatcherAssert.assertThat;
+ import static org.junit.jupiter.api.Assertions.assertEquals;
+ import static org.junit.jupiter.api.Assertions.assertNotNull;
 -import static org.powermock.reflect.Whitebox.getField;
 -import static org.powermock.reflect.Whitebox.getInternalState;
  
  /**
   * @author jdcasey
-@@ -349,63 +347,6 @@ public void testInterpolateObjectWithPomFile() throws Exception {
+@@ -364,66 +362,6 @@ public void testInterpolateObjectWithPomFile() throws Exception {
                          is(System.getProperty("user.dir") + File.separator + '.' + File.separator + "target"))));
      }
  
+-    @Test
 -    public void testNotInterpolateObjectWithFile() throws Exception {
 -        Model model = new Model();
 -
@@ -51,10 +52,11 @@ index 9bfd685101..d8c51e2fdd 100644
 -        assertNotNull(objCacheItem);
 -        assertNotNull(fileCacheItem);
 -
--        assertThat(((Object[]) getInternalState(objCacheItem, "fields")).length, is(0));
--        assertThat(((Object[]) getInternalState(fileCacheItem, "fields")).length, is(0));
+-        assertEquals(0, ((Object[]) getInternalState(objCacheItem, "fields")).length);
+-        assertEquals(0, ((Object[]) getInternalState(fileCacheItem, "fields")).length);
 -    }
 -
+-    @Test
 -    public void testNotInterpolateFile() throws Exception {
 -        Model model = new Model();
 -
@@ -78,12 +80,13 @@ index 9bfd685101..d8c51e2fdd 100644
 -
 -        assertNotNull(fileCacheItem);
 -
--        assertThat(((Object[]) getInternalState(fileCacheItem, "fields")).length, is(0));
+-        assertEquals(0, ((Object[]) getInternalState(fileCacheItem, "fields")).length);
 -    }
 -
+-    @Test
      public void testConcurrentInterpolation() throws Exception {
          final Model model = new Model();
  
 -- 
-2.52.0
+2.53.0
 

0004-Fix-build-with-qdox-2.0.1.patch

@@ -1,4 +1,4 @@
-From ecf07ac5b51f753fec95f2102ce8ea53d39846a8 Mon Sep 17 00:00:00 2001
+From 60726a6deacf106ebce36de5a19ec19c68739501 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
 Date: Tue, 2 May 2023 18:12:26 +0200
 Subject: [PATCH 4/5] Fix build with qdox-2.0.1
@@ -152,5 +152,5 @@ index 025800698c..e3d1156bd5 100644
 +    void register(MavenProject project, Key cacheKey, CacheRecord rcrd);
  }
 -- 
-2.52.0
+2.53.0
 

0005-Reproducible-maven.build.timestamp.patch

@@ -1,4 +1,4 @@
-From 0d5ede756650a0e4f01183723a9185b711ee4ecf Mon Sep 17 00:00:00 2001
+From 8ca6cbaaac390e033b9269ac081bc48ce23c99c0 Mon Sep 17 00:00:00 2001
 From: Emmanuel Bourg <ebourg@apache.org>
 Date: Mon, 4 Sep 2023 17:10:19 +0200
 Subject: [PATCH 5/5] Reproducible maven.build.timestamp
@@ -61,5 +61,5 @@ index e1721334f4..2ea2ce3815 100644
          dateFormat.setTimeZone(DEFAULT_BUILD_TIME_ZONE);
          formattedTimestamp = dateFormat.format(time);
 -- 
-2.52.0
+2.53.0
 

maven.spec

@@ -20,7 +20,7 @@
 %global homedir %{_datadir}/%{name}%{?maven_version_suffix}
 %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}
 Name:           maven
-Version:        3.9.12
+Version:        3.9.13
 Release:        0
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
@@ -216,6 +216,8 @@ sed -i "s/distributionName=.*/distributionName=Apache\ Maven/" `find -name build
 
 %pom_remove_dep -r :logback-classic
 
+%pom_change_dep :plexus-testing :::test maven-core
+
 %pom_xpath_remove pom:parent/pom:relativePath
 
 for i in maven-compat maven-core maven-embedder maven-model maven-model-builder maven-plugin-api maven-resolver-provider maven-settings-builder