mirror of https://github.com/apache/maven.git
[MNG-7172] Remove expansion of Jansi native libraries
This commit is contained in:
parent
14ff5dd0da
commit
73f34c00d1
|
@ -131,22 +131,6 @@ under the License.
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<includeArtifactIds>jansi</includeArtifactIds>
|
|
||||||
<includes>META-INF/native/**</includes>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>unpack-jansi-native</id>
|
|
||||||
<goals>
|
|
||||||
<goal>unpack-dependencies</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
|
|
@ -194,6 +194,5 @@ exec "$JAVACMD" \
|
||||||
-classpath "${CLASSWORLDS_JAR}" \
|
-classpath "${CLASSWORLDS_JAR}" \
|
||||||
"-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
|
"-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
|
||||||
"-Dmaven.home=${MAVEN_HOME}" \
|
"-Dmaven.home=${MAVEN_HOME}" \
|
||||||
"-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
|
|
||||||
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
|
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
|
||||||
${CLASSWORLDS_LAUNCHER} "$@"
|
${CLASSWORLDS_LAUNCHER} "$@"
|
||||||
|
|
|
@ -175,7 +175,6 @@ set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
|
||||||
-classpath %CLASSWORLDS_JAR% ^
|
-classpath %CLASSWORLDS_JAR% ^
|
||||||
"-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^
|
"-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^
|
||||||
"-Dmaven.home=%MAVEN_HOME%" ^
|
"-Dmaven.home=%MAVEN_HOME%" ^
|
||||||
"-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native" ^
|
|
||||||
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
|
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
|
||||||
%CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
|
%CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
|
||||||
if ERRORLEVEL 1 goto error
|
if ERRORLEVEL 1 goto error
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
This directory contains Jansi native libraries, extracted from Jansi jar.
|
|
||||||
|
|
||||||
You can add your own extensions for platforms not natively supported by
|
|
||||||
Jansi: the libraries follow HawtJNI directory and filename conventions.
|
|
||||||
See http://fusesource.github.io/hawtjni/documentation/api/org/fusesource/hawtjni/runtime/Library.html
|
|
||||||
|
|
||||||
See https://github.com/fusesource/jansi-native for native lib source.
|
|
|
@ -62,14 +62,6 @@ under the License.
|
||||||
<include>**</include>
|
<include>**</include>
|
||||||
</includes>
|
</includes>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
<fileSet>
|
|
||||||
<directory>target/dependency/META-INF/native</directory>
|
|
||||||
<outputDirectory>lib/jansi-native</outputDirectory>
|
|
||||||
<includes>
|
|
||||||
<include>**</include>
|
|
||||||
</includes>
|
|
||||||
<fileMode>0755</fileMode>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
<fileSet>
|
||||||
<directory>src/bin</directory>
|
<directory>src/bin</directory>
|
||||||
<outputDirectory>bin</outputDirectory>
|
<outputDirectory>bin</outputDirectory>
|
||||||
|
|
Loading…
Reference in New Issue