From 89b0ba2c14a43a26fa01d6b258225a8bf27f8ade Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 28 Sep 2017 22:52:53 -0700 Subject: [PATCH] Relocate test projects under `spring-boot-tests` Move integration and deployment tests under a single `spring-boot-tests` module. See gh-9316 --- .../spring-boot-deployment-tests}/pom.xml | 0 .../spring-boot-deployment-test-glassfish/pom.xml | 0 .../src/main/java/sample/SampleController.java | 0 .../src/main/java/sample/SampleGlassfishDeployApplication.java | 0 .../src/main/webapp/WEB-INF/glassfish-web.xml | 0 .../src/test/java/sample/SampleGlassfishDeployApplicationIT.java | 0 .../spring-boot-deployment-test-tomcat/pom.xml | 0 .../src/main/java/sample/SampleController.java | 0 .../src/main/java/sample/SampleTomcatDeployApplication.java | 0 .../src/test/java/sample/SampleTomcatDeployApplicationIT.java | 0 .../spring-boot-deployment-test-tomee/pom.xml | 0 .../src/main/java/sample/SampleController.java | 0 .../src/main/java/sample/SampleTomEEDeployApplication.java | 0 .../src/test/java/sample/SampleTomEEDeployApplicationIT.java | 0 .../spring-boot-deployment-test-wildfly/pom.xml | 0 .../src/main/java/sample/SampleController.java | 0 .../src/main/java/sample/SampleWildFlyDeployApplication.java | 0 .../src/main/webapp/WEB-INF/jboss-deployment-structure.xml | 0 .../src/test/java/sample/SampleWildFlyDeployApplicationIT.java | 0 .../spring-boot-deployment-test-wlp/pom.xml | 0 .../src/main/java/sample/SampleController.java | 0 .../src/main/java/sample/SampleWlpDeployApplication.java | 0 .../src/test/java/sample/SampleWlpDeployApplicationIT.java | 0 .../spring-boot-integration-tests}/pom.xml | 0 .../spring-boot-devtools-tests/pom.xml | 0 .../src/test/java/com/example/ControllerOne.java | 0 .../src/test/java/com/example/DevToolsTestApplication.java | 0 .../springframework/boot/devtools/tests/ApplicationLauncher.java | 0 .../boot/devtools/tests/DevToolsIntegrationTests.java | 0 .../boot/devtools/tests/ExplodedRemoteApplicationLauncher.java | 0 .../boot/devtools/tests/JarFileRemoteApplicationLauncher.java | 0 .../java/org/springframework/boot/devtools/tests/JvmLauncher.java | 0 .../springframework/boot/devtools/tests/LaunchedApplication.java | 0 .../boot/devtools/tests/LocalApplicationLauncher.java | 0 .../boot/devtools/tests/RemoteApplicationLauncher.java | 0 .../pom.xml | 0 .../src/test/java/com/example/ResourceHandlingApplication.java | 0 .../boot/context/embedded/AbstractApplicationLauncher.java | 0 .../AbstractEmbeddedServletContainerIntegrationTests.java | 0 .../springframework/boot/context/embedded/ApplicationBuilder.java | 0 .../boot/context/embedded/BootRunApplicationLauncher.java | 0 .../EmbeddedServletContainerJarDevelopmentIntegrationTests.java | 0 .../EmbeddedServletContainerJarPackagingIntegrationTests.java | 0 .../EmbeddedServletContainerWarDevelopmentIntegrationTests.java | 0 .../EmbeddedServletContainerWarPackagingIntegrationTests.java | 0 .../boot/context/embedded/ExplodedApplicationLauncher.java | 0 .../boot/context/embedded/IdeApplicationLauncher.java | 0 .../boot/context/embedded/PackagedApplicationLauncher.java | 0 .../java/org/springframework/boot/context/embedded/Versions.java | 0 .../src/test/resources/pom-template.xml | 0 .../spring-boot-launch-script-tests/README.adoc | 0 .../spring-boot-launch-script-tests/pom.xml | 0 .../boot/launchscript/LaunchScriptTestApplication.java | 0 .../boot/launchscript/LaunchVerificationController.java | 0 .../springframework/boot/launchscript/SysVinitLaunchScriptIT.java | 0 .../src/test/resources/conf/CentOS/6.9-a23bced6/Dockerfile | 0 .../src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile | 0 .../src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile | 0 .../src/test/resources/logback.xml | 0 .../src/test/resources/scripts/basic-launch.sh | 0 .../src/test/resources/scripts/force-stop-when-stopped.sh | 0 .../resources/scripts/launch-with-double-link-single-java-opt.sh | 0 .../scripts/launch-with-multiple-command-line-arguments.sh | 0 .../src/test/resources/scripts/launch-with-multiple-java-opts.sh | 0 .../src/test/resources/scripts/launch-with-multiple-run-args.sh | 0 .../src/test/resources/scripts/launch-with-relative-log-folder.sh | 0 .../src/test/resources/scripts/launch-with-relative-pid-folder.sh | 0 .../resources/scripts/launch-with-single-command-line-argument.sh | 0 .../src/test/resources/scripts/launch-with-single-java-opt.sh | 0 .../src/test/resources/scripts/launch-with-single-run-arg.sh | 0 .../scripts/launch-with-use-of-start-stop-daemon-disabled.sh | 0 .../src/test/resources/scripts/restart-when-started.sh | 0 .../src/test/resources/scripts/restart-when-stopped.sh | 0 .../src/test/resources/scripts/start-when-started.sh | 0 .../src/test/resources/scripts/start-when-stopped.sh | 0 .../src/test/resources/scripts/status-when-killed.sh | 0 .../src/test/resources/scripts/status-when-started.sh | 0 .../src/test/resources/scripts/status-when-stopped.sh | 0 .../src/test/resources/scripts/stop-when-stopped.sh | 0 .../src/test/resources/scripts/test-functions.sh | 0 .../spring-boot-security-tests/pom.xml | 0 .../spring-boot-security-test-web-helloworld/pom.xml | 0 .../src/main/java/sample/HelloWebSecurityApplication.java | 0 .../src/test/java/sample/HelloWebSecurityApplicationTests.java | 0 .../spring-boot-integration-tests}/src/it/settings.xml | 0 85 files changed, 0 insertions(+), 0 deletions(-) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/pom.xml (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-glassfish/pom.xml (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-glassfish/src/main/java/sample/SampleController.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-glassfish/src/main/java/sample/SampleGlassfishDeployApplication.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-tomcat/pom.xml (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-tomcat/src/main/java/sample/SampleController.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-tomcat/src/main/java/sample/SampleTomcatDeployApplication.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-tomee/pom.xml (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-tomee/src/main/java/sample/SampleController.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-tomee/src/main/java/sample/SampleTomEEDeployApplication.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-wildfly/pom.xml (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-wildfly/src/main/java/sample/SampleController.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-wildfly/src/main/java/sample/SampleWildFlyDeployApplication.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-wlp/pom.xml (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-wlp/src/main/java/sample/SampleController.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-wlp/src/main/java/sample/SampleWlpDeployApplication.java (100%) rename {spring-boot-deployment-tests => spring-boot-tests/spring-boot-deployment-tests}/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/pom.xml (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-devtools-tests/pom.xml (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-devtools-tests/src/test/java/com/example/ControllerOne.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-devtools-tests/src/test/java/com/example/DevToolsTestApplication.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/ApplicationLauncher.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/ExplodedRemoteApplicationLauncher.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JarFileRemoteApplicationLauncher.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JvmLauncher.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/LaunchedApplication.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/LocalApplicationLauncher.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/pom.xml (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/com/example/ResourceHandlingApplication.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ExplodedApplicationLauncher.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/PackagedApplicationLauncher.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/Versions.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-integration-tests-embedded-servlet-container/src/test/resources/pom-template.xml (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/README.adoc (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/pom.xml (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchScriptTestApplication.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.9-a23bced6/Dockerfile (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/logback.xml (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/basic-launch.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/force-stop-when-stopped.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-command-line-arguments.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-java-opts.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-run-args.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-pid-folder.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-command-line-argument.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-java-opt.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-run-arg.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-use-of-start-stop-daemon-disabled.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/restart-when-started.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/restart-when-stopped.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/start-when-started.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/start-when-stopped.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-killed.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-started.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-stopped.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/stop-when-stopped.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-launch-script-tests/src/test/resources/scripts/test-functions.sh (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-security-tests/pom.xml (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-security-tests/spring-boot-security-test-web-helloworld/pom.xml (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-security-tests/spring-boot-security-test-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/spring-boot-security-tests/spring-boot-security-test-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java (100%) rename {spring-boot-integration-tests => spring-boot-tests/spring-boot-integration-tests}/src/it/settings.xml (100%) diff --git a/spring-boot-deployment-tests/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/pom.xml similarity index 100% rename from spring-boot-deployment-tests/pom.xml rename to spring-boot-tests/spring-boot-deployment-tests/pom.xml diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/java/sample/SampleController.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/java/sample/SampleController.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/java/sample/SampleController.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/java/sample/SampleController.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/java/sample/SampleGlassfishDeployApplication.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/java/sample/SampleGlassfishDeployApplication.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/java/sample/SampleGlassfishDeployApplication.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/java/sample/SampleGlassfishDeployApplication.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/test/java/sample/SampleGlassfishDeployApplicationIT.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/main/java/sample/SampleController.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/main/java/sample/SampleController.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/main/java/sample/SampleController.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/main/java/sample/SampleController.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/main/java/sample/SampleTomcatDeployApplication.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/main/java/sample/SampleTomcatDeployApplication.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/main/java/sample/SampleTomcatDeployApplication.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/main/java/sample/SampleTomcatDeployApplication.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/src/test/java/sample/SampleTomcatDeployApplicationIT.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/main/java/sample/SampleController.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/main/java/sample/SampleController.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/main/java/sample/SampleController.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/main/java/sample/SampleController.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/main/java/sample/SampleTomEEDeployApplication.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/main/java/sample/SampleTomEEDeployApplication.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/main/java/sample/SampleTomEEDeployApplication.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/main/java/sample/SampleTomEEDeployApplication.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/src/test/java/sample/SampleTomEEDeployApplicationIT.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/java/sample/SampleController.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/java/sample/SampleController.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/java/sample/SampleController.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/java/sample/SampleController.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/java/sample/SampleWildFlyDeployApplication.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/java/sample/SampleWildFlyDeployApplication.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/java/sample/SampleWildFlyDeployApplication.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/java/sample/SampleWildFlyDeployApplication.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/test/java/sample/SampleWildFlyDeployApplicationIT.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/main/java/sample/SampleController.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/main/java/sample/SampleController.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/main/java/sample/SampleController.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/main/java/sample/SampleController.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/main/java/sample/SampleWlpDeployApplication.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/main/java/sample/SampleWlpDeployApplication.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/main/java/sample/SampleWlpDeployApplication.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/main/java/sample/SampleWlpDeployApplication.java diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java similarity index 100% rename from spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java rename to spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/src/test/java/sample/SampleWlpDeployApplicationIT.java diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-tests/spring-boot-integration-tests/pom.xml similarity index 100% rename from spring-boot-integration-tests/pom.xml rename to spring-boot-tests/spring-boot-integration-tests/pom.xml diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml similarity index 100% rename from spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/com/example/ControllerOne.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/com/example/ControllerOne.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/com/example/ControllerOne.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/com/example/ControllerOne.java diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/com/example/DevToolsTestApplication.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/com/example/DevToolsTestApplication.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/com/example/DevToolsTestApplication.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/com/example/DevToolsTestApplication.java diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/ApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/ApplicationLauncher.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/ApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/ApplicationLauncher.java diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/ExplodedRemoteApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/ExplodedRemoteApplicationLauncher.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/ExplodedRemoteApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/ExplodedRemoteApplicationLauncher.java diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JarFileRemoteApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JarFileRemoteApplicationLauncher.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JarFileRemoteApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JarFileRemoteApplicationLauncher.java diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JvmLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JvmLauncher.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JvmLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/JvmLauncher.java diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/LaunchedApplication.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/LaunchedApplication.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/LaunchedApplication.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/LaunchedApplication.java diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/LocalApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/LocalApplicationLauncher.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/LocalApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/LocalApplicationLauncher.java diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/com/example/ResourceHandlingApplication.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/com/example/ResourceHandlingApplication.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/com/example/ResourceHandlingApplication.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/com/example/ResourceHandlingApplication.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ExplodedApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ExplodedApplicationLauncher.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ExplodedApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ExplodedApplicationLauncher.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/PackagedApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/PackagedApplicationLauncher.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/PackagedApplicationLauncher.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/PackagedApplicationLauncher.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/Versions.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/Versions.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/Versions.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/Versions.java diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/resources/pom-template.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/resources/pom-template.xml similarity index 100% rename from spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/resources/pom-template.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/resources/pom-template.xml diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/README.adoc b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/README.adoc similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/README.adoc rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/README.adoc diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchScriptTestApplication.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchScriptTestApplication.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchScriptTestApplication.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchScriptTestApplication.java diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.9-a23bced6/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.9-a23bced6/Dockerfile similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.9-a23bced6/Dockerfile rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.9-a23bced6/Dockerfile diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/trusty-20160914/Dockerfile diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/Ubuntu/xenial-20160914/Dockerfile diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/logback.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/logback.xml similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/logback.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/logback.xml diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/basic-launch.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/basic-launch.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/basic-launch.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/basic-launch.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/force-stop-when-stopped.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/force-stop-when-stopped.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/force-stop-when-stopped.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/force-stop-when-stopped.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-command-line-arguments.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-command-line-arguments.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-command-line-arguments.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-command-line-arguments.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-java-opts.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-java-opts.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-java-opts.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-java-opts.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-run-args.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-run-args.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-run-args.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-multiple-run-args.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-pid-folder.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-pid-folder.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-pid-folder.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-pid-folder.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-command-line-argument.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-command-line-argument.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-command-line-argument.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-command-line-argument.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-java-opt.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-java-opt.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-java-opt.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-java-opt.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-run-arg.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-run-arg.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-run-arg.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-single-run-arg.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-use-of-start-stop-daemon-disabled.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-use-of-start-stop-daemon-disabled.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-use-of-start-stop-daemon-disabled.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-use-of-start-stop-daemon-disabled.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/restart-when-started.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/restart-when-started.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/restart-when-started.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/restart-when-started.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/restart-when-stopped.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/restart-when-stopped.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/restart-when-stopped.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/restart-when-stopped.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/start-when-started.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/start-when-started.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/start-when-started.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/start-when-started.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/start-when-stopped.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/start-when-stopped.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/start-when-stopped.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/start-when-stopped.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-killed.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-killed.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-killed.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-killed.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-started.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-started.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-started.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-started.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-stopped.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-stopped.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-stopped.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/status-when-stopped.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/stop-when-stopped.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/stop-when-stopped.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/stop-when-stopped.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/stop-when-stopped.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/test-functions.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/test-functions.sh similarity index 100% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/test-functions.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/test-functions.sh diff --git a/spring-boot-integration-tests/spring-boot-security-tests/pom.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/pom.xml similarity index 100% rename from spring-boot-integration-tests/spring-boot-security-tests/pom.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/pom.xml diff --git a/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/pom.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/pom.xml similarity index 100% rename from spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/pom.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/pom.xml diff --git a/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java diff --git a/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java similarity index 100% rename from spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java diff --git a/spring-boot-integration-tests/src/it/settings.xml b/spring-boot-tests/spring-boot-integration-tests/src/it/settings.xml similarity index 100% rename from spring-boot-integration-tests/src/it/settings.xml rename to spring-boot-tests/spring-boot-integration-tests/src/it/settings.xml