Remove dependency to Spring Boot from core module

The main blockers were:
- ApplicationArguments, used in ShellRunner#canRun
- ApplicationRunner, extended by ShellApplicationRunner

This commit:
- removes deprecated APIs (ShellRunner#canRun methods)
- removes ShellApplicationRunner as it became empty
after the removal of "extends ApplicationRunner". Its
default implementation was also removed as it only iterates
over ShellRunner instances and invokes them.

This commit also adds the necessary dependencies that
were brought transitively by Spring Boot:
- spring-context
- slf4j-api
- jakarta.validation-api

Resolves #200

Author: fmbenhassine

pom.xml

@@ -54,13 +54,17 @@
 		<jline.version>3.30.6</jline.version>
 		<antlr-st4.version>4.3.4</antlr-st4.version>
 		<commons-io.version>2.20.0</commons-io.version>
+		<slf4j.version>2.0.17</slf4j.version>
+		<jakarta.validation-api.version>3.1.1</jakarta.validation-api.version>
 
 		<!-- test dependencies -->
 		<jimfs.version>1.3.1</jimfs.version>
 		<assertj.version>3.27.4</assertj.version>
 		<junit-jupiter.version>6.0.0</junit-jupiter.version>
 		<mockito.version>5.19.0</mockito.version>
 		<awaitility.version>4.3.0</awaitility.version>
+		<hibernate-validator.version>9.0.1.Final</hibernate-validator.version>
+		<jakarta.el.version>4.0.2</jakarta.el.version>
 
 		<!-- documentation dependencies -->
 		<antora-maven-plugin.version>1.0.0-alpha.5</antora-maven-plugin.version>

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/ApplicationRunnerAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,29 +15,17 @@
  */
 package org.springframework.shell.boot;
 
-import java.util.List;
-
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
-import org.springframework.shell.DefaultShellApplicationRunner;
-import org.springframework.shell.ShellApplicationRunner;
-import org.springframework.shell.ShellRunner;
 
 @AutoConfiguration
 @EnableConfigurationProperties(SpringShellProperties.class)
 public class ApplicationRunnerAutoConfiguration {
 
-	@Bean
-	@ConditionalOnMissingBean(ShellApplicationRunner.class)
-	public DefaultShellApplicationRunner defaultShellApplicationRunner(List<ShellRunner> shellRunners) {
-		return new DefaultShellApplicationRunner(shellRunners);
-	}
-
 	@Bean
 	@ConditionalOnProperty(prefix = "spring.shell.context", name = "close", havingValue = "true")
 	public ApplicationReadyEventListener applicationReadyEventListener() {

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/StandardCommandsAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@
  * Creates beans for standard commands.
  *
  * @author Eric Bottard
+ * @author Mahmoud Ben Hassine
  */
 @AutoConfiguration
 @ConditionalOnClass({ Help.Command.class })
@@ -113,19 +114,8 @@ public Completion completion(SpringShellProperties properties) {
 	public Version version(SpringShellProperties properties, ObjectProvider<BuildProperties> buildProperties,
 			ObjectProvider<GitProperties> gitProperties, ObjectProvider<TemplateExecutor> templateExecutor) {
 		Version version = new Version(templateExecutor.getIfAvailable());
-		version.setBuildProperties(buildProperties.getIfAvailable());
-		version.setGitProperties(gitProperties.getIfAvailable());
 		VersionCommand versionProperties = properties.getCommand().getVersion();
 		version.setTemplate(versionProperties.getTemplate());
-		version.setShowBuildArtifact(versionProperties.isShowBuildArtifact());
-		version.setShowBuildGroup(versionProperties.isShowBuildGroup());
-		version.setShowBuildName(versionProperties.isShowBuildName());
-		version.setShowBuildTime(versionProperties.isShowBuildTime());
-		version.setShowBuildVersion(versionProperties.isShowBuildVersion());
-		version.setShowGitBranch(versionProperties.isShowGitBranch());
-		version.setShowGitCommitId(versionProperties.isShowGitCommitId());
-		version.setShowGitShortCommitId(versionProperties.isShowGitShortCommitId());
-		version.setShowGitCommitTime(versionProperties.isShowGitCommitTime());
 		return version;
 	}
 }

spring-shell-core/pom.xml

@@ -43,14 +43,9 @@
 			<version>${reactor.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-			<version>${spring-boot.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
-			<version>${spring-boot.version}</version>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${spring-framework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -72,6 +67,16 @@
 			<artifactId>commons-io</artifactId>
 			<version>${commons-io.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
+			<version>${jakarta.validation-api.version}</version>
+		</dependency>
 
 		<!-- Test dependencies -->
 		<dependency>
@@ -116,5 +121,23 @@
 			<version>${awaitility.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate.validator</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>${hibernate-validator.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish</groupId>
+			<artifactId>jakarta.el</artifactId>
+			<version>${jakarta.el.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>${slf4j.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>

spring-shell-core/src/main/java/org/springframework/shell/DefaultShellApplicationRunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,43 +15,14 @@
  */
 package org.springframework.shell;
 
-import org.springframework.boot.ApplicationArguments;
-
 /**
  * Interface for shell runners.
  *
  * @author Janne Valkealahti
+ * @author Mahmoud Ben Hassine
  */
 public interface ShellRunner {
 
-	/**
-	 * Checks if a particular shell runner can execute.
-	 *
-	 * For {@link #canRun(ApplicationArguments)} and
-	 * {@link #run(ApplicationArguments)} prefer {@link #run(String[])}.
-	 *
-	 * @param args the application arguments
-	 * @return true if shell runner can execute
-	 */
-	@Deprecated(since = "3.3.0", forRemoval = true)
-	default boolean canRun(ApplicationArguments args) {
-		return false;
-	}
-
-	/**
-	 * Execute application.
-	 *
-	 * For {@link #canRun(ApplicationArguments)} and
-	 * {@link #run(ApplicationArguments)} prefer {@link #run(String[])}.
-	 *
-	 * @param args the application argumets
-	 * @throws Exception in errors
-	 */
-	@Deprecated(since = "3.3.0", forRemoval = true)
-	default void run(ApplicationArguments args) throws Exception {
-		throw new UnsupportedOperationException("Should get implemented together with canRun");
-	}
-
 	/**
 	 * Execute {@code ShellRunner} with given args. Return value indicates if run
 	 * operation happened and no further runners should be used.

spring-shell-core/src/main/java/org/springframework/shell/ShellApplicationRunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,8 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.boot.context.TypeExcludeFilter;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.annotation.AnnotationAttributes;
@@ -42,6 +40,7 @@
  * {@link ImportBeanDefinitionRegistrar} for {@link CommandScan @CommandScan}.
  *
  * @author Janne Valkealahti
+ * @author Mahmoud Ben Hassine
  */
 public class CommandScanRegistrar implements ImportBeanDefinitionRegistrar {
 
@@ -91,9 +90,6 @@ private ClassPathScanningCandidateComponentProvider getScanner(BeanDefinitionReg
 		scanner.setEnvironment(this.environment);
 		scanner.setResourceLoader(this.resourceLoader);
 		scanner.addIncludeFilter(new AnnotationTypeFilter(Command.class));
-		TypeExcludeFilter typeExcludeFilter = new TypeExcludeFilter();
-		typeExcludeFilter.setBeanFactory((BeanFactory) registry);
-		scanner.addExcludeFilter(typeExcludeFilter);
 		return scanner;
 	}
 

spring-shell-core/src/main/java/org/springframework/shell/ShellRunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,9 @@
 import org.jline.terminal.Terminal;
 
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
-import org.springframework.shell.TerminalSizeAware;
 import org.springframework.shell.command.CommandCatalog;
 import org.springframework.shell.command.CommandExceptionResolver;
 import org.springframework.shell.command.CommandParserExceptionResolver;
@@ -34,12 +32,12 @@
  *
  * @author Eric Bottard
  * @author Janne Valkealahti
+ * @author Mahmoud Ben Hassine
  */
 @Configuration(proxyBeanMethods = false)
 public class ResultHandlerConfig {
 
 	@Bean
-	@ConditionalOnClass(TerminalSizeAware.class)
 	public TerminalSizeAwareResultHandler terminalSizeAwareResultHandler(Terminal terminal) {
 		return new TerminalSizeAwareResultHandler(terminal);
 	}