This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 3.8.x/jansi-and-stuff in repository https://gitbox.apache.org/repos/asf/maven.git
commit 73f34c00d16c24edb0e5f9d7eb63bc0c730a72d1 Author: rfscholte <[email protected]> AuthorDate: Thu Jun 24 19:24:54 2021 +0200 [MNG-7172] Remove expansion of Jansi native libraries --- apache-maven/pom.xml | 16 ---------------- apache-maven/src/bin/mvn | 1 - apache-maven/src/bin/mvn.cmd | 1 - apache-maven/src/lib/jansi-native/README.txt | 7 ------- apache-maven/src/main/assembly/component.xml | 8 -------- 5 files changed, 33 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index b0df64a..b6b86ae 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -133,22 +133,6 @@ under the License. <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> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <executions> <execution> diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index a554c66..1d42930 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -194,6 +194,5 @@ 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} "$@" diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index 50dafc7..b8367f6 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -175,7 +175,6 @@ 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 diff --git a/apache-maven/src/lib/jansi-native/README.txt b/apache-maven/src/lib/jansi-native/README.txt deleted file mode 100644 index 22857a6..0000000 --- a/apache-maven/src/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/main/assembly/component.xml b/apache-maven/src/main/assembly/component.xml index fab2c55..4f9ff16 100644 --- a/apache-maven/src/main/assembly/component.xml +++ b/apache-maven/src/main/assembly/component.xml @@ -63,14 +63,6 @@ under the License. </includes> </fileSet> <fileSet> - <directory>target/dependency/META-INF/native</directory> - <outputDirectory>lib/jansi-native</outputDirectory> - <includes> - <include>**</include> - </includes> - <fileMode>0755</fileMode> - </fileSet> - <fileSet> <directory>src/bin</directory> <outputDirectory>bin</outputDirectory> <includes>
