This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-7172
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-7172 by this push:
new 79f4bac [MNG-7172] Remove pre-unpacked jansi-native libraries from Maven distributions
79f4bac is described below
commit 79f4bac15487de6456ac380fcd318f03484ad331
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Jun 21 21:13:32 2021 +0200
[MNG-7172] Remove pre-unpacked jansi-native libraries from Maven distributions
---
apache-maven/pom.xml | 17 -----------------
.../src/assembly/maven/lib/jansi-native/README.txt | 7 -------
apache-maven/src/assembly/shared/mvnlauncher | 2 +-
apache-maven/src/assembly/shared/mvnlauncher.cmd | 2 +-
4 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 04de92a..c69ad08 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -150,23 +150,6 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <includeArtifactIds>jansi</includeArtifactIds>
- <includes>org/fusesource/jansi/internal/native/**</includes>
- <excludes>org/fusesource/jansi/internal/native/Mac/**</excludes>
- </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>
<executions>
<execution>
diff --git a/apache-maven/src/assembly/maven/lib/jansi-native/README.txt b/apache-maven/src/assembly/maven/lib/jansi-native/README.txt
deleted file mode 100644
index 22857a6..0000000
--- a/apache-maven/src/assembly/maven/lib/jansi-native/README.txt
+++ /dev/null
@@ -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.
diff --git a/apache-maven/src/assembly/shared/mvnlauncher b/apache-maven/src/assembly/shared/mvnlauncher
index 488ed63..444ffed 100644
--- a/apache-maven/src/assembly/shared/mvnlauncher
+++ b/apache-maven/src/assembly/shared/mvnlauncher
@@ -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}"
diff --git a/apache-maven/src/assembly/shared/mvnlauncher.cmd b/apache-maven/src/assembly/shared/mvnlauncher.cmd
index 71af6fe..d9a9687 100644
--- a/apache-maven/src/assembly/shared/mvnlauncher.cmd
+++ b/apache-maven/src/assembly/shared/mvnlauncher.cmd
@@ -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%"