From c4b27eef185797709cb422467668811c64a7dacb Mon Sep 17 00:00:00 2001 From: Anukalp Date: Sat, 20 Dec 2025 05:13:26 +0530 Subject: [PATCH 1/4] Document deprecation of Language.SCRIPT --- .../src/main/java/org/apache/maven/api/Language.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java index 39a5c46e6ae6..573fdd130667 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java @@ -51,11 +51,14 @@ public interface Language extends ExtensibleEnum { Language RESOURCES = language("resources"); /** - * The "script" language. Provided for compatibility with Maven 3. + * The {@code "script"} language. + *

+ * This constant is retained for backward compatibility with Maven 3. * - * @deprecated Use {@link #RESOURCES} instead. + * @deprecated Since Maven 4.0.0-alpha. + * Use {@link #RESOURCES} instead. */ - @Deprecated + @Deprecated(since = "4.0.0-alpha", forRemoval = false) Language SCRIPT = language("script"); // TODO: this should be moved out from here to Java Support (builtin into core) From 7663115391da51d8392c03bd12fbcd878808651e Mon Sep 17 00:00:00 2001 From: Anukalp Date: Wed, 28 Jan 2026 19:27:04 +0530 Subject: [PATCH 2/4] docs: remove alpha reference from Language.SCRIPT deprecation --- .../src/main/java/org/apache/maven/api/Language.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java index 573fdd130667..5dc4ee25f78f 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java @@ -55,10 +55,10 @@ public interface Language extends ExtensibleEnum { *

* This constant is retained for backward compatibility with Maven 3. * - * @deprecated Since Maven 4.0.0-alpha. + * @deprecated Since 4.0.0. * Use {@link #RESOURCES} instead. */ - @Deprecated(since = "4.0.0-alpha", forRemoval = false) + @Deprecated(since = "4.0.0") Language SCRIPT = language("script"); // TODO: this should be moved out from here to Java Support (builtin into core) From 5f5916e331fdf1e742f72933ec25efab33989d53 Mon Sep 17 00:00:00 2001 From: Anukalp Date: Wed, 28 Jan 2026 19:43:57 +0530 Subject: [PATCH 3/4] docs: avoid duplicating deprecation version in Language.SCRIPT Javadoc --- .../src/main/java/org/apache/maven/api/Language.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java index 5dc4ee25f78f..7d90f9f2fec8 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java @@ -55,8 +55,7 @@ public interface Language extends ExtensibleEnum { *

* This constant is retained for backward compatibility with Maven 3. * - * @deprecated Since 4.0.0. - * Use {@link #RESOURCES} instead. + * @deprecated Use {@link #RESOURCES} instead. */ @Deprecated(since = "4.0.0") Language SCRIPT = language("script"); From 53c0172827feb11c75bfa7230678640be143cde9 Mon Sep 17 00:00:00 2001 From: Anukalp Date: Wed, 28 Jan 2026 20:50:37 +0530 Subject: [PATCH 4/4] docs: compact Language.SCRIPT Javadoc formatting --- .../src/main/java/org/apache/maven/api/Language.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java index 7d90f9f2fec8..9b07f7757c63 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Language.java @@ -51,9 +51,7 @@ public interface Language extends ExtensibleEnum { Language RESOURCES = language("resources"); /** - * The {@code "script"} language. - *

- * This constant is retained for backward compatibility with Maven 3. + * The {@code "script"} language. This constant is retained for backward compatibility with Maven 3. * * @deprecated Use {@link #RESOURCES} instead. */