Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-8328] Clean up assembly from Jansi remains and add JLine native libraries (#1839)

This commit is contained in:
Guillaume Nodet 2024-10-24 14:01:35 +02:00 committed by GitHub
parent 0cdb6c13fe
commit b5a8a8a349
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache-maven/pom.xml
View File

@ -162,13 +162,13 @@ under the License.
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>unpack-jansi-native</id> <id>unpack-jline-native</id>
<goals> <goals>
<goal>unpack-dependencies</goal> <goal>unpack-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<includeArtifactIds>jansi</includeArtifactIds> <includeArtifactIds>jline-native</includeArtifactIds>
<includes>org/fusesource/jansi/internal/native/Windows/**</includes> <includes>org/jline/nativ/**</includes>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

8
apache-maven/src/assembly/component.xml
View File

@ -72,10 +72,12 @@ under the License.
<lineEnding>dos</lineEnding> <lineEnding>dos</lineEnding>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>target/dependency/org/fusesource/jansi/internal/native</directory> <directory>target/dependency/org/jline/nativ</directory>
<outputDirectory>lib/jansi-native</outputDirectory> <outputDirectory>lib/jline-native</outputDirectory>
<includes> <includes>
<include>**</include> <include>**/*.so</include>
<include>**/*.jnilib</include>
<include>**/*.dll</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>

2
apache-maven/src/assembly/maven/bin/mvn
View File

@ -218,7 +218,7 @@ exec "$JAVACMD" \
"-Dclassworlds.conf=$CLASSWORLDS_CONF" \ "-Dclassworlds.conf=$CLASSWORLDS_CONF" \
"-Dmaven.home=$MAVEN_HOME" \ "-Dmaven.home=$MAVEN_HOME" \
"-Dmaven.mainClass=$MAVEN_MAIN_CLASS" \ "-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" \ "-Dmaven.multiModuleProjectDirectory=$MAVEN_PROJECTBASEDIR" \
$LAUNCHER_CLASS \ $LAUNCHER_CLASS \
$MAVEN_ARGS \ $MAVEN_ARGS \

2
apache-maven/src/assembly/maven/bin/mvn.cmd
View File

@ -214,7 +214,7 @@ if "%MAVEN_MAIN_CLASS%"=="" @set MAVEN_MAIN_CLASS=org.apache.maven.cling.MavenCl
"-Dclassworlds.conf=%CLASSWORLDS_CONF%" ^ "-Dclassworlds.conf=%CLASSWORLDS_CONF%" ^
"-Dmaven.home=%MAVEN_HOME%" ^ "-Dmaven.home=%MAVEN_HOME%" ^
"-Dmaven.mainClass=%MAVEN_MAIN_CLASS%" ^ "-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%" ^ "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
%LAUNCHER_CLASS% ^ %LAUNCHER_CLASS% ^
%MAVEN_ARGS% ^ %MAVEN_ARGS% ^

8
apache-maven/src/assembly/maven/lib/jansi-native/README.txt
View File

@ -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

8
apache-maven/src/assembly/maven/lib/jline-native/README.txt Normal file
View File

@ -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