Remove test dependency to spring-boot-test in spring-shell-core

The core module should not depend on Spring Boot both in production
and test dependencies.

Author: fmbenhassine

spring-shell-autoconfigure/pom.xml

@@ -33,7 +33,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.shell</groupId>
-			<artifactId>spring-shell-standard</artifactId>
+			<artifactId>spring-shell-core</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>

spring-shell-core/src/test/java/org/springframework/shell/core/command/annotation/support/CommandRegistrationFactoryBeanTests.java renamed to spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/CommandRegistrationFactoryBeanTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.shell.core.command.annotation.support;
+package org.springframework.shell.boot;
 
 import java.util.Collections;
 
@@ -22,6 +22,7 @@
 
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
+import org.springframework.shell.core.command.annotation.support.CommandRegistrationFactoryBean;
 import org.springframework.shell.core.command.availability.Availability;
 import org.springframework.shell.core.command.availability.AvailabilityProvider;
 import org.springframework.shell.core.command.CommandRegistration;

spring-shell-core/pom.xml

@@ -74,9 +74,9 @@
 
 		<!-- Test dependencies -->
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-test</artifactId>
-			<version>${spring-boot.version}</version>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring-framework.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

spring-shell-core/src/main/java/org/springframework/shell/core/command/annotation/support/CommandRegistrationFactoryBean.java

@@ -74,7 +74,7 @@
  * @author Janne Valkealahti
  * @author Piotr Olaszewski
  */
-class CommandRegistrationFactoryBean
+public class CommandRegistrationFactoryBean
 		implements FactoryBean<CommandRegistration>, ApplicationContextAware, InitializingBean {
 
 	private final Log log = LogFactory.getLog(CommandRegistrationFactoryBean.class);

spring-shell-core/src/test/java/org/springframework/shell/core/jline/NonInteractiveShellRunnerTests.java

@@ -23,12 +23,9 @@
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.DefaultApplicationArguments;
 import org.springframework.shell.core.InputProvider;
 import org.springframework.shell.core.Shell;
 import org.springframework.shell.core.context.DefaultShellContext;
-import org.springframework.shell.core.jline.NonInteractiveShellRunner;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -85,10 +82,6 @@ void shouldNotQuoteWithoutWhitespace() throws Exception {
 		assertThat(value.readInput().rawText()).isEqualTo("foobar");
 	}
 
-	private static ApplicationArguments ofApplicationArguments(String... args) {
-		return new DefaultApplicationArguments(args);
-	}
-
 	private static String[] ofArgs(String... args) {
 		String[] a = new String[args.length];
 		for (int i = 0; i < args.length; i++) {

spring-shell-core/src/test/java/org/springframework/shell/core/jline/ScriptShellRunnerTests.java

@@ -25,8 +25,6 @@
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.DefaultApplicationArguments;
 import org.springframework.shell.core.Shell;
 
 @ExtendWith(MockitoExtension.class)
@@ -64,10 +62,6 @@ void shouldRunWhenFirstArgHavingFile(@TempDir Path workingDir) throws Exception
 		shellRunner.run(new String[] { "@" + pathStr });
 	}
 
-	private static ApplicationArguments ofApplicationArguments(String... args) {
-		return new DefaultApplicationArguments(args);
-	}
-
 	private static String[] ofArgs(String... args) {
 		String[] a = new String[args.length];
 		for (int i = 0; i < args.length; i++) {