diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/JarWriter.java b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java similarity index 99% rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/JarWriter.java rename to spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java index 35da12eae83..8636d2a4748 100644 --- a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/JarWriter.java +++ b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Layout.java b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java similarity index 96% rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Layout.java rename to spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java index d52db093432..d2e5a78bef0 100644 --- a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Layout.java +++ b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; /** * Strategy interface used to determine the layout for a particular type of archive. diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Layouts.java b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java similarity index 98% rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Layouts.java rename to spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java index f6c1693da68..b3e2d3becf8 100644 --- a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Layouts.java +++ b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; import java.io.File; import java.util.Collections; diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Libraries.java b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java similarity index 95% rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Libraries.java rename to spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java index c1c2ab1372f..36573458a2f 100644 --- a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Libraries.java +++ b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Libraries.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; import java.io.IOException; diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/LibraryCallback.java b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryCallback.java similarity index 95% rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/LibraryCallback.java rename to spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryCallback.java index 3e621fd0024..7b2bdd4caa1 100644 --- a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/LibraryCallback.java +++ b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; import java.io.File; import java.io.IOException; diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/LibraryScope.java b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java similarity index 96% rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/LibraryScope.java rename to spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java index 9021a679d93..510d20c4979 100644 --- a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/LibraryScope.java +++ b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; /** * The scope of a library. The common {@link #COMPILE}, {@link #RUNTIME} and diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/MainClassFinder.java b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java similarity index 99% rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/MainClassFinder.java rename to spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java index c555aa1d102..3ecadc6cca7 100644 --- a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/MainClassFinder.java +++ b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; import java.io.BufferedInputStream; import java.io.File; diff --git a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Repackager.java b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java similarity index 99% rename from spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Repackager.java rename to spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java index c4b2741d205..48a06589cb8 100644 --- a/spring-boot-loader-tools/src/main/java/org/springframework/boot/launcher/tools/Repackager.java +++ b/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; import java.io.File; import java.io.IOException; diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/LayoutsTests.java b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java similarity index 93% rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/LayoutsTests.java rename to spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java index c68b1d63264..242aa52c53c 100644 --- a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/LayoutsTests.java +++ b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java @@ -14,13 +14,16 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; import java.io.File; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.loader.tools.Layout; +import org.springframework.boot.loader.tools.Layouts; +import org.springframework.boot.loader.tools.LibraryScope; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/MainClassFinderTests.java b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java similarity index 93% rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/MainClassFinderTests.java rename to spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java index a1d881acb59..80dde5db220 100644 --- a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/MainClassFinderTests.java +++ b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; import java.io.IOException; @@ -22,8 +22,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.launcher.tools.sample.ClassWithMainMethod; -import org.springframework.boot.launcher.tools.sample.ClassWithoutMainMethod; +import org.springframework.boot.loader.tools.MainClassFinder; +import org.springframework.boot.loader.tools.sample.ClassWithMainMethod; +import org.springframework.boot.loader.tools.sample.ClassWithoutMainMethod; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/RepackagerTests.java b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java similarity index 95% rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/RepackagerTests.java rename to spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java index 7ba3e65263b..835f798d7cb 100644 --- a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/RepackagerTests.java +++ b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; import java.io.File; import java.io.IOException; @@ -27,8 +27,13 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.launcher.tools.sample.ClassWithMainMethod; -import org.springframework.boot.launcher.tools.sample.ClassWithoutMainMethod; +import org.springframework.boot.loader.tools.Layout; +import org.springframework.boot.loader.tools.Libraries; +import org.springframework.boot.loader.tools.LibraryCallback; +import org.springframework.boot.loader.tools.LibraryScope; +import org.springframework.boot.loader.tools.Repackager; +import org.springframework.boot.loader.tools.sample.ClassWithMainMethod; +import org.springframework.boot.loader.tools.sample.ClassWithoutMainMethod; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/TestJarFile.java b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/TestJarFile.java similarity index 98% rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/TestJarFile.java rename to spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/TestJarFile.java index 7a5e7684786..7e42d96fefd 100644 --- a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/TestJarFile.java +++ b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/TestJarFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools; +package org.springframework.boot.loader.tools; import java.io.File; import java.io.FileInputStream; diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/sample/ClassWithMainMethod.java b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithMainMethod.java similarity index 93% rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/sample/ClassWithMainMethod.java rename to spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithMainMethod.java index 0cafd06ece8..ad10be69eed 100644 --- a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/sample/ClassWithMainMethod.java +++ b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithMainMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools.sample; +package org.springframework.boot.loader.tools.sample; /** * Sample class with a main method. diff --git a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/sample/ClassWithoutMainMethod.java b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithoutMainMethod.java similarity index 92% rename from spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/sample/ClassWithoutMainMethod.java rename to spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithoutMainMethod.java index aef26e24174..3944c13f34d 100644 --- a/spring-boot-loader-tools/src/test/java/org/springframework/boot/launcher/tools/sample/ClassWithoutMainMethod.java +++ b/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/sample/ClassWithoutMainMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.launcher.tools.sample; +package org.springframework.boot.loader.tools.sample; /** * Sample class without a main method. diff --git a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java index 9e49f51b079..b90cc65cfa6 100644 --- a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java +++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java @@ -23,9 +23,9 @@ import java.util.Map; import java.util.Set; import org.apache.maven.artifact.Artifact; -import org.springframework.boot.launcher.tools.Libraries; -import org.springframework.boot.launcher.tools.LibraryCallback; -import org.springframework.boot.launcher.tools.LibraryScope; +import org.springframework.boot.loader.tools.Libraries; +import org.springframework.boot.loader.tools.LibraryCallback; +import org.springframework.boot.loader.tools.LibraryScope; /** * {@link Libraries} backed by Maven {@link Artifact}s diff --git a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java index 54d5b1b6438..a5770f1649d 100644 --- a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java +++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java @@ -29,8 +29,8 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; -import org.springframework.boot.launcher.tools.Libraries; -import org.springframework.boot.launcher.tools.Repackager; +import org.springframework.boot.loader.tools.Libraries; +import org.springframework.boot.loader.tools.Repackager; /** * MOJO that can can be used to repackage existing JAR and WAR archives so that they can diff --git a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java index 0b9869dc8e4..6953e646e48 100644 --- a/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java +++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java @@ -35,7 +35,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; -import org.springframework.boot.launcher.tools.MainClassFinder; +import org.springframework.boot.loader.tools.MainClassFinder; /** * MOJO that can be used to run a executable archive application directly from Maven.