From 71ce212f7fe8e4f6c017a2191e63fee32998b463 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 22 Jan 2020 20:23:04 -0800 Subject: [PATCH] Rename spring-boot-layertools Rename `spring-boot-layertools` to `spring-boot-jarmode-layertools`. Closes gh-19853 --- settings.gradle | 2 +- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../build.gradle | 0 .../springframework/boot/jarmode}/layertools/Command.java | 2 +- .../springframework/boot/jarmode}/layertools/Context.java | 2 +- .../boot/jarmode}/layertools/ExtractCommand.java | 2 +- .../boot/jarmode}/layertools/HelpCommand.java | 2 +- .../boot/jarmode}/layertools/ImplicitLayers.java | 2 +- .../boot/jarmode}/layertools/IndexedLayers.java | 2 +- .../boot/jarmode}/layertools/LayerToolsJarMode.java | 2 +- .../springframework/boot/jarmode}/layertools/Layers.java | 2 +- .../boot/jarmode}/layertools/ListCommand.java | 2 +- .../boot/jarmode}/layertools/package-info.java | 2 +- .../src/main/resources/META-INF/spring.factories | 2 ++ .../boot/jarmode}/layertools/CommandTests.java | 8 ++++---- .../boot/jarmode}/layertools/ContextTests.java | 2 +- .../boot/jarmode}/layertools/ExtractCommandTests.java | 2 +- .../boot/jarmode}/layertools/HelpCommandTests.java | 2 +- .../boot/jarmode}/layertools/ImplicitLayersTests.java | 2 +- .../boot/jarmode}/layertools/IndexedLayersTests.java | 2 +- .../boot/jarmode}/layertools/LayerToolsJarModeTests.java | 2 +- .../boot/jarmode}/layertools/ListCommandTests.java | 2 +- .../boot/jarmode}/layertools/TestPrintStream.java | 4 ++-- .../boot/jarmode}/layertools/help-extract-output.txt | 0 .../boot/jarmode}/layertools/help-output.txt | 0 .../boot/jarmode}/layertools/list-output.txt | 0 .../src/main/resources/META-INF/spring.factories | 2 -- 27 files changed, 27 insertions(+), 27 deletions(-) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools => spring-boot-jarmode-layertools}/build.gradle (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/main/java/org/springframework/boot => spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode}/layertools/Command.java (99%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/main/java/org/springframework/boot => spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode}/layertools/Context.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/main/java/org/springframework/boot => spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode}/layertools/ExtractCommand.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/main/java/org/springframework/boot => spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode}/layertools/HelpCommand.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/main/java/org/springframework/boot => spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode}/layertools/ImplicitLayers.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/main/java/org/springframework/boot => spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode}/layertools/IndexedLayers.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/main/java/org/springframework/boot => spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode}/layertools/LayerToolsJarMode.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/main/java/org/springframework/boot => spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode}/layertools/Layers.java (96%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/main/java/org/springframework/boot => spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode}/layertools/ListCommand.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/main/java/org/springframework/boot => spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode}/layertools/package-info.java (92%) create mode 100644 spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/resources/META-INF/spring.factories rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/java/org/springframework/boot => spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode}/layertools/CommandTests.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/java/org/springframework/boot => spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode}/layertools/ContextTests.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/java/org/springframework/boot => spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode}/layertools/ExtractCommandTests.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/java/org/springframework/boot => spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode}/layertools/HelpCommandTests.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/java/org/springframework/boot => spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode}/layertools/ImplicitLayersTests.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/java/org/springframework/boot => spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode}/layertools/IndexedLayersTests.java (98%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/java/org/springframework/boot => spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode}/layertools/LayerToolsJarModeTests.java (97%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/java/org/springframework/boot => spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode}/layertools/ListCommandTests.java (95%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/java/org/springframework/boot => spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode}/layertools/TestPrintStream.java (93%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/resources/org/springframework/boot => spring-boot-jarmode-layertools/src/test/resources/org/springframework/boot/jarmode}/layertools/help-extract-output.txt (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/resources/org/springframework/boot => spring-boot-jarmode-layertools/src/test/resources/org/springframework/boot/jarmode}/layertools/help-output.txt (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-layertools/src/test/resources/org/springframework/boot => spring-boot-jarmode-layertools/src/test/resources/org/springframework/boot/jarmode}/layertools/list-output.txt (100%) delete mode 100644 spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/resources/META-INF/spring.factories diff --git a/settings.gradle b/settings.gradle index 19dc4eecfd..ab3c1f67cf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -45,7 +45,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform" include "spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata" include "spring-boot-project:spring-boot-tools:spring-boot-configuration-processor" include "spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin" -include "spring-boot-project:spring-boot-tools:spring-boot-layertools" +include "spring-boot-project:spring-boot-tools:spring-boot-jarmode-layertools" include "spring-boot-project:spring-boot-tools:spring-boot-loader" include "spring-boot-project:spring-boot-tools:spring-boot-loader-tools" include "spring-boot-project:spring-boot-tools:spring-boot-maven-plugin" diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 388f550a50..3c26f7fe46 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1425,7 +1425,7 @@ bom { "spring-boot-configuration-metadata", "spring-boot-configuration-processor", "spring-boot-devtools", - "spring-boot-layertools", + "spring-boot-jarmode-layertools", "spring-boot-loader", "spring-boot-loader-tools", "spring-boot-properties-migrator", diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/build.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/build.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/build.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/Command.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Command.java similarity index 99% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/Command.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Command.java index 49623002fe..affa16ef59 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/Command.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Command.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.util.ArrayList; import java.util.Arrays; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/Context.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Context.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/Context.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Context.java index 8995e305dc..9b6edf3b45 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/Context.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Context.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.io.File; import java.nio.file.Paths; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/ExtractCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/ExtractCommand.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/ExtractCommand.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/ExtractCommand.java index 67b8dfc20c..eeee906400 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/ExtractCommand.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/ExtractCommand.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.io.File; import java.io.FileInputStream; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/HelpCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/HelpCommand.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/HelpCommand.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/HelpCommand.java index 29aa98ef66..20444bd9db 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/HelpCommand.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/HelpCommand.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.io.PrintStream; import java.util.List; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/ImplicitLayers.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/ImplicitLayers.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/ImplicitLayers.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/ImplicitLayers.java index c709d0445e..2bd9abb693 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/ImplicitLayers.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/ImplicitLayers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/IndexedLayers.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/IndexedLayers.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/IndexedLayers.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/IndexedLayers.java index 60c404bb1f..6b5f5a384a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/IndexedLayers.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/IndexedLayers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/LayerToolsJarMode.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/LayerToolsJarMode.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/LayerToolsJarMode.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/LayerToolsJarMode.java index 4c74fd250b..55ac681f02 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/LayerToolsJarMode.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/LayerToolsJarMode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/Layers.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Layers.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/Layers.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Layers.java index 273b643056..9b2a7523d1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/Layers.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/Layers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.util.Iterator; import java.util.zip.ZipEntry; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/ListCommand.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/ListCommand.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/ListCommand.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/ListCommand.java index 4a84cd847f..fb02b7c53f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/ListCommand.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/ListCommand.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.io.PrintStream; import java.util.List; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/package-info.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/package-info.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/package-info.java index 454880d431..dff2cc4357 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/package-info.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/package-info.java @@ -17,4 +17,4 @@ /** * JarMode support for layertools. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000000..c1d47013e0 --- /dev/null +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.loader.jarmode.JarMode=\ +org.springframework.boot.jarmode.layertools.LayerToolsJarMode \ No newline at end of file diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/CommandTests.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/CommandTests.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/CommandTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/CommandTests.java index 9b4f3eb987..a7c353e55b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/CommandTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/CommandTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.util.ArrayDeque; import java.util.Arrays; @@ -24,9 +24,9 @@ import java.util.Map; import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.Test; -import org.springframework.boot.layertools.Command.Option; -import org.springframework.boot.layertools.Command.Options; -import org.springframework.boot.layertools.Command.Parameters; +import org.springframework.boot.jarmode.layertools.Command.Option; +import org.springframework.boot.jarmode.layertools.Command.Options; +import org.springframework.boot.jarmode.layertools.Command.Parameters; import static org.assertj.core.api.Assertions.as; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ContextTests.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ContextTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ContextTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ContextTests.java index 7306f2f064..2a3f824300 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ContextTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ContextTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.io.File; import java.io.IOException; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ExtractCommandTests.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ExtractCommandTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ExtractCommandTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ExtractCommandTests.java index a2747aca2a..cc0a9e2372 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ExtractCommandTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ExtractCommandTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.io.File; import java.io.FileOutputStream; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/HelpCommandTests.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/HelpCommandTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/HelpCommandTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/HelpCommandTests.java index 6db3a94805..8dd508416c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/HelpCommandTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/HelpCommandTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.io.File; import java.util.Arrays; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ImplicitLayersTests.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ImplicitLayersTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ImplicitLayersTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ImplicitLayersTests.java index 82c0836f49..ebc5771d73 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ImplicitLayersTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ImplicitLayersTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.util.zip.ZipEntry; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/IndexedLayersTests.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/IndexedLayersTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/IndexedLayersTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/IndexedLayersTests.java index 7f8c8674d4..ac4d668ec7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/IndexedLayersTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/IndexedLayersTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.util.zip.ZipEntry; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/LayerToolsJarModeTests.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/LayerToolsJarModeTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/LayerToolsJarModeTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/LayerToolsJarModeTests.java index 197bdddc36..ba0cc1828a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/LayerToolsJarModeTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/LayerToolsJarModeTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.io.File; import java.io.PrintStream; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ListCommandTests.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ListCommandTests.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ListCommandTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ListCommandTests.java index 09af216f29..1f31f7f250 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/ListCommandTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/ListCommandTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/TestPrintStream.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/TestPrintStream.java similarity index 93% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/TestPrintStream.java rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/TestPrintStream.java index 31eb1acb11..2f116f32a3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/java/org/springframework/boot/layertools/TestPrintStream.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/TestPrintStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.layertools; +package org.springframework.boot.jarmode.layertools; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,7 +27,7 @@ import org.assertj.core.api.AbstractAssert; import org.assertj.core.api.AssertProvider; import org.assertj.core.api.Assertions; -import org.springframework.boot.layertools.TestPrintStream.PrintStreamAssert; +import org.springframework.boot.jarmode.layertools.TestPrintStream.PrintStreamAssert; import org.springframework.util.FileCopyUtils; /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/resources/org/springframework/boot/layertools/help-extract-output.txt b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/resources/org/springframework/boot/jarmode/layertools/help-extract-output.txt similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/resources/org/springframework/boot/layertools/help-extract-output.txt rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/resources/org/springframework/boot/jarmode/layertools/help-extract-output.txt diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/resources/org/springframework/boot/layertools/help-output.txt b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/resources/org/springframework/boot/jarmode/layertools/help-output.txt similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/resources/org/springframework/boot/layertools/help-output.txt rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/resources/org/springframework/boot/jarmode/layertools/help-output.txt diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/resources/org/springframework/boot/layertools/list-output.txt b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/resources/org/springframework/boot/jarmode/layertools/list-output.txt similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-layertools/src/test/resources/org/springframework/boot/layertools/list-output.txt rename to spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/resources/org/springframework/boot/jarmode/layertools/list-output.txt diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 5535966c48..0000000000 --- a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.loader.jarmode.JarMode=\ -org.springframework.boot.layertools.LayerToolsJarMode \ No newline at end of file