diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java index 764a90a3585..d3fde163f9e 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java @@ -304,8 +304,6 @@ public class SpringBootPluginExtension { DIR(new Layouts.Expanded()), - @SuppressWarnings("deprecation") MODULE(new Layouts.Module()), - NONE(new Layouts.None()); Layout layout; diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/RepackageTask.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/RepackageTask.java index 9503925d128..435666cf0c8 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/RepackageTask.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/RepackageTask.java @@ -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()); diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java index 9901d3c9582..4070d79d41e 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java @@ -17,12 +17,9 @@ package org.springframework.boot.loader.tools; import java.io.File; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; /** * Common {@link Layout}s. @@ -156,40 +153,4 @@ public final class Layouts { } - /** - * Module layout (designed to be used as a "plug-in"). - * @deprecated since 1.5 in favour of a custom {@link LayoutFactory} - */ - @Deprecated - public static class Module implements Layout { - - private static final Set LIB_DESTINATION_SCOPES = new HashSet( - Arrays.asList(LibraryScope.COMPILE, LibraryScope.RUNTIME, - LibraryScope.CUSTOM)); - - @Override - public String getLauncherClassName() { - return null; - } - - @Override - public String getLibraryDestination(String libraryName, LibraryScope scope) { - if (LIB_DESTINATION_SCOPES.contains(scope)) { - return "lib/"; - } - return null; - } - - @Override - public String getClassesLocation() { - return ""; - } - - @Override - public boolean isExecutable() { - return false; - } - - } - } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java index 1dfd2467f06..1d1134a781e 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java @@ -86,18 +86,4 @@ public class LayoutsTests { .isEqualTo("WEB-INF/lib/"); } - @Test - @SuppressWarnings("deprecation") - public void moduleLayout() throws Exception { - Layout layout = new Layouts.Module(); - assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.COMPILE)) - .isEqualTo("lib/"); - assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.PROVIDED)) - .isNull(); - assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.RUNTIME)) - .isEqualTo("lib/"); - assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.CUSTOM)) - .isEqualTo("lib/"); - } - } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/module/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/module/pom.xml deleted file mode 100644 index 7c78404a8b7..00000000000 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/module/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - org.springframework.boot.maven.it - module - 0.0.1.BUILD-SNAPSHOT - - UTF-8 - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - repackage - - - MODULE - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - - - org.springframework - spring-context - @spring.version@ - - - javax.servlet - javax.servlet-api - @servlet-api.version@ - provided - - - diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/module/src/main/java/org/test/SampleModule.java b/spring-boot-tools/spring-boot-maven-plugin/src/it/module/src/main/java/org/test/SampleModule.java deleted file mode 100644 index 4bbeda77847..00000000000 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/module/src/main/java/org/test/SampleModule.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2012-2014 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 - * - * http://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 SampleModule { - -} diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/module/verify.groovy b/spring-boot-tools/spring-boot-maven-plugin/src/it/module/verify.groovy deleted file mode 100644 index 3f52437add1..00000000000 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/module/verify.groovy +++ /dev/null @@ -1,5 +0,0 @@ -import java.io.*; -import org.springframework.boot.maven.*; - -Verify.verifyModule(new File( basedir, "target/module-0.0.1.BUILD-SNAPSHOT.jar" )); - diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java index 5228e210a73..e73c0fedf3c 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java @@ -236,10 +236,6 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { repackager.setMainClass(this.mainClass); if (this.layout != null) { getLog().info("Layout: " + this.layout); - if (this.layout == LayoutType.MODULE) { - getLog().warn("Module layout is deprecated. Please use a custom" - + " LayoutFactory instead."); - } repackager.setLayout(this.layout.layout()); } return repackager; @@ -346,12 +342,6 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { */ DIR(new Layouts.Expanded()), - /** - * Module Layout. - * @deprecated since 1.5 in favour of a custom {@link LayoutFactory} - */ - @Deprecated MODULE(new Layouts.Module()), - /** * No Layout. */