diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index b0df64a370..b6b86aebd4 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -131,22 +131,6 @@ under the License. - - org.apache.maven.plugins - maven-dependency-plugin - - jansi - META-INF/native/** - - - - unpack-jansi-native - - unpack-dependencies - - - - org.apache.maven.plugins maven-compiler-plugin diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index a554c66176..1d429303a6 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 50dafc7689..b8367f61e3 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 22857a64ef..0000000000 --- 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 fab2c55c5d..4f9ff16628 100644 --- a/apache-maven/src/main/assembly/component.xml +++ b/apache-maven/src/main/assembly/component.xml @@ -62,14 +62,6 @@ under the License. ** - - target/dependency/META-INF/native - lib/jansi-native - - ** - - 0755 - src/bin bin