Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apache-maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 5 additions & 3 deletions apache-maven/src/assembly/component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apache-maven/src/assembly/maven/bin/mvn
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion apache-maven/src/assembly/maven/bin/mvn.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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% ^
Expand Down
8 changes: 0 additions & 8 deletions apache-maven/src/assembly/maven/lib/jansi-native/README.txt

This file was deleted.

8 changes: 8 additions & 0 deletions apache-maven/src/assembly/maven/lib/jline-native/README.txt
Original file line number Diff line number Diff line change
@@ -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