Revert deprecation of [Simple]CommandLinePropertySource

This commit reverts the deprecation of CommandLinePropertySource and SimpleCommandLinePropertySource, since we have discovered that Spring Boot actively uses SimpleCommandLinePropertySource in org.springframework.boot.SpringApplication. Closes gh-31207
spring-projects · Sep 13, 2023 · e5f1879 · e5f1879
1 parent 01f7173
commit e5f1879
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 6 deletions.
diff --git a/spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt b/spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt
@@ -76,7 +76,6 @@ class BeanDefinitionDslTests {
 	}
 
 	@Test
-	@Suppress("DEPRECATION")
 	fun `Declare beans using environment condition with the functional Kotlin DSL`() {
 		val beans = beans {
 			bean<Foo>()

diff --git a/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
@@ -204,9 +204,7 @@
  * @see PropertySource
  * @see SimpleCommandLinePropertySource
  * @see JOptCommandLinePropertySource
- * @deprecated since 6.1 with no plans for a replacement
  */
-@Deprecated(since = "6.1")
 public abstract class CommandLinePropertySource<T> extends EnumerablePropertySource<T> {
 
 	/** The default name given to {@link CommandLinePropertySource} instances: {@value}. */

diff --git a/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java
@@ -83,9 +83,7 @@
  * @since 3.1
  * @see CommandLinePropertySource
  * @see JOptCommandLinePropertySource
- * @deprecated since 6.1 with no plans for a replacement
  */
-@Deprecated(since = "6.1")
 public class SimpleCommandLinePropertySource extends CommandLinePropertySource<CommandLineArgs> {
 
 	/**

diff --git a/...core/src/test/java/org/springframework/core/env/SimpleCommandLinePropertySourceTests.java b/...core/src/test/java/org/springframework/core/env/SimpleCommandLinePropertySourceTests.java
@@ -29,7 +29,6 @@
  * @author Sam Brannen
  * @since 3.1
  */
-@SuppressWarnings("deprecation")
 class SimpleCommandLinePropertySourceTests {
 
 	@Test