Fixes

Author: brianseeders

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/PruneChangelogsTask.java

@@ -149,7 +149,8 @@ static Stream<QualifiedVersion> findPreviousVersion(GitWrapper gitWrapper, Quali
         final String currentMajorPattern = "v" + version.major() + ".*";
         final String previousMajorPattern = "v" + (version.major() - 1) + ".*";
 
-        return gitWrapper.listVersions(previousMajorPattern).filter(v -> v.isBefore(version));
+        return Stream.concat(gitWrapper.listVersions(currentMajorPattern), gitWrapper.listVersions(previousMajorPattern))
+            .filter(v -> v.isBefore(version));
     }
 
     /**

build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/ReleaseNotesGeneratorTest.java

@@ -13,7 +13,6 @@
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
@@ -91,8 +90,6 @@ public void testTemplate(String templateFilename, String outputFilename, List<Ch
         // when:
         final String actualOutput = ReleaseNotesGenerator.generateFile(template, bundles);
 
-        Files.write(Path.of("/Users/bseeders/output.txt"), actualOutput.getBytes());
-
         // then:
         assertThat(actualOutput, equalTo(expectedOutput));
     }