Move smoke tests under spring-boot-test

See gh-17393

ci/scripts/build-smoke-tests.sh

@@ -5,5 +5,5 @@ source $(dirname $0)/common.sh
 repository=$(pwd)/distribution-repository
 
 pushd git-repo > /dev/null
-run_maven -f spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
+run_maven -f spring-boot-tests/spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
 popd > /dev/null

ci/scripts/stage.sh

@@ -36,7 +36,7 @@ git commit -m"Release v$stageVersion" > /dev/null
 git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
 
 run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository}
-run_maven -f spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
+run_maven -f spring-boot-tests/spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
 run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
 run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
 

pom.xml

@@ -107,7 +107,6 @@
 			<modules>
 				<module>spring-boot-project</module>
 				<!-- Smoke tests are built via the invoker plugin -->
-				<module>spring-boot-smoke-tests-invoker</module>
 				<module>spring-boot-tests</module>
 			</modules>
 		</profile>
@@ -121,7 +120,6 @@
 			</activation>
 			<modules>
 				<module>spring-boot-project</module>
-				<module>spring-boot-smoke-tests</module>
 				<module>spring-boot-tests</module>
 			</modules>
 		</profile>

spring-boot-tests/pom.xml

@@ -17,6 +17,7 @@
 	</properties>
 	<modules>
 		<!-- Deployment tests are slow so don't include by default -->
+		<module>spring-boot-smoke-tests-invoker</module>
 		<module>spring-boot-integration-tests</module>
 	</modules>
 	<profiles>
@@ -29,6 +30,7 @@
 				</property>
 			</activation>
 			<modules>
+				<module>spring-boot-smoke-tests-invoker</module>
 				<module>spring-boot-integration-tests</module>
 				<module>spring-boot-deployment-tests</module>
 			</modules>

spring-boot-smoke-tests-invoker/pom.xml → spring-boot-tests/spring-boot-smoke-tests-invoker/pom.xml

@@ -6,14 +6,14 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
 		<version>${revision}</version>
-		<relativePath>../spring-boot-project/spring-boot-parent</relativePath>
+		<relativePath>../../spring-boot-project/spring-boot-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-smoke-tests-invoker</artifactId>
 	<packaging>pom</packaging>
 	<name>Spring Boot Smoke Tests Invoker</name>
 	<description>Spring Boot Smoke Tests Invoker</description>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<build>
 		<plugins>
@@ -23,7 +23,7 @@
 				<artifactId>maven-invoker-plugin</artifactId>
 				<inherited>false</inherited>
 				<configuration>
-					<projectsDirectory>${main.basedir}/spring-boot-smoke-tests</projectsDirectory>
+					<projectsDirectory>${main.basedir}/spring-boot-tests/spring-boot-smoke-tests</projectsDirectory>
 					<skipInvocation>${skipTests}</skipInvocation>
 					<streamLogs>true</streamLogs>
 					<pomIncludes>
@@ -54,7 +54,7 @@
 						<configuration>
 							<target>
 								<delete includeemptydirs="true">
-									<fileset dir="${main.basedir}/spring-boot-smoke-tests"
+									<fileset dir="${main.basedir}/spring-boot-tests/spring-boot-smoke-tests"
 										includes="**/target/" />
 								</delete>
 							</target>

spring-boot-smoke-tests/pom.xml → spring-boot-tests/spring-boot-smoke-tests/pom.xml

@@ -6,14 +6,14 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>${revision}</version>
-		<relativePath>../spring-boot-project/spring-boot-starters/spring-boot-starter-parent</relativePath>
+		<relativePath>../../spring-boot-project/spring-boot-starters/spring-boot-starter-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-smoke-tests</artifactId>
 	<packaging>pom</packaging>
 	<name>Spring Boot Smoke Tests</name>
 	<description>Spring Boot Smoke Tests</description>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
+		<main.basedir>${basedir}/../..</main.basedir>
 		<java.version>1.8</java.version>
 		<disable.checks>false</disable.checks>
 	</properties>

spring-boot-smoke-tests/spring-boot-smoke-test-activemq/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot ActiveMQ Smoke Test</name>
 	<description>Spring Boot ActiveMQ Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot Actuator Custom Security Smoke Test</name>
 	<description>Spring Boot Actuator Custom Security Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot Actuator Log4j 2 Smoke Test</name>
 	<description>Spring Boot Actuator Log4j 2 Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot Actuator Non-Web Smoke Test</name>
 	<description>Spring Boot Actuator Non-Web Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot Actuator UI Smoke Test</name>
 	<description>Spring Boot Actuator UI Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-boot-smoke-tests/spring-boot-smoke-test-actuator/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot Actuator Smoke Test</name>
 	<description>Spring Boot Actuator Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-boot-smoke-tests/spring-boot-smoke-test-amqp/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/pom.xml

@@ -13,7 +13,7 @@
 	<name>Spring Boot AMQP Smoke Test</name>
 	<description>Spring Boot AMQP Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot Animated Banner Smoke Test</name>
 	<description>Spring Boot Animated Banner Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-boot-smoke-tests/spring-boot-smoke-test-ant/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/pom.xml

@@ -13,7 +13,7 @@
 	<name>Spring Boot Ant Smoke Test</name>
 	<description>Spring Boot Ant Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<ant.version>1.9.3</ant.version>
 	</properties>
 	<dependencies>

spring-boot-smoke-tests/spring-boot-smoke-test-aop/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot AOP Smoke Test</name>
 	<description>Spring Boot AOP Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot Atmosphere Smoke Test</name>
 	<description>Spring Boot Atmosphere Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-boot-smoke-tests/spring-boot-smoke-test-batch/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot Batch Smoke Test</name>
 	<description>Spring Boot Batch Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml → spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot Cache Smoke Test</name>
 	<description>Spring Boot Cache Smoke Test</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->