Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7172] Remove expansion of Jansi native libraries

This commit is contained in:
rfscholte 2021-06-24 19:24:54 +02:00
parent 6b56fc8424
commit 6bed162a65
5 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apache-maven/pom.xml
View File

@ -148,22 +148,6 @@ 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/**</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>

8
apache-maven/src/assembly/maven/component.xml
View File

@ -63,14 +63,6 @@ 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>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>src/assembly/maven/bin</directory>
<outputDirectory>bin</outputDirectory>

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

@ -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.

2
apache-maven/src/assembly/shared/mvnlauncher
View File

@ -1,4 +1,4 @@
LAUNCHER_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
MAVEN_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
MAVENHOME_CONFIG=`echo "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" "-Dmaven.home=${MAVEN_HOME}" "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native"`
MAVENHOME_CONFIG=`echo "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" "-Dmaven.home=${MAVEN_HOME}"`

2
apache-maven/src/assembly/shared/mvnlauncher.cmd
View File

@ -1,4 +1,4 @@
for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set LAUNCHER_JAR="%%i"
set MAVEN_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
set MAVENHOME_CONFIG="-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" "-Dmaven.home=%MAVEN_HOME%" "-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native"
set MAVENHOME_CONFIG="-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" "-Dmaven.home=%MAVEN_HOME%"