Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove support for module layout

Browse Source 
Closes gh-8107
This commit is contained in:
Andy Wilkinson
2017-01-25 16:49:37 +00:00
parent 3ce6d8e5b5
commit bdf903896f
8 changed files with 0 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java
View File

@@ -304,8 +304,6 @@ public class SpringBootPluginExtension {
DIR(new Layouts.Expanded()),
@SuppressWarnings("deprecation") MODULE(new Layouts.Module()),
NONE(new Layouts.None());
Layout layout;

6
spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/RepackageTask.java
View File

@@ -34,7 +34,6 @@ import org.springframework.boot.gradle.SpringBootPluginExtension;
import org.springframework.boot.loader.tools.DefaultLaunchScript;
import org.springframework.boot.loader.tools.LaunchScript;
import org.springframework.boot.loader.tools.Layout;
import org.springframework.boot.loader.tools.Layouts;
import org.springframework.boot.loader.tools.Repackager;
import org.springframework.boot.loader.tools.Repackager.MainClassTimeoutWarningListener;
import org.springframework.util.FileCopyUtils;
@@ -209,7 +208,6 @@ public class RepackageTask extends DefaultTask {
return task.equals(withJarTask) || task.getName().equals(withJarTask);
}
@SuppressWarnings("deprecation")
private void repackage(File file) {
File outputFile = RepackageTask.this.outputFile;
if (outputFile != null && !file.equals(outputFile)) {
@@ -223,10 +221,6 @@ public class RepackageTask extends DefaultTask {
setMainClass(repackager);
Layout layout = this.extension.convertLayout();
if (layout != null) {
if (layout instanceof Layouts.Module) {
getLogger().warn("Module layout is deprecated. Please use a custom"
+ " LayoutFactory instead.");
}
repackager.setLayout(layout);
}
repackager.setBackupSource(this.extension.isBackupSource());