Skip to content

Commit b5a8a8a

Browse files
authored
[MNG-8328] Clean up assembly from Jansi remains and add JLine native libraries (#1839)
1 parent 0cdb6c1 commit b5a8a8a

File tree

6 files changed

+18
-16
lines changed

6 files changed

+18
-16
lines changed

apache-maven/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ under the License.
162162
<artifactId>maven-dependency-plugin</artifactId>
163163
<executions>
164164
<execution>
165-
<id>unpack-jansi-native</id>
165+
<id>unpack-jline-native</id>
166166
<goals>
167167
<goal>unpack-dependencies</goal>
168168
</goals>
169169
<configuration>
170-
<includeArtifactIds>jansi</includeArtifactIds>
171-
<includes>org/fusesource/jansi/internal/native/Windows/**</includes>
170+
<includeArtifactIds>jline-native</includeArtifactIds>
171+
<includes>org/jline/nativ/**</includes>
172172
</configuration>
173173
</execution>
174174
</executions>

apache-maven/src/assembly/component.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,12 @@ under the License.
7272
<lineEnding>dos</lineEnding>
7373
</fileSet>
7474
<fileSet>
75-
<directory>target/dependency/org/fusesource/jansi/internal/native</directory>
76-
<outputDirectory>lib/jansi-native</outputDirectory>
75+
<directory>target/dependency/org/jline/nativ</directory>
76+
<outputDirectory>lib/jline-native</outputDirectory>
7777
<includes>
78-
<include>**</include>
78+
<include>**/*.so</include>
79+
<include>**/*.jnilib</include>
80+
<include>**/*.dll</include>
7981
</includes>
8082
</fileSet>
8183
<fileSet>

apache-maven/src/assembly/maven/bin/mvn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ exec "$JAVACMD" \
218218
"-Dclassworlds.conf=$CLASSWORLDS_CONF" \
219219
"-Dmaven.home=$MAVEN_HOME" \
220220
"-Dmaven.mainClass=$MAVEN_MAIN_CLASS" \
221-
"-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
221+
"-Dlibrary.jline.path=${MAVEN_HOME}/lib/jline-native" \
222222
"-Dmaven.multiModuleProjectDirectory=$MAVEN_PROJECTBASEDIR" \
223223
$LAUNCHER_CLASS \
224224
$MAVEN_ARGS \

apache-maven/src/assembly/maven/bin/mvn.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ if "%MAVEN_MAIN_CLASS%"=="" @set MAVEN_MAIN_CLASS=org.apache.maven.cling.MavenCl
214214
"-Dclassworlds.conf=%CLASSWORLDS_CONF%" ^
215215
"-Dmaven.home=%MAVEN_HOME%" ^
216216
"-Dmaven.mainClass=%MAVEN_MAIN_CLASS%" ^
217-
"-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native" ^
217+
"-Dlibrary.jline.path=%MAVEN_HOME%\lib\jline-native" ^
218218
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
219219
%LAUNCHER_CLASS% ^
220220
%MAVEN_ARGS% ^

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

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
This directory contains JLine native libraries extracted from JLine JAR.
2+
3+
You can add your own build for platforms not natively supported by JLine.
4+
See here [1] on how to compile for your platform and here [2] how libraries
5+
follow JLine's directory and filename conventions.
6+
7+
[1] https://github.com/jline/jline3/tree/master/native
8+
[2] https://github.com/jline/jline3/blob/master/native/src/main/java/org/jline/nativ/OSInfo.java

0 commit comments

Comments
 (0)