root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Create a new layer for loader classes 

Create a dedicated layer that is used to hold the launcher support
classes. The layer sits between `dependencies` and
`snapshot-dependencies` so that the layer is sensible for both
SNAPSHOT and RELEASE versions of Spring Boot

Closes gh-20529
This commit is contained in:
Phillip Webb 2020-04-02 23:55:52 -07:00
parent 7bc7d86ad4
commit 3f806aa513
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarTests.java
View File

@ -100,7 +100,7 @@ class BootJarTests extends AbstractBootArchiveTests<TestBootJar> {
@Test @Test
void whenJarIsLayeredThenLayersIndexIsPresentAndListsLayersInOrder() throws IOException { void whenJarIsLayeredThenLayersIndexIsPresentAndListsLayersInOrder() throws IOException {
try (JarFile jarFile = new JarFile(createLayeredJar())) { try (JarFile jarFile = new JarFile(createLayeredJar())) {
assertThat(entryLines(jarFile, "BOOT-INF/layers.idx")).containsExactly("dependencies", assertThat(entryLines(jarFile, "BOOT-INF/layers.idx")).containsExactly("dependencies", "spring-boot-loader",
"snapshot-dependencies", "application"); "snapshot-dependencies", "application");
} }
} }

5
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/ImplicitLayerResolver.java
View File

@ -24,8 +24,13 @@ package org.springframework.boot.loader.tools;
*/ */
class ImplicitLayerResolver extends StandardLayers { class ImplicitLayerResolver extends StandardLayers {
private static final String SPRING_BOOT_LOADER_PREFIX = "org/springframework/boot/loader/";
@Override @Override
public Layer getLayer(String name) { public Layer getLayer(String name) {
if (name.startsWith(SPRING_BOOT_LOADER_PREFIX)) {
return SPRING_BOOT_LOADER;
}
return APPLICATION; return APPLICATION;
} }

6
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/StandardLayers.java
View File

@ -41,6 +41,11 @@ public abstract class StandardLayers implements Layers {
*/ */
public static final Layer DEPENDENCIES = new Layer("dependencies"); public static final Layer DEPENDENCIES = new Layer("dependencies");
/**
* The spring boot loader layer.
*/
public static final Layer SPRING_BOOT_LOADER = new Layer("spring-boot-loader");
/** /**
* The snapshot dependencies layer. * The snapshot dependencies layer.
*/ */
@ -55,6 +60,7 @@ public abstract class StandardLayers implements Layers {
static { static {
List<Layer> layers = new ArrayList<>(); List<Layer> layers = new ArrayList<>();
layers.add(DEPENDENCIES); layers.add(DEPENDENCIES);
layers.add(SPRING_BOOT_LOADER);
layers.add(SNAPSHOT_DEPENDENCIES); layers.add(SNAPSHOT_DEPENDENCIES);
layers.add(APPLICATION); layers.add(APPLICATION);
LAYERS = Collections.unmodifiableList(layers); LAYERS = Collections.unmodifiableList(layers);

4
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/ImplicitLayerResolverTests.java
View File

@ -34,8 +34,8 @@ class ImplicitLayerResolverTests {
@Test @Test
void iteratorReturnsLayers() { void iteratorReturnsLayers() {
assertThat(this.layers).containsExactly(StandardLayers.DEPENDENCIES, StandardLayers.SNAPSHOT_DEPENDENCIES, assertThat(this.layers).containsExactly(StandardLayers.DEPENDENCIES, StandardLayers.SPRING_BOOT_LOADER,
StandardLayers.APPLICATION); StandardLayers.SNAPSHOT_DEPENDENCIES, StandardLayers.APPLICATION);
} }
@Test @Test