mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Align Gradle's plugin's META-INF repackaging with Maven plugin's
Closes gh-28562
This commit is contained in:
parent
c46b45a1e3
commit
c3eee4ad68
@ -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.
|
||||
@ -182,6 +182,15 @@ class BootArchiveSupport {
|
||||
spec.filesMatching("module-info.class", BootArchiveSupport::moveToRoot);
|
||||
}
|
||||
|
||||
void moveMetaInfToRoot(CopySpec spec) {
|
||||
spec.eachFile((file) -> {
|
||||
String path = file.getRelativeSourcePath().getPathString();
|
||||
if (path.startsWith("META-INF/") && !path.equals("META-INF/aop.xml") && !path.endsWith(".kotlin_module")) {
|
||||
moveToRoot(file);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static void moveToRoot(FileCopyDetails details) {
|
||||
details.setRelativePath(details.getRelativeSourcePath());
|
||||
}
|
||||
|
@ -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.
|
||||
@ -91,8 +91,8 @@ public class BootJar extends Jar implements BootArchive {
|
||||
private void configureBootInfSpec(CopySpec bootInfSpec) {
|
||||
bootInfSpec.into("classes", fromCallTo(this::classpathDirectories));
|
||||
bootInfSpec.into("lib", fromCallTo(this::classpathFiles)).eachFile(this.support::excludeNonZipFiles);
|
||||
bootInfSpec.filesMatching("module-info.class",
|
||||
(details) -> details.setRelativePath(details.getRelativeSourcePath()));
|
||||
this.support.moveModuleInfoToRoot(bootInfSpec);
|
||||
this.support.moveMetaInfToRoot(bootInfSpec);
|
||||
}
|
||||
|
||||
private Iterable<File> classpathDirectories() {
|
||||
|
@ -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.
|
||||
@ -74,6 +74,7 @@ public class BootWar extends War implements BootArchive {
|
||||
this.mainClass = project.getObjects().property(String.class);
|
||||
getWebInf().into("lib-provided", fromCallTo(this::getProvidedLibFiles));
|
||||
this.support.moveModuleInfoToRoot(getRootSpec());
|
||||
this.support.moveMetaInfToRoot(getRootSpec());
|
||||
getRootSpec().eachFile(this.support::excludeNonZipLibraryFiles);
|
||||
project.getConfigurations().all((configuration) -> {
|
||||
ResolvableDependencies incoming = configuration.getIncoming();
|
||||
|
@ -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.
|
||||
@ -185,6 +185,66 @@ abstract class AbstractBootArchiveTests<T extends Jar & BootArchive> {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void metaInfEntryIsPackagedInTheRootOfTheArchive() throws IOException {
|
||||
this.task.getMainClass().set("com.example.Main");
|
||||
File classpathDirectory = new File(this.temp, "classes");
|
||||
File metaInfEntry = new File(classpathDirectory, "META-INF/test");
|
||||
metaInfEntry.getParentFile().mkdirs();
|
||||
metaInfEntry.createNewFile();
|
||||
File applicationClass = new File(classpathDirectory, "com/example/Application.class");
|
||||
applicationClass.getParentFile().mkdirs();
|
||||
applicationClass.createNewFile();
|
||||
this.task.classpath(classpathDirectory);
|
||||
executeTask();
|
||||
try (JarFile jarFile = new JarFile(this.task.getArchiveFile().get().getAsFile())) {
|
||||
assertThat(jarFile.getEntry(this.classesPath + "com/example/Application.class")).isNotNull();
|
||||
assertThat(jarFile.getEntry("com/example/Application.class")).isNull();
|
||||
assertThat(jarFile.getEntry(this.classesPath + "META-INF/test")).isNull();
|
||||
assertThat(jarFile.getEntry("META-INF/test")).isNotNull();
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void aopXmlIsPackagedBeneathClassesDirectory() throws IOException {
|
||||
this.task.getMainClass().set("com.example.Main");
|
||||
File classpathDirectory = new File(this.temp, "classes");
|
||||
File aopXml = new File(classpathDirectory, "META-INF/aop.xml");
|
||||
aopXml.getParentFile().mkdirs();
|
||||
aopXml.createNewFile();
|
||||
File applicationClass = new File(classpathDirectory, "com/example/Application.class");
|
||||
applicationClass.getParentFile().mkdirs();
|
||||
applicationClass.createNewFile();
|
||||
this.task.classpath(classpathDirectory);
|
||||
executeTask();
|
||||
try (JarFile jarFile = new JarFile(this.task.getArchiveFile().get().getAsFile())) {
|
||||
assertThat(jarFile.getEntry(this.classesPath + "com/example/Application.class")).isNotNull();
|
||||
assertThat(jarFile.getEntry("com/example/Application.class")).isNull();
|
||||
assertThat(jarFile.getEntry(this.classesPath + "META-INF/aop.xml")).isNotNull();
|
||||
assertThat(jarFile.getEntry("META-INF/aop.xml")).isNull();
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void kotlinModuleIsPackagedBeneathClassesDirectory() throws IOException {
|
||||
this.task.getMainClass().set("com.example.Main");
|
||||
File classpathDirectory = new File(this.temp, "classes");
|
||||
File kotlinModule = new File(classpathDirectory, "META-INF/example.kotlin_module");
|
||||
kotlinModule.getParentFile().mkdirs();
|
||||
kotlinModule.createNewFile();
|
||||
File applicationClass = new File(classpathDirectory, "com/example/Application.class");
|
||||
applicationClass.getParentFile().mkdirs();
|
||||
applicationClass.createNewFile();
|
||||
this.task.classpath(classpathDirectory);
|
||||
executeTask();
|
||||
try (JarFile jarFile = new JarFile(this.task.getArchiveFile().get().getAsFile())) {
|
||||
assertThat(jarFile.getEntry(this.classesPath + "com/example/Application.class")).isNotNull();
|
||||
assertThat(jarFile.getEntry("com/example/Application.class")).isNull();
|
||||
assertThat(jarFile.getEntry(this.classesPath + "META-INF/example.kotlin_module")).isNotNull();
|
||||
assertThat(jarFile.getEntry("META-INF/example.kotlin_module")).isNull();
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void classpathCanBeSetUsingAFileCollection() throws IOException {
|
||||
this.task.getMainClass().set("com.example.Main");
|
||||
|
Loading…
Reference in New Issue
Block a user