mirror of https://github.com/apache/maven.git
[MNG-7254] Expand Windows native libraries for Jansi due to JDK-8195129 (workaround)
This closes #542
This commit is contained in:
parent
d1aa1e1f0a
commit
8c66edc041
|
@ -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>
|
||||
|
|
|
@ -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} "$@"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 not shown.
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue