Merge branch '2.6.x' into 2.7.x

Closes gh-32097
spring-projects · Aug 17, 2022 · 1c6624d · 1c6624d
2 parents a912b72 + f7fba30
commit 1c6624d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Context.java b/...jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Context.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -55,7 +55,8 @@ class Context {
 	 * @param workingDir the working directory
 	 */
 	Context(File archiveFile, File workingDir) {
-		Assert.state(isExistingFile(archiveFile) && isJarOrWar(archiveFile), "Unable to find source archive");
+		Assert.state(isExistingFile(archiveFile), "Unable to find source archive");
+		Assert.state(isJarOrWar(archiveFile), "Source archive " + archiveFile + " must end with .jar or .war");
 		this.archiveFile = archiveFile;
 		this.workingDir = workingDir;
 		this.relativeDir = deduceRelativeDir(archiveFile.getParentFile(), this.workingDir);

diff --git a/...de-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ContextTests.java b/...de-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -55,7 +55,7 @@ void createWhenSourceIsNotJarOrWarThrowsException() throws Exception {
 		File zip = new File(this.temp, "test.zip");
 		Files.createFile(zip.toPath());
 		assertThatIllegalStateException().isThrownBy(() -> new Context(zip, this.temp))
-				.withMessage("Unable to find source archive");
+				.withMessageContaining("test.zip must end with .jar or .war");
 	}
 
 	@Test