Detect backup jar when the package lifecycle is forked

Previously, if a classifier was set and build-image was executed from
the command-line, the build will fail as the plugin was unable to find
the original jar. This is because it relies on the attached artifacts
of the project, and those are not set when package has run as part of
a forked lifecycle.

This commit makes sure that the backup file is found by convention
first, the same way it is done for the target file.

Closes spring-projectsgh-26721

Author: snicoll

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java

@@ -96,7 +96,7 @@ void whenBuildImageIsInvokedOnTheCommandLineWithoutRepackageTheArchiveIsRepackag
 	}
 
 	@TestTemplate
-	void whenBuildImageIsInvokedWithClassifierWithoutRepackageTheArchiveIsRepackagedOnTheFly(MavenBuild mavenBuild) {
+	void whenPackageIsInvokedWithClassifierTheOriginalArchiveIsFound(MavenBuild mavenBuild) {
 		mavenBuild.project("dockerTest", "build-image-classifier")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
@@ -115,6 +115,26 @@ void whenBuildImageIsInvokedWithClassifierWithoutRepackageTheArchiveIsRepackaged
 			});
 	}
 
+	@TestTemplate
+	void whenBuildImageIsInvokedWithClassifierWithoutRepackageTheOriginalArchiveIsFound(MavenBuild mavenBuild) {
+		mavenBuild.project("dockerTest", "build-image-fork-classifier")
+			.goals("spring-boot:build-image")
+			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
+			.prepare(this::writeLongNameResource)
+			.execute((project) -> {
+				File jar = new File(project, "target/build-image-fork-classifier-0.0.1.BUILD-SNAPSHOT.jar");
+				assertThat(jar).isFile();
+				File classifier = new File(project, "target/build-image-fork-classifier-0.0.1.BUILD-SNAPSHOT-test.jar");
+				assertThat(classifier).doesNotExist();
+				assertThat(buildLog(project)).contains("Building image")
+					.contains("docker.io/library/build-image--fork-classifier:0.0.1.BUILD-SNAPSHOT")
+					.contains("---> Test Info buildpack building")
+					.contains("---> Test Info buildpack done")
+					.contains("Successfully built image");
+				removeImage("build-image-fork-classifier", "0.0.1.BUILD-SNAPSHOT");
+			});
+	}
+
 	@TestTemplate
 	void whenBuildImageIsInvokedWithClassifierSourceWithoutRepackageTheArchiveIsRepackagedOnTheFly(
 			MavenBuild mavenBuild) {

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-fork-classifier/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework.boot.maven.it</groupId>
+	<artifactId>build-image-fork-classifier</artifactId>
+	<version>0.0.1.BUILD-SNAPSHOT</version>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>@java.version@</maven.compiler.source>
+		<maven.compiler.target>@java.version@</maven.compiler.target>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>@project.groupId@</groupId>
+				<artifactId>@project.artifactId@</artifactId>
+				<version>@project.version@</version>
+				<configuration>
+					<classifier>exec</classifier>
+					<image>
+						<builder>ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1</builder>
+					</image>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-fork-classifier/src/main/java/org/test/SampleApplication.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed 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
+ *
+ *      https://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.
+ */
+
+package org.test;
+
+public class SampleApplication {
+
+	public static void main(String[] args) throws Exception {
+		System.out.println("Launched");
+		synchronized(args) {
+			args.wait(); // Prevent exit"
+		}
+	}
+
+}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java

@@ -298,8 +298,8 @@ private TarArchive getApplicationContent(Owner owner, Libraries libraries, Image
 	}
 
 	private File getArchiveFile() {
-		// We can use 'project.getArtifact().getFile()' because that was done in a
-		// forked lifecycle and is now null
+		// We can't use 'project.getArtifact().getFile()' because package can be done in a
+		// forked lifecycle and will be null
 		File archiveFile = getTargetFile(this.finalName, this.classifier, this.sourceDirectory);
 		if (!archiveFile.exists()) {
 			archiveFile = getSourceArtifact(this.classifier).getFile();
@@ -315,9 +315,17 @@ private File getArchiveFile() {
 	 * @return the file to use to back up the original source
 	 */
 	private File getBackupFile() {
-		Artifact source = getSourceArtifact(null);
-		if (this.classifier != null && !this.classifier.equals(source.getClassifier())) {
-			return source.getFile();
+		// We can't use 'project.getAttachedArtifacts()' because package can be done in a
+		// forked lifecycle and will be null
+		if (this.classifier != null) {
+			File backupFile = getTargetFile(this.finalName, null, this.sourceDirectory);
+			if (backupFile.exists()) {
+				return backupFile;
+			}
+			Artifact source = getSourceArtifact(null);
+			if (!this.classifier.equals(source.getClassifier())) {
+				return source.getFile();
+			}
 		}
 		return null;
 	}