From 2f04f5559a64302f14174808cd64a8f530d7ade9 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 11 Mar 2026 11:42:50 +0100 Subject: [PATCH 1/2] Feat: move off from deprecated jansi And use maintained org.jline:jansi instead Depends on: https://github.com/apache/maven-shared-utils/pull/371 --- apache-maven/pom.xml | 4 +-- .../licenses/unrecognized-jansi-3.30.8.txt | 34 +++++++++++++++++++ apache-maven/src/main/assembly/component.xml | 2 +- maven-embedder/pom.xml | 2 +- pom.xml | 6 ++-- 5 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 apache-maven/src/main/appended-resources/licenses/unrecognized-jansi-3.30.8.txt diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 94ccc1a79670..0829b7b393d9 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -93,7 +93,7 @@ under the License. maven-slf4j-provider - org.fusesource.jansi + org.jline jansi @@ -145,7 +145,7 @@ under the License. jansi - org/fusesource/jansi/internal/native/Windows/** + org/jline/nativ/Windows/** diff --git a/apache-maven/src/main/appended-resources/licenses/unrecognized-jansi-3.30.8.txt b/apache-maven/src/main/appended-resources/licenses/unrecognized-jansi-3.30.8.txt new file mode 100644 index 000000000000..ed9503f23c23 --- /dev/null +++ b/apache-maven/src/main/appended-resources/licenses/unrecognized-jansi-3.30.8.txt @@ -0,0 +1,34 @@ +Copyright (c) 2002-2023, the original author or authors. +All rights reserved. + +https://opensource.org/licenses/BSD-3-Clause + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the following +conditions are met: + +Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with +the distribution. + +Neither the name of JLine nor the names of its contributors +may be used to endorse or promote products derived from this +software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/apache-maven/src/main/assembly/component.xml b/apache-maven/src/main/assembly/component.xml index 3413c4f0405a..669ce87c2bb8 100644 --- a/apache-maven/src/main/assembly/component.xml +++ b/apache-maven/src/main/assembly/component.xml @@ -63,7 +63,7 @@ under the License. - target/dependency/org/fusesource/jansi/internal/native + target/dependency/org/jline/nativ lib/jansi-native ** diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index ac2986b349c9..790b55ceb52c 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -160,7 +160,7 @@ under the License. test - org.fusesource.jansi + org.jline jansi test diff --git a/pom.xml b/pom.xml index 8d23b272eab5..477e2d7ee5ee 100644 --- a/pom.xml +++ b/pom.xml @@ -341,7 +341,7 @@ under the License. org.apache.maven.shared maven-shared-utils - 3.4.2 + 3.4.3-SNAPSHOT @@ -351,9 +351,9 @@ under the License. - org.fusesource.jansi + org.jline jansi - 2.4.2 + 3.30.8 org.slf4j From 35ccbf6aa2c3e0b5a55108f250584f7662dbef76 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 11 Mar 2026 11:55:26 +0100 Subject: [PATCH 2/2] Fix extension.xml --- maven-core/src/main/resources/META-INF/maven/extension.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/maven-core/src/main/resources/META-INF/maven/extension.xml index a419b3e835df..44a1d1107e28 100644 --- a/maven-core/src/main/resources/META-INF/maven/extension.xml +++ b/maven-core/src/main/resources/META-INF/maven/extension.xml @@ -127,7 +127,7 @@ under the License. org.slf4j.event.* - org.fusesource.jansi.* + org.jline.jansi.* @@ -174,7 +174,7 @@ under the License. javax.inject:javax.inject javax.annotation:javax.annotation-api org.slf4j:slf4j-api - org.fusesource.jansi:jansi + org.jline:jansi