Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MNG-7254] Expand Windows native libraries for Jansi due to JDK-81951… #542

Closed
wants to merge 1 commit into from
Closed

[MNG-7254] Expand Windows native libraries for Jansi due to JDK-81951… #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions apache-maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,22 @@ under the License.
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<includeArtifactIds>jansi</includeArtifactIds>
<includes>org/fusesource/jansi/internal/native/Windows/**</includes>
</configuration>
<executions>
<execution>
<id>unpack-jansi-native</id>
<goals>
<goal>unpack-dependencies</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
1 change: 1 addition & 0 deletions apache-maven/src/bin/mvn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,5 +197,6 @@ exec "$JAVACMD" \
-classpath "${CLASSWORLDS_JAR}" \
"-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
"-Dmaven.home=${MAVEN_HOME}" \
"-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${CLASSWORLDS_LAUNCHER} "$@"
1 change: 1 addition & 0 deletions apache-maven/src/bin/mvn.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-classpath %CLASSWORLDS_JAR% ^
"-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^
"-Dmaven.home=%MAVEN_HOME%" ^
"-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native" ^
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
%CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
Expand Down
8 changes: 8 additions & 0 deletions apache-maven/src/lib/jansi-native/README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
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 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
Binary file added apache-maven/src/main/assembly/.component.xml.swp
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions apache-maven/src/main/assembly/component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ under the License.
<include>**</include>
</includes>
</fileSet>
<fileSet>
<directory>target/dependency/org/fusesource/jansi/internal/native</directory>
<outputDirectory>lib/jansi-native</outputDirectory>
<includes>
<include>**</include>
</includes>
</fileSet>
<fileSet>
<directory>src/bin</directory>
<outputDirectory>bin</outputDirectory>
Expand Down