This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new b5a8a8a349 [MNG-8328] Clean up assembly from Jansi remains and add
JLine native libraries (#1839)
b5a8a8a349 is described below
commit b5a8a8a349bebc0eef43395082a667ac6b1c113d
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Oct 24 14:01:35 2024 +0200
[MNG-8328] Clean up assembly from Jansi remains and add JLine native
libraries (#1839)
---
apache-maven/pom.xml | 6 +++---
apache-maven/src/assembly/component.xml | 8 +++++---
apache-maven/src/assembly/maven/bin/mvn | 2 +-
apache-maven/src/assembly/maven/bin/mvn.cmd | 2 +-
apache-maven/src/assembly/maven/lib/jansi-native/README.txt | 8 --------
apache-maven/src/assembly/maven/lib/jline-native/README.txt | 8 ++++++++
6 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 4ce31f8651..9f89ae984c 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -162,13 +162,13 @@ under the License.
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>unpack-jansi-native</id>
+ <id>unpack-jline-native</id>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds>jansi</includeArtifactIds>
-
<includes>org/fusesource/jansi/internal/native/Windows/**</includes>
+ <includeArtifactIds>jline-native</includeArtifactIds>
+ <includes>org/jline/nativ/**</includes>
</configuration>
</execution>
</executions>
diff --git a/apache-maven/src/assembly/component.xml
b/apache-maven/src/assembly/component.xml
index 9a6d61dc5c..94ae1f86ee 100644
--- a/apache-maven/src/assembly/component.xml
+++ b/apache-maven/src/assembly/component.xml
@@ -72,10 +72,12 @@ under the License.
<lineEnding>dos</lineEnding>
</fileSet>
<fileSet>
-
<directory>target/dependency/org/fusesource/jansi/internal/native</directory>
- <outputDirectory>lib/jansi-native</outputDirectory>
+ <directory>target/dependency/org/jline/nativ</directory>
+ <outputDirectory>lib/jline-native</outputDirectory>
<includes>
- <include>**</include>
+ <include>**/*.so</include>
+ <include>**/*.jnilib</include>
+ <include>**/*.dll</include>
</includes>
</fileSet>
<fileSet>
diff --git a/apache-maven/src/assembly/maven/bin/mvn
b/apache-maven/src/assembly/maven/bin/mvn
index a942b12a57..d516a8d93c 100755
--- a/apache-maven/src/assembly/maven/bin/mvn
+++ b/apache-maven/src/assembly/maven/bin/mvn
@@ -218,7 +218,7 @@ exec "$JAVACMD" \
"-Dclassworlds.conf=$CLASSWORLDS_CONF" \
"-Dmaven.home=$MAVEN_HOME" \
"-Dmaven.mainClass=$MAVEN_MAIN_CLASS" \
- "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
+ "-Dlibrary.jline.path=${MAVEN_HOME}/lib/jline-native" \
"-Dmaven.multiModuleProjectDirectory=$MAVEN_PROJECTBASEDIR" \
$LAUNCHER_CLASS \
$MAVEN_ARGS \
diff --git a/apache-maven/src/assembly/maven/bin/mvn.cmd
b/apache-maven/src/assembly/maven/bin/mvn.cmd
index 965f9bc0fa..b5e204cb30 100644
--- a/apache-maven/src/assembly/maven/bin/mvn.cmd
+++ b/apache-maven/src/assembly/maven/bin/mvn.cmd
@@ -214,7 +214,7 @@ if "%MAVEN_MAIN_CLASS%"=="" @set
MAVEN_MAIN_CLASS=org.apache.maven.cling.MavenCl
"-Dclassworlds.conf=%CLASSWORLDS_CONF%" ^
"-Dmaven.home=%MAVEN_HOME%" ^
"-Dmaven.mainClass=%MAVEN_MAIN_CLASS%" ^
- "-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native" ^
+ "-Dlibrary.jline.path=%MAVEN_HOME%\lib\jline-native" ^
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
%LAUNCHER_CLASS% ^
%MAVEN_ARGS% ^
diff --git a/apache-maven/src/assembly/maven/lib/jansi-native/README.txt
b/apache-maven/src/assembly/maven/lib/jansi-native/README.txt
deleted file mode 100644
index bf7c1082e6..0000000000
--- a/apache-maven/src/assembly/maven/lib/jansi-native/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-This directory contains Jansi native libraries extracted from Jansi JAR.
-
-You can add your own build for platforms not natively supported by Jansi.
-See here [1] on how to compile for your platform and here [2] how libraries
-follow Jansi's directory and filename conventions.
-
-[1] https://github.com/fusesource/jansi/tree/master/src/main/native
-[2]
https://github.com/fusesource/jansi/blob/321a8ff71c731e10f4ea05c607860180276b2215/src/main/java/org/fusesource/jansi/internal/OSInfo.java
diff --git a/apache-maven/src/assembly/maven/lib/jline-native/README.txt
b/apache-maven/src/assembly/maven/lib/jline-native/README.txt
new file mode 100644
index 0000000000..ed74b45f7e
--- /dev/null
+++ b/apache-maven/src/assembly/maven/lib/jline-native/README.txt
@@ -0,0 +1,8 @@
+This directory contains JLine native libraries extracted from JLine JAR.
+
+You can add your own build for platforms not natively supported by JLine.
+See here [1] on how to compile for your platform and here [2] how libraries
+follow JLine's directory and filename conventions.
+
+[1] https://github.com/jline/jline3/tree/master/native
+[2]
https://github.com/jline/jline3/blob/master/native/src/main/java/org/jline/nativ/OSInfo.java
