diff --git a/.idea/modules.xml b/.idea/modules.xml index 0f9743c2b77f..d4c3b7080c1c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -183,7 +183,7 @@ - + diff --git a/build/conf/classVersions.txt b/build/conf/classVersions.txt index 369b0cd98a3d..3e163499086d 100644 --- a/build/conf/classVersions.txt +++ b/build/conf/classVersions.txt @@ -53,7 +53,7 @@ 1.6 => plugins/maven/lib/maven2-server-impl.jar 1.6 => plugins/maven/lib/maven3-server-common.jar 1.6 => plugins/maven/lib/maven30-server-impl.jar -1.6 => plugins/maven/lib/maven32-server-impl.jar +1.6 => plugins/maven/lib/maven3-server-impl.jar 1.6 => plugins/maven/lib/artifact-resolver-m2.jar 1.6 => plugins/maven/lib/artifact-resolver-m3.jar 1.6 => plugins/maven/lib/artifact-resolver-m31.jar diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 121753231d21..862393a845c3 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -350,8 +350,8 @@ public def layoutCommunityPlugins(String home, BuildContext buildContext = null) jar("maven30-server-impl.jar") { module("maven30-server-impl") } - jar("maven32-server-impl.jar") { - module("maven32-server-impl") + jar("maven3-server-impl.jar") { + module("maven3-server-impl") } jar("artifact-resolver-m2.jar") { @@ -373,7 +373,7 @@ public def layoutCommunityPlugins(String home, BuildContext buildContext = null) fileset(dir: "$home/plugins/maven/maven3-server-common/lib") {include(name: "*.jar")} } dir("maven3") { - fileset(dir: "$home/plugins/maven/maven30-server-impl/lib/maven3") + fileset(dir: "$home/plugins/maven/maven3-server-impl/lib/maven3") } dir("maven2-server-lib") { diff --git a/plugins/maven/maven32-server-impl/lib/maven32/LICENSE b/plugins/maven/maven3-server-impl/lib/maven3/LICENSE similarity index 88% rename from plugins/maven/maven32-server-impl/lib/maven32/LICENSE rename to plugins/maven/maven3-server-impl/lib/maven3/LICENSE index 2079ebc7bc35..d056b49ce884 100644 --- a/plugins/maven/maven32-server-impl/lib/maven32/LICENSE +++ b/plugins/maven/maven3-server-impl/lib/maven3/LICENSE @@ -216,73 +216,79 @@ JSR-250 Common Annotations for the JavaTM Platform (http://jcp.org/aboutJava/com CDI APIs (http://www.seamframework.org/Weld/cdi-api) javax.enterprise:cdi-api:jar:1.0 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 (lib/cdi-api.license) -Maven Aether Provider (http://maven.apache.org/ref/3.2.5/maven-aether-provider) org.apache.maven:maven-aether-provider:jar:3.2.5 +Apache Commons Lang (http://commons.apache.org/proper/commons-lang/) org.apache.commons:commons-lang3:jar:3.4 + License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/commons-lang3.license) + +Maven Aether Provider (http://maven.apache.org/ref/3.3.9/maven-aether-provider/) org.apache.maven:maven-aether-provider:jar:3.3.9 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-aether-provider.license) -Maven Artifact (http://maven.apache.org/ref/3.2.5/maven-artifact) org.apache.maven:maven-artifact:jar:3.2.5 +Maven Artifact (http://maven.apache.org/ref/3.3.9/maven-artifact/) org.apache.maven:maven-artifact:jar:3.3.9 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-artifact.license) -Maven Compat (http://maven.apache.org/ref/3.2.5/maven-compat) org.apache.maven:maven-compat:jar:3.2.5 +Maven Builder Support (http://maven.apache.org/ref/3.3.9/maven-builder-support/) org.apache.maven:maven-builder-support:jar:3.3.9 + License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-builder-support.license) + +Maven Compat (http://maven.apache.org/ref/3.3.9/maven-compat/) org.apache.maven:maven-compat:jar:3.3.9 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-compat.license) -Maven Core (http://maven.apache.org/ref/3.2.5/maven-core) org.apache.maven:maven-core:jar:3.2.5 +Maven Core (http://maven.apache.org/ref/3.3.9/maven-core/) org.apache.maven:maven-core:jar:3.3.9 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-core.license) -Maven Embedder (http://maven.apache.org/ref/3.2.5/maven-embedder) org.apache.maven:maven-embedder:jar:3.2.5 +Maven Embedder (http://maven.apache.org/ref/3.3.9/maven-embedder/) org.apache.maven:maven-embedder:jar:3.3.9 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-embedder.license) -Maven Model (http://maven.apache.org/ref/3.2.5/maven-model) org.apache.maven:maven-model:jar:3.2.5 +Maven Model (http://maven.apache.org/ref/3.3.9/maven-model/) org.apache.maven:maven-model:jar:3.3.9 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-model.license) -Maven Model Builder (http://maven.apache.org/ref/3.2.5/maven-model-builder) org.apache.maven:maven-model-builder:jar:3.2.5 +Maven Model Builder (http://maven.apache.org/ref/3.3.9/maven-model-builder/) org.apache.maven:maven-model-builder:jar:3.3.9 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-model-builder.license) -Maven Plugin API (http://maven.apache.org/ref/3.2.5/maven-plugin-api) org.apache.maven:maven-plugin-api:jar:3.2.5 +Maven Plugin API (http://maven.apache.org/ref/3.3.9/maven-plugin-api/) org.apache.maven:maven-plugin-api:jar:3.3.9 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-plugin-api.license) -Maven Repository Metadata Model (http://maven.apache.org/ref/3.2.5/maven-repository-metadata) org.apache.maven:maven-repository-metadata:jar:3.2.5 +Maven Repository Metadata Model (http://maven.apache.org/ref/3.3.9/maven-repository-metadata/) org.apache.maven:maven-repository-metadata:jar:3.3.9 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-repository-metadata.license) -Maven Settings (http://maven.apache.org/ref/3.2.5/maven-settings) org.apache.maven:maven-settings:jar:3.2.5 +Maven Settings (http://maven.apache.org/ref/3.3.9/maven-settings/) org.apache.maven:maven-settings:jar:3.3.9 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-settings.license) -Maven Settings Builder (http://maven.apache.org/ref/3.2.5/maven-settings-builder) org.apache.maven:maven-settings-builder:jar:3.2.5 +Maven Settings Builder (http://maven.apache.org/ref/3.3.9/maven-settings-builder/) org.apache.maven:maven-settings-builder:jar:3.3.9 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/maven-settings-builder.license) -Apache Maven Wagon :: Providers :: File Provider (http://maven.apache.org/wagon/wagon-providers/wagon-file) org.apache.maven.wagon:wagon-file:jar:2.8 +Apache Maven Wagon :: Providers :: File Provider (http://maven.apache.org/wagon/wagon-providers/wagon-file) org.apache.maven.wagon:wagon-file:jar:2.10 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/wagon-file.license) -Apache Maven Wagon :: Providers :: HTTP Provider (http://maven.apache.org/wagon/wagon-providers/wagon-http) org.apache.maven.wagon:wagon-http:jar:2.8 +Apache Maven Wagon :: Providers :: HTTP Provider (http://maven.apache.org/wagon/wagon-providers/wagon-http) org.apache.maven.wagon:wagon-http:jar:2.10 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/wagon-http.license) -Apache Maven Wagon :: Providers :: HTTP Shared Library (http://maven.apache.org/wagon/wagon-providers/wagon-http-shared) org.apache.maven.wagon:wagon-http-shared:jar:2.8 +Apache Maven Wagon :: Providers :: HTTP Shared Library (http://maven.apache.org/wagon/wagon-providers/wagon-http-shared) org.apache.maven.wagon:wagon-http-shared:jar:2.10 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/wagon-http-shared.license) -Apache Maven Wagon :: API (http://maven.apache.org/wagon/wagon-provider-api) org.apache.maven.wagon:wagon-provider-api:jar:2.8 +Apache Maven Wagon :: API (http://maven.apache.org/wagon/wagon-provider-api) org.apache.maven.wagon:wagon-provider-api:jar:2.10 License: Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt (lib/wagon-provider-api.license) -Aether API (http://www.eclipse.org/aether/aether-api/) org.eclipse.aether:aether-api:jar:1.0.0.v20140518 +Aether API (http://www.eclipse.org/aether/aether-api/) org.eclipse.aether:aether-api:jar:1.0.2.v20150114 License: Eclipse Public License, Version 1.0 http://www.eclipse.org/legal/epl-v10.html (lib/aether-api.license) -Aether Connector Basic (http://www.eclipse.org/aether/aether-connector-basic/) org.eclipse.aether:aether-connector-basic:jar:1.0.0.v20140518 +Aether Connector Basic (http://www.eclipse.org/aether/aether-connector-basic/) org.eclipse.aether:aether-connector-basic:jar:1.0.2.v20150114 License: Eclipse Public License, Version 1.0 http://www.eclipse.org/legal/epl-v10.html (lib/aether-connector-basic.license) -Aether Implementation (http://www.eclipse.org/aether/aether-impl/) org.eclipse.aether:aether-impl:jar:1.0.0.v20140518 +Aether Implementation (http://www.eclipse.org/aether/aether-impl/) org.eclipse.aether:aether-impl:jar:1.0.2.v20150114 License: Eclipse Public License, Version 1.0 http://www.eclipse.org/legal/epl-v10.html (lib/aether-impl.license) -Aether SPI (http://www.eclipse.org/aether/aether-spi/) org.eclipse.aether:aether-spi:jar:1.0.0.v20140518 +Aether SPI (http://www.eclipse.org/aether/aether-spi/) org.eclipse.aether:aether-spi:jar:1.0.2.v20150114 License: Eclipse Public License, Version 1.0 http://www.eclipse.org/legal/epl-v10.html (lib/aether-spi.license) -Aether Transport Wagon (http://www.eclipse.org/aether/aether-transport-wagon/) org.eclipse.aether:aether-transport-wagon:jar:1.0.0.v20140518 +Aether Transport Wagon (http://www.eclipse.org/aether/aether-transport-wagon/) org.eclipse.aether:aether-transport-wagon:jar:1.0.2.v20150114 License: Eclipse Public License, Version 1.0 http://www.eclipse.org/legal/epl-v10.html (lib/aether-transport-wagon.license) -Aether Utilities (http://www.eclipse.org/aether/aether-util/) org.eclipse.aether:aether-util:jar:1.0.0.v20140518 +Aether Utilities (http://www.eclipse.org/aether/aether-util/) org.eclipse.aether:aether-util:jar:1.0.2.v20150114 License: Eclipse Public License, Version 1.0 http://www.eclipse.org/legal/epl-v10.html (lib/aether-util.license) -org.eclipse.sisu.inject (http://www.eclipse.org/sisu/org.eclipse.sisu.inject/) org.eclipse.sisu:org.eclipse.sisu.inject:eclipse-plugin:0.3.0.M1 +org.eclipse.sisu.inject (http://www.eclipse.org/sisu/org.eclipse.sisu.inject/) org.eclipse.sisu:org.eclipse.sisu.inject:eclipse-plugin:0.3.2 License: Eclipse Public License, Version 1.0 http://www.eclipse.org/legal/epl-v10.html (lib/org.eclipse.sisu.inject.license) -org.eclipse.sisu.plexus (http://www.eclipse.org/sisu/org.eclipse.sisu.plexus/) org.eclipse.sisu:org.eclipse.sisu.plexus:eclipse-plugin:0.3.0.M1 +org.eclipse.sisu.plexus (http://www.eclipse.org/sisu/org.eclipse.sisu.plexus/) org.eclipse.sisu:org.eclipse.sisu.plexus:eclipse-plugin:0.3.2 License: Eclipse Public License, Version 1.0 http://www.eclipse.org/legal/epl-v10.html (lib/org.eclipse.sisu.plexus.license) jsoup (http://jsoup.org/) org.jsoup:jsoup:jar:1.7.2 diff --git a/plugins/maven/maven32-server-impl/lib/maven32/NOTICE b/plugins/maven/maven3-server-impl/lib/maven3/NOTICE similarity index 71% rename from plugins/maven/maven32-server-impl/lib/maven32/NOTICE rename to plugins/maven/maven3-server-impl/lib/maven3/NOTICE index f785a90e3304..e6650ffc5327 100644 --- a/plugins/maven/maven32-server-impl/lib/maven32/NOTICE +++ b/plugins/maven/maven3-server-impl/lib/maven3/NOTICE @@ -1,6 +1,6 @@ Apache Maven Distribution -Copyright 2001-2014 The Apache Software Foundation +Copyright 2001-2015 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/plugins/maven/maven32-server-impl/lib/maven32/README.txt b/plugins/maven/maven3-server-impl/lib/maven3/README.txt similarity index 92% rename from plugins/maven/maven32-server-impl/lib/maven32/README.txt rename to plugins/maven/maven3-server-impl/lib/maven3/README.txt index 668fb31a82b8..b05080d65811 100644 --- a/plugins/maven/maven32-server-impl/lib/maven32/README.txt +++ b/plugins/maven/maven3-server-impl/lib/maven3/README.txt @@ -22,7 +22,7 @@ ------------------- JDK: - 1.6 or above (this is to execute Maven - it still allows you to build against 1.3 + 1.7 or above (this is to execute Maven - it still allows you to build against 1.3 and prior JDK's). Memory: No minimum requirement. @@ -31,8 +31,10 @@ that, additional disk space will be used for your local Maven repository. The size of your local repository will vary depending on usage but expect at least 500MB. Operating System: - No minimum requirement. Start up scripts are included as shell scripts and Windows - batch files. + Windows: + Windows 2000 or above. + Unix based systems (Linux, Solaris and Mac OS X) and others: + No minimum requirement. Installing Maven ---------------- diff --git a/plugins/maven/maven32-server-impl/lib/maven32/bin/m2.conf b/plugins/maven/maven3-server-impl/lib/maven3/bin/m2.conf similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/bin/m2.conf rename to plugins/maven/maven3-server-impl/lib/maven3/bin/m2.conf diff --git a/plugins/maven/maven32-server-impl/lib/maven32/bin/mvn b/plugins/maven/maven3-server-impl/lib/maven3/bin/mvn similarity index 80% rename from plugins/maven/maven32-server-impl/lib/maven32/bin/mvn rename to plugins/maven/maven3-server-impl/lib/maven3/bin/mvn index 1476eac84ccb..687562859955 100644 --- a/plugins/maven/maven32-server-impl/lib/maven32/bin/mvn +++ b/plugins/maven/maven3-server-impl/lib/maven3/bin/mvn @@ -57,33 +57,33 @@ case "`uname`" in # # Look for the Apple JDKs first to preserve the existing behaviour, and then look # for the new JDKs provided by Oracle. - # + # if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then # # Apple JDKs # export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home fi - + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then # # Apple JDKs # export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi - + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then # # Oracle JDKs # export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi + fi if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then # # Apple JDKs # - export JAVA_HOME=/usr/libexec/java_home + export JAVA_HOME=`/usr/libexec/java_home` fi ;; esac @@ -145,7 +145,12 @@ if [ -z "$JAVA_HOME" ]; then # readlink(1) is not available as standard on Solaris 10. readLink=`which readlink` if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - javaExecutable="`readlink -f \"$javaExecutable\"`" + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi javaHome="`dirname \"$javaExecutable\"`" javaHome=`expr "$javaHome" : '\(.*\)/bin'` JAVA_HOME="$javaHome" @@ -189,14 +194,51 @@ if $cygwin; then CLASSPATH=`cygpath --path --windows "$CLASSPATH"` fi -# Provide a "standardized" way to retrieve the CLI args that will +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + local basedir + local wdir + basedir="$(pwd)" + wdir="$(pwd)" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + wdir="$(cd "$wdir/.."; pwd)" + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-$(find_maven_basedir)}" +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch project base directory path to Windows format before +# executing Maven. Otherwise this will cause Maven not to consider it. +if $cygwin; then + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +export MAVEN_PROJECTBASEDIR + +# Provide a "standardized" way to retrieve the CLI args that will # work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$@" +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" export MAVEN_CMD_LINE_ARGS exec "$JAVACMD" \ $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ - "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ ${CLASSWORLDS_LAUNCHER} "$@" diff --git a/plugins/maven/maven32-server-impl/lib/maven32/bin/mvn.bat b/plugins/maven/maven3-server-impl/lib/maven3/bin/mvn.cmd similarity index 66% rename from plugins/maven/maven32-server-impl/lib/maven32/bin/mvn.bat rename to plugins/maven/maven3-server-impl/lib/maven3/bin/mvn.cmd index 954049281818..d35c1d204777 100644 --- a/plugins/maven/maven32-server-impl/lib/maven32/bin/mvn.bat +++ b/plugins/maven/maven3-server-impl/lib/maven3/bin/mvn.cmd @@ -43,14 +43,17 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") @REM Execute a user defined script before this one if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" :skipRcPre +@setlocal + set ERROR_CODE=0 -@REM set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" @setlocal -if "%OS%"=="WINNT" @setlocal +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal @REM ==== START VALIDATION ==== if not "%JAVA_HOME%" == "" goto OkJHome @@ -76,8 +79,7 @@ goto error :chkMHome if not "%M2_HOME%"=="" goto valMHome -if "%OS%"=="Windows_NT" SET "M2_HOME=%~dp0.." -if "%OS%"=="WINNT" SET "M2_HOME=%~dp0.." +SET "M2_HOME=%~dp0.." if not "%M2_HOME%"=="" goto valMHome echo. @@ -90,12 +92,12 @@ goto error :valMHome :stripMHome -if not "_%M2_HOME:~-1%"=="_\" goto checkMBat +if not "_%M2_HOME:~-1%"=="_\" goto checkMCmd set "M2_HOME=%M2_HOME:~0,-1%" goto stripMHome -:checkMBat -if exist "%M2_HOME%\bin\mvn.bat" goto init +:checkMCmd +if exist "%M2_HOME%\bin\mvn.cmd" goto init echo. echo Error: M2_HOME is set to an invalid directory. >&2 @@ -107,91 +109,70 @@ goto error @REM ==== END VALIDATION ==== :init -@REM Decide how to startup depending on the version of windows -@REM -- Windows NT with Novell Login -if "%OS%"=="WINNT" goto WinNTNovell - -@REM -- Win98ME -if NOT "%OS%"=="Windows_NT" goto Win9xArg - -:WinNTNovell - -@REM -- 4NT shell -if "%@eval[2+2]" == "4" goto 4NTArgs - -@REM -- Regular WinNT shell set MAVEN_CMD_LINE_ARGS=%* -goto endInit -@REM The 4NT Shell from jp software -:4NTArgs -set MAVEN_CMD_LINE_ARGS=%$ -goto endInit +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. -:Win9xArg -@REM Slurp the command line arguments. This loop allows for an unlimited number -@REM of agruments (up to the command line limit, anyway). -set MAVEN_CMD_LINE_ARGS= -:Win9xApp -if %1a==a goto endInit -set MAVEN_CMD_LINE_ARGS=%MAVEN_CMD_LINE_ARGS% %1 -shift -goto Win9xApp +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%\.mvn" goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +if "_%EXEC_DIR:~-1%"=="_\" set EXEC_DIR=%EXEC_DIR:~0,-1% + +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig -@REM Reaching here means variables are defined and arguments have been captured -:endInit SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -@REM -- 4NT shell -if "%@eval[2+2]" == "4" goto 4NTCWJars - -@REM -- Regular WinNT shell for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i" -goto runm2 -@REM The 4NT Shell from jp software -:4NTCWJars -for %%i in ("%M2_HOME%\boot\plexus-classworlds-*") do set CLASSWORLDS_JAR="%%i" -goto runm2 - -@REM Start MAVEN2 -:runm2 set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher -%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% if ERRORLEVEL 1 goto error goto end :error -if "%OS%"=="Windows_NT" @endlocal -if "%OS%"=="WINNT" @endlocal set ERROR_CODE=1 :end -@REM set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" goto endNT -if "%OS%"=="WINNT" goto endNT - -@REM For old DOS remove the set variables from ENV - we assume they were not set -@REM before we started - at least we don't leave any baggage around -set MAVEN_JAVA_EXE= -set MAVEN_CMD_LINE_ARGS= -goto postExec - -:endNT @endlocal & set ERROR_CODE=%ERROR_CODE% -:postExec - if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" :skipRcPost -@REM pause the batch file if MAVEN_BATCH_PAUSE is set to 'on' +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' if "%MAVEN_BATCH_PAUSE%" == "on" pause if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% -cmd /C exit /B %ERROR_CODE% - - +exit /B %ERROR_CODE% diff --git a/plugins/maven/maven3-server-impl/lib/maven3/bin/mvnDebug b/plugins/maven/maven3-server-impl/lib/maven3/bin/mvnDebug new file mode 100644 index 000000000000..a1077ce5dac4 --- /dev/null +++ b/plugins/maven/maven3-server-impl/lib/maven3/bin/mvnDebug @@ -0,0 +1,41 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +MAVEN_DEBUG_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" + +echo Preparing to Execute Maven in Debug Mode + +env MAVEN_OPTS="$MAVEN_OPTS" MAVEN_DEBUG_OPTS="$MAVEN_DEBUG_OPTS" $(dirname $0)/mvn "$@" diff --git a/plugins/maven/maven3-server-impl/lib/maven3/bin/mvnDebug.cmd b/plugins/maven/maven3-server-impl/lib/maven3/bin/mvnDebug.cmd new file mode 100644 index 000000000000..1f0d3bfb3b44 --- /dev/null +++ b/plugins/maven/maven3-server-impl/lib/maven3/bin/mvnDebug.cmd @@ -0,0 +1,31 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script to run mvn.cmd with the following additional +@REM Java VM settings: +@REM +@REM -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM +@REM ---------------------------------------------------------------------------- + +@setlocal +@set MAVEN_DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 + +@call "%~dp0"mvn.cmd %* diff --git a/plugins/maven/maven3-server-impl/lib/maven3/bin/mvnyjp b/plugins/maven/maven3-server-impl/lib/maven3/bin/mvnyjp new file mode 100644 index 000000000000..ef4f8e1d018c --- /dev/null +++ b/plugins/maven/maven3-server-impl/lib/maven3/bin/mvnyjp @@ -0,0 +1,42 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ ! -f "$YJPLIB" ]; then + echo "Error: Unable to autodetect the YJP library location. Please set YJPLIB variable" >&2 + exit 1 +fi + +env MAVEN_OPTS="-agentpath:$YJPLIB=onexit=snapshot,onexit=memory,tracing,onlylocal $MAVEN_OPTS" $(dirname $0)/mvn "$@" diff --git a/plugins/maven/maven32-server-impl/lib/maven32/boot/plexus-classworlds-2.5.2.jar b/plugins/maven/maven3-server-impl/lib/maven3/boot/plexus-classworlds-2.5.2.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/boot/plexus-classworlds-2.5.2.jar rename to plugins/maven/maven3-server-impl/lib/maven3/boot/plexus-classworlds-2.5.2.jar diff --git a/plugins/maven/maven32-server-impl/lib/maven32/conf/logging/simplelogger.properties b/plugins/maven/maven3-server-impl/lib/maven3/conf/logging/simplelogger.properties similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/conf/logging/simplelogger.properties rename to plugins/maven/maven3-server-impl/lib/maven3/conf/logging/simplelogger.properties diff --git a/plugins/maven/maven32-server-impl/lib/maven32/conf/settings.xml b/plugins/maven/maven3-server-impl/lib/maven3/conf/settings.xml similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/conf/settings.xml rename to plugins/maven/maven3-server-impl/lib/maven3/conf/settings.xml diff --git a/plugins/maven/maven3-server-impl/lib/maven3/conf/toolchains.xml b/plugins/maven/maven3-server-impl/lib/maven3/conf/toolchains.xml new file mode 100644 index 000000000000..aefddd8aa562 --- /dev/null +++ b/plugins/maven/maven3-server-impl/lib/maven3/conf/toolchains.xml @@ -0,0 +1,103 @@ + + + + + + + + + + \ No newline at end of file diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-api-1.0.0.v20140518.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-api-1.0.2.v20150114.jar similarity index 79% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-api-1.0.0.v20140518.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-api-1.0.2.v20150114.jar index d56498986f6b..c8adbaa2f115 100644 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-api-1.0.0.v20140518.jar and b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-api-1.0.2.v20150114.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-api.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-api.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-api.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-api.license diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-connector-basic-1.0.0.v20140518.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-connector-basic-1.0.2.v20150114.jar similarity index 81% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-connector-basic-1.0.0.v20140518.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-connector-basic-1.0.2.v20150114.jar index 7a0045a97167..b5d7735a3e47 100644 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-connector-basic-1.0.0.v20140518.jar and b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-connector-basic-1.0.2.v20150114.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-connector-basic.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-connector-basic.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-connector-basic.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-connector-basic.license diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-impl-1.0.0.v20140518.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-impl-1.0.2.v20150114.jar similarity index 79% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-impl-1.0.0.v20140518.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-impl-1.0.2.v20150114.jar index 414199d7a90e..f7643151cf98 100644 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-impl-1.0.0.v20140518.jar and b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-impl-1.0.2.v20150114.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-impl.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-impl.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-impl.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-impl.license diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-spi-1.0.0.v20140518.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-spi-1.0.2.v20150114.jar similarity index 66% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-spi-1.0.0.v20140518.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-spi-1.0.2.v20150114.jar index 4f3fd700e1f0..59c0935ddcf8 100644 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-spi-1.0.0.v20140518.jar and b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-spi-1.0.2.v20150114.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-spi.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-spi.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-spi.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-spi.license diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-transport-wagon-1.0.0.v20140518.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-transport-wagon-1.0.2.v20150114.jar similarity index 72% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-transport-wagon-1.0.0.v20140518.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-transport-wagon-1.0.2.v20150114.jar index 43c31edc8f07..51498ee7c533 100644 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-transport-wagon-1.0.0.v20140518.jar and b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-transport-wagon-1.0.2.v20150114.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-transport-wagon.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-transport-wagon.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-transport-wagon.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-transport-wagon.license diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-util-1.0.0.v20140518.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-util-1.0.2.v20150114.jar similarity index 84% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-util-1.0.0.v20140518.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-util-1.0.2.v20150114.jar index ceca79ac8a46..fce3fff8c764 100644 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-util-1.0.0.v20140518.jar and b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-util-1.0.2.v20150114.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aether-util.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/aether-util.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aether-util.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aether-util.license diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/aopalliance-1.0.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/aopalliance-1.0.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/aopalliance-1.0.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/aopalliance-1.0.jar diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/cdi-api-1.0.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/cdi-api-1.0.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/cdi-api-1.0.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/cdi-api-1.0.jar diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/cdi-api.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/cdi-api.license new file mode 100644 index 000000000000..71521bc8314b --- /dev/null +++ b/plugins/maven/maven3-server-impl/lib/maven3/lib/cdi-api.license @@ -0,0 +1,410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Apache License, Version 2.0 + + + + + + + + + + + + +
+ +
+ +
+
+
+ Apache Logo +
+
+
+ + +
+ The Apache Way + Contribute + ASF Sponsors +
+
+
+
+

Apache License

Version 2.0, January 2004

+http://www.apache.org/licenses/

+

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+

1. Definitions.

+

"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document.

+

"Licensor" shall mean the copyright owner or entity authorized by the +copyright owner that is granting the License.

+

"Legal Entity" shall mean the union of the acting entity and all other +entities that control, are controlled by, or are under common control with +that entity. For the purposes of this definition, "control" means (i) the +power, direct or indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (ii) ownership of fifty +percent (50%) or more of the outstanding shares, or (iii) beneficial +ownership of such entity.

+

"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License.

+

"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, +and configuration files.

+

"Object" form shall mean any form resulting from mechanical transformation +or translation of a Source form, including but not limited to compiled +object code, generated documentation, and conversions to other media types.

+

"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice that +is included in or attached to the work (an example is provided in the +Appendix below).

+

"Derivative Works" shall mean any work, whether in Source or Object form, +that is based on (or derived from) the Work and for which the editorial +revisions, annotations, elaborations, or other modifications represent, as +a whole, an original work of authorship. For the purposes of this License, +Derivative Works shall not include works that remain separable from, or +merely link (or bind by name) to the interfaces of, the Work and Derivative +Works thereof.

+

"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor for +inclusion in the Work by the copyright owner or by an individual or Legal +Entity authorized to submit on behalf of the copyright owner. For the +purposes of this definition, "submitted" means any form of electronic, +verbal, or written communication sent to the Licensor or its +representatives, including but not limited to communication on electronic +mailing lists, source code control systems, and issue tracking systems that +are managed by, or on behalf of, the Licensor for the purpose of discussing +and improving the Work, but excluding communication that is conspicuously +marked or otherwise designated in writing by the copyright owner as "Not a +Contribution."

+

"Contributor" shall mean Licensor and any individual or Legal Entity on +behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work.

+

2. Grant of Copyright License. Subject to the +terms and conditions of this License, each Contributor hereby grants to You +a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, publicly +display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form.

+

3. Grant of Patent License. Subject to the terms +and conditions of this License, each Contributor hereby grants to You a +perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, use, +offer to sell, sell, import, and otherwise transfer the Work, where such +license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by +combination of their Contribution(s) with the Work to which such +Contribution(s) was submitted. If You institute patent litigation against +any entity (including a cross-claim or counterclaim in a lawsuit) alleging +that the Work or a Contribution incorporated within the Work constitutes +direct or contributory patent infringement, then any patent licenses +granted to You under this License for that Work shall terminate as of the +date such litigation is filed.

+

4. Redistribution. You may reproduce and +distribute copies of the Work or Derivative Works thereof in any medium, +with or without modifications, and in Source or Object form, provided that +You meet the following conditions:

+
    +
  1. You must give any other recipients of the Work or Derivative Works a +copy of this License; and
  2. + +
  3. You must cause any modified files to carry prominent notices stating +that You changed the files; and
  4. + +
  5. You must retain, in the Source form of any Derivative Works that You +distribute, all copyright, patent, trademark, and attribution notices from +the Source form of the Work, excluding those notices that do not pertain to +any part of the Derivative Works; and
  6. + +
  7. If the Work includes a "NOTICE" text file as part of its distribution, +then any Derivative Works that You distribute must include a readable copy +of the attribution notices contained within such NOTICE file, excluding +those notices that do not pertain to any part of the Derivative Works, in +at least one of the following places: within a NOTICE text file distributed +as part of the Derivative Works; within the Source form or documentation, +if provided along with the Derivative Works; or, within a display generated +by the Derivative Works, if and wherever such third-party notices normally +appear. The contents of the NOTICE file are for informational purposes only +and do not modify the License. You may add Your own attribution notices +within Derivative Works that You distribute, alongside or as an addendum to +the NOTICE text from the Work, provided that such additional attribution +notices cannot be construed as modifying the License. +
    +
    +You may add Your own copyright statement to Your modifications and may +provide additional or different license terms and conditions for use, +reproduction, or distribution of Your modifications, or for any such +Derivative Works as a whole, provided Your use, reproduction, and +distribution of the Work otherwise complies with the conditions stated in +this License. +
  8. + +
+ +

5. Submission of Contributions. Unless You +explicitly state otherwise, any Contribution intentionally submitted for +inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the +terms of any separate license agreement you may have executed with Licensor +regarding such Contributions.

+

6. Trademarks. This License does not grant +permission to use the trade names, trademarks, service marks, or product +names of the Licensor, except as required for reasonable and customary use +in describing the origin of the Work and reproducing the content of the +NOTICE file.

+

7. Disclaimer of Warranty. Unless required by +applicable law or agreed to in writing, Licensor provides the Work (and +each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, +without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You +are solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise +of permissions under this License.

+

8. Limitation of Liability. In no event and +under no legal theory, whether in tort (including negligence), contract, or +otherwise, unless required by applicable law (such as deliberate and +grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a result +of this License or out of the use or inability to use the Work (including +but not limited to damages for loss of goodwill, work stoppage, computer +failure or malfunction, or any and all other commercial damages or losses), +even if such Contributor has been advised of the possibility of such +damages.

+

9. Accepting Warranty or Additional Liability. +While redistributing the Work or Derivative Works thereof, You may choose +to offer, and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this License. +However, in accepting such obligations, You may act only on Your own behalf +and on Your sole responsibility, not on behalf of any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor +harmless for any liability incurred by, or claims asserted against, such +Contributor by reason of your accepting any such warranty or additional +liability.

+

END OF TERMS AND CONDITIONS

+

APPENDIX: How to apply the Apache License to your work

+

To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets "[]" replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included +on the same "printed page" as the copyright notice for easier +identification within third-party archives.

+
Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ + + + + + + + + + + diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/commons-cli-1.2.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/commons-cli-1.2.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/commons-cli-1.2.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/commons-cli-1.2.jar diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/commons-io-2.2.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/commons-io-2.2.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/commons-io-2.2.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/commons-io-2.2.jar diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/commons-lang-2.6.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/commons-lang-2.6.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/commons-lang-2.6.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/commons-lang-2.6.jar diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/commons-lang3-3.4.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/commons-lang3-3.4.jar new file mode 100644 index 000000000000..8ec91d454c31 Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/commons-lang3-3.4.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-aether-provider.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/commons-lang3.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/maven-aether-provider.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/commons-lang3.license diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/ext/README.txt b/plugins/maven/maven3-server-impl/lib/maven3/lib/ext/README.txt similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/ext/README.txt rename to plugins/maven/maven3-server-impl/lib/maven3/lib/ext/README.txt diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/guava-18.0.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/guava-18.0.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/guava-18.0.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/guava-18.0.jar diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/guice-4.0-no_aop.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/guice-4.0-no_aop.jar new file mode 100644 index 000000000000..6b09fa0f8705 Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/guice-4.0-no_aop.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/javax.inject-1.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/javax.inject-1.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/javax.inject-1.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/javax.inject-1.jar diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/jsoup-1.7.2.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/jsoup-1.7.2.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/jsoup-1.7.2.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/jsoup-1.7.2.jar diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/jsoup.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/jsoup.license similarity index 80% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/jsoup.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/jsoup.license index 061928a8eb3a..d583bb1662e3 100644 --- a/plugins/maven/maven32-server-impl/lib/maven32/lib/jsoup.license +++ b/plugins/maven/maven3-server-impl/lib/maven3/lib/jsoup.license @@ -1,22 +1,21 @@ - + jsoup License - - + ga('create', 'UA-89734-10', 'auto'); + ga('send', 'pageview'); + +
@@ -43,7 +42,7 @@

jsoup License

The jsoup code-base (include source and compiled packages) are distributed under the open source MIT license as described below.

The MIT License

-

Copyright © 2009 - 2014 Jonathan Hedley (jonathan@hedley.net)

+

Copyright © 2009 - 2013 Jonathan Hedley (jonathan@hedley.net)

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

@@ -55,7 +54,7 @@
@@ -63,4 +62,4 @@ - + \ No newline at end of file diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/jsr250-api-1.0.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/jsr250-api-1.0.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/jsr250-api-1.0.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/jsr250-api-1.0.jar diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/jsr250-api.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/jsr250-api.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/jsr250-api.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/jsr250-api.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-aether-provider-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-aether-provider-3.3.9.jar new file mode 100644 index 000000000000..9f081209a8fd Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-aether-provider-3.3.9.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-artifact.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-aether-provider.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/maven-artifact.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-aether-provider.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-artifact-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-artifact-3.3.9.jar new file mode 100644 index 000000000000..eaf7d4dbdb3c Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-artifact-3.3.9.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-compat.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-artifact.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/maven-compat.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-artifact.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-builder-support-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-builder-support-3.3.9.jar new file mode 100644 index 000000000000..905c6ae7d28e Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-builder-support-3.3.9.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-core.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-builder-support.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/maven-core.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-builder-support.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-compat-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-compat-3.3.9.jar new file mode 100644 index 000000000000..e310b6127b71 Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-compat-3.3.9.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-embedder.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-compat.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/maven-embedder.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-compat.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-core-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-core-3.3.9.jar new file mode 100644 index 000000000000..337f62a6c51c Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-core-3.3.9.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-model-builder.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-core.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/maven-model-builder.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-core.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-embedder-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-embedder-3.3.9.jar new file mode 100644 index 000000000000..8321bf4aa3e5 Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-embedder-3.3.9.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-model.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-embedder.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/maven-model.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-embedder.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-3.3.9.jar new file mode 100644 index 000000000000..cb0e15c3dcab Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-3.3.9.jar differ diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-builder-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-builder-3.3.9.jar new file mode 100644 index 000000000000..c2e36413c6b2 Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-builder-3.3.9.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-plugin-api.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-builder.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/maven-plugin-api.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-builder.license diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-repository-metadata.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/maven-repository-metadata.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-plugin-api-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-plugin-api-3.3.9.jar new file mode 100644 index 000000000000..4418b5cfb29e Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-plugin-api-3.3.9.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-settings-builder.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-plugin-api.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/maven-settings-builder.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-plugin-api.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-repository-metadata-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-repository-metadata-3.3.9.jar new file mode 100644 index 000000000000..d1129e061c3f Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-repository-metadata-3.3.9.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-settings.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-repository-metadata.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/maven-settings.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-repository-metadata.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-3.3.9.jar new file mode 100644 index 000000000000..b3e2dc21637d Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-3.3.9.jar differ diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-builder-3.3.9.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-builder-3.3.9.jar new file mode 100644 index 000000000000..dd2d4007b96f Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-builder-3.3.9.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-file.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-builder.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-file.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-builder.license diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-http-shared.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-http-shared.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/org.eclipse.sisu.inject-0.3.2.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/org.eclipse.sisu.inject-0.3.2.jar new file mode 100644 index 000000000000..f9251b1adde6 Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/org.eclipse.sisu.inject-0.3.2.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/org.eclipse.sisu.inject.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/org.eclipse.sisu.inject.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/org.eclipse.sisu.inject.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/org.eclipse.sisu.inject.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/org.eclipse.sisu.plexus-0.3.2.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/org.eclipse.sisu.plexus-0.3.2.jar new file mode 100644 index 000000000000..e82b9bcaea46 Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/org.eclipse.sisu.plexus-0.3.2.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/org.eclipse.sisu.plexus.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/org.eclipse.sisu.plexus.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/org.eclipse.sisu.plexus.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/org.eclipse.sisu.plexus.license diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-cipher-1.7.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-cipher-1.7.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-cipher-1.7.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-cipher-1.7.jar diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-cipher.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-cipher.license new file mode 100644 index 000000000000..71521bc8314b --- /dev/null +++ b/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-cipher.license @@ -0,0 +1,410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Apache License, Version 2.0 + + + + + + + + + + + + +
+ +
+ +
+
+
+ Apache Logo +
+
+
+ + +
+ The Apache Way + Contribute + ASF Sponsors +
+
+
+
+

Apache License

Version 2.0, January 2004

+http://www.apache.org/licenses/

+

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+

1. Definitions.

+

"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document.

+

"Licensor" shall mean the copyright owner or entity authorized by the +copyright owner that is granting the License.

+

"Legal Entity" shall mean the union of the acting entity and all other +entities that control, are controlled by, or are under common control with +that entity. For the purposes of this definition, "control" means (i) the +power, direct or indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (ii) ownership of fifty +percent (50%) or more of the outstanding shares, or (iii) beneficial +ownership of such entity.

+

"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License.

+

"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, +and configuration files.

+

"Object" form shall mean any form resulting from mechanical transformation +or translation of a Source form, including but not limited to compiled +object code, generated documentation, and conversions to other media types.

+

"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice that +is included in or attached to the work (an example is provided in the +Appendix below).

+

"Derivative Works" shall mean any work, whether in Source or Object form, +that is based on (or derived from) the Work and for which the editorial +revisions, annotations, elaborations, or other modifications represent, as +a whole, an original work of authorship. For the purposes of this License, +Derivative Works shall not include works that remain separable from, or +merely link (or bind by name) to the interfaces of, the Work and Derivative +Works thereof.

+

"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor for +inclusion in the Work by the copyright owner or by an individual or Legal +Entity authorized to submit on behalf of the copyright owner. For the +purposes of this definition, "submitted" means any form of electronic, +verbal, or written communication sent to the Licensor or its +representatives, including but not limited to communication on electronic +mailing lists, source code control systems, and issue tracking systems that +are managed by, or on behalf of, the Licensor for the purpose of discussing +and improving the Work, but excluding communication that is conspicuously +marked or otherwise designated in writing by the copyright owner as "Not a +Contribution."

+

"Contributor" shall mean Licensor and any individual or Legal Entity on +behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work.

+

2. Grant of Copyright License. Subject to the +terms and conditions of this License, each Contributor hereby grants to You +a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, publicly +display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form.

+

3. Grant of Patent License. Subject to the terms +and conditions of this License, each Contributor hereby grants to You a +perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, use, +offer to sell, sell, import, and otherwise transfer the Work, where such +license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by +combination of their Contribution(s) with the Work to which such +Contribution(s) was submitted. If You institute patent litigation against +any entity (including a cross-claim or counterclaim in a lawsuit) alleging +that the Work or a Contribution incorporated within the Work constitutes +direct or contributory patent infringement, then any patent licenses +granted to You under this License for that Work shall terminate as of the +date such litigation is filed.

+

4. Redistribution. You may reproduce and +distribute copies of the Work or Derivative Works thereof in any medium, +with or without modifications, and in Source or Object form, provided that +You meet the following conditions:

+
    +
  1. You must give any other recipients of the Work or Derivative Works a +copy of this License; and
  2. + +
  3. You must cause any modified files to carry prominent notices stating +that You changed the files; and
  4. + +
  5. You must retain, in the Source form of any Derivative Works that You +distribute, all copyright, patent, trademark, and attribution notices from +the Source form of the Work, excluding those notices that do not pertain to +any part of the Derivative Works; and
  6. + +
  7. If the Work includes a "NOTICE" text file as part of its distribution, +then any Derivative Works that You distribute must include a readable copy +of the attribution notices contained within such NOTICE file, excluding +those notices that do not pertain to any part of the Derivative Works, in +at least one of the following places: within a NOTICE text file distributed +as part of the Derivative Works; within the Source form or documentation, +if provided along with the Derivative Works; or, within a display generated +by the Derivative Works, if and wherever such third-party notices normally +appear. The contents of the NOTICE file are for informational purposes only +and do not modify the License. You may add Your own attribution notices +within Derivative Works that You distribute, alongside or as an addendum to +the NOTICE text from the Work, provided that such additional attribution +notices cannot be construed as modifying the License. +
    +
    +You may add Your own copyright statement to Your modifications and may +provide additional or different license terms and conditions for use, +reproduction, or distribution of Your modifications, or for any such +Derivative Works as a whole, provided Your use, reproduction, and +distribution of the Work otherwise complies with the conditions stated in +this License. +
  8. + +
+ +

5. Submission of Contributions. Unless You +explicitly state otherwise, any Contribution intentionally submitted for +inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the +terms of any separate license agreement you may have executed with Licensor +regarding such Contributions.

+

6. Trademarks. This License does not grant +permission to use the trade names, trademarks, service marks, or product +names of the Licensor, except as required for reasonable and customary use +in describing the origin of the Work and reproducing the content of the +NOTICE file.

+

7. Disclaimer of Warranty. Unless required by +applicable law or agreed to in writing, Licensor provides the Work (and +each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, +without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You +are solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise +of permissions under this License.

+

8. Limitation of Liability. In no event and +under no legal theory, whether in tort (including negligence), contract, or +otherwise, unless required by applicable law (such as deliberate and +grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a result +of this License or out of the use or inability to use the Work (including +but not limited to damages for loss of goodwill, work stoppage, computer +failure or malfunction, or any and all other commercial damages or losses), +even if such Contributor has been advised of the possibility of such +damages.

+

9. Accepting Warranty or Additional Liability. +While redistributing the Work or Derivative Works thereof, You may choose +to offer, and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this License. +However, in accepting such obligations, You may act only on Your own behalf +and on Your sole responsibility, not on behalf of any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor +harmless for any liability incurred by, or claims asserted against, such +Contributor by reason of your accepting any such warranty or additional +liability.

+

END OF TERMS AND CONDITIONS

+

APPENDIX: How to apply the Apache License to your work

+

To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets "[]" replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included +on the same "printed page" as the copyright notice for easier +identification within third-party archives.

+
Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ + + + + + + + + + + diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-component-annotations-1.6.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-component-annotations-1.6.jar new file mode 100644 index 000000000000..22e433d97520 Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-component-annotations-1.6.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-interpolation-1.21.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-interpolation-1.21.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-interpolation-1.21.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-interpolation-1.21.jar diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-sec-dispatcher-1.3.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-sec-dispatcher-1.3.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-sec-dispatcher-1.3.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-sec-dispatcher-1.3.jar diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-sec-dispatcher.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-sec-dispatcher.license new file mode 100644 index 000000000000..71521bc8314b --- /dev/null +++ b/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-sec-dispatcher.license @@ -0,0 +1,410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Apache License, Version 2.0 + + + + + + + + + + + + +
+ +
+ +
+
+
+ Apache Logo +
+
+
+ + +
+ The Apache Way + Contribute + ASF Sponsors +
+
+
+
+

Apache License

Version 2.0, January 2004

+http://www.apache.org/licenses/

+

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+

1. Definitions.

+

"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document.

+

"Licensor" shall mean the copyright owner or entity authorized by the +copyright owner that is granting the License.

+

"Legal Entity" shall mean the union of the acting entity and all other +entities that control, are controlled by, or are under common control with +that entity. For the purposes of this definition, "control" means (i) the +power, direct or indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (ii) ownership of fifty +percent (50%) or more of the outstanding shares, or (iii) beneficial +ownership of such entity.

+

"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License.

+

"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, +and configuration files.

+

"Object" form shall mean any form resulting from mechanical transformation +or translation of a Source form, including but not limited to compiled +object code, generated documentation, and conversions to other media types.

+

"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice that +is included in or attached to the work (an example is provided in the +Appendix below).

+

"Derivative Works" shall mean any work, whether in Source or Object form, +that is based on (or derived from) the Work and for which the editorial +revisions, annotations, elaborations, or other modifications represent, as +a whole, an original work of authorship. For the purposes of this License, +Derivative Works shall not include works that remain separable from, or +merely link (or bind by name) to the interfaces of, the Work and Derivative +Works thereof.

+

"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor for +inclusion in the Work by the copyright owner or by an individual or Legal +Entity authorized to submit on behalf of the copyright owner. For the +purposes of this definition, "submitted" means any form of electronic, +verbal, or written communication sent to the Licensor or its +representatives, including but not limited to communication on electronic +mailing lists, source code control systems, and issue tracking systems that +are managed by, or on behalf of, the Licensor for the purpose of discussing +and improving the Work, but excluding communication that is conspicuously +marked or otherwise designated in writing by the copyright owner as "Not a +Contribution."

+

"Contributor" shall mean Licensor and any individual or Legal Entity on +behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work.

+

2. Grant of Copyright License. Subject to the +terms and conditions of this License, each Contributor hereby grants to You +a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, publicly +display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form.

+

3. Grant of Patent License. Subject to the terms +and conditions of this License, each Contributor hereby grants to You a +perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, use, +offer to sell, sell, import, and otherwise transfer the Work, where such +license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by +combination of their Contribution(s) with the Work to which such +Contribution(s) was submitted. If You institute patent litigation against +any entity (including a cross-claim or counterclaim in a lawsuit) alleging +that the Work or a Contribution incorporated within the Work constitutes +direct or contributory patent infringement, then any patent licenses +granted to You under this License for that Work shall terminate as of the +date such litigation is filed.

+

4. Redistribution. You may reproduce and +distribute copies of the Work or Derivative Works thereof in any medium, +with or without modifications, and in Source or Object form, provided that +You meet the following conditions:

+
    +
  1. You must give any other recipients of the Work or Derivative Works a +copy of this License; and
  2. + +
  3. You must cause any modified files to carry prominent notices stating +that You changed the files; and
  4. + +
  5. You must retain, in the Source form of any Derivative Works that You +distribute, all copyright, patent, trademark, and attribution notices from +the Source form of the Work, excluding those notices that do not pertain to +any part of the Derivative Works; and
  6. + +
  7. If the Work includes a "NOTICE" text file as part of its distribution, +then any Derivative Works that You distribute must include a readable copy +of the attribution notices contained within such NOTICE file, excluding +those notices that do not pertain to any part of the Derivative Works, in +at least one of the following places: within a NOTICE text file distributed +as part of the Derivative Works; within the Source form or documentation, +if provided along with the Derivative Works; or, within a display generated +by the Derivative Works, if and wherever such third-party notices normally +appear. The contents of the NOTICE file are for informational purposes only +and do not modify the License. You may add Your own attribution notices +within Derivative Works that You distribute, alongside or as an addendum to +the NOTICE text from the Work, provided that such additional attribution +notices cannot be construed as modifying the License. +
    +
    +You may add Your own copyright statement to Your modifications and may +provide additional or different license terms and conditions for use, +reproduction, or distribution of Your modifications, or for any such +Derivative Works as a whole, provided Your use, reproduction, and +distribution of the Work otherwise complies with the conditions stated in +this License. +
  8. + +
+ +

5. Submission of Contributions. Unless You +explicitly state otherwise, any Contribution intentionally submitted for +inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the +terms of any separate license agreement you may have executed with Licensor +regarding such Contributions.

+

6. Trademarks. This License does not grant +permission to use the trade names, trademarks, service marks, or product +names of the Licensor, except as required for reasonable and customary use +in describing the origin of the Work and reproducing the content of the +NOTICE file.

+

7. Disclaimer of Warranty. Unless required by +applicable law or agreed to in writing, Licensor provides the Work (and +each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, +without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You +are solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise +of permissions under this License.

+

8. Limitation of Liability. In no event and +under no legal theory, whether in tort (including negligence), contract, or +otherwise, unless required by applicable law (such as deliberate and +grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a result +of this License or out of the use or inability to use the Work (including +but not limited to damages for loss of goodwill, work stoppage, computer +failure or malfunction, or any and all other commercial damages or losses), +even if such Contributor has been advised of the possibility of such +damages.

+

9. Accepting Warranty or Additional Liability. +While redistributing the Work or Derivative Works thereof, You may choose +to offer, and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this License. +However, in accepting such obligations, You may act only on Your own behalf +and on Your sole responsibility, not on behalf of any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor +harmless for any liability incurred by, or claims asserted against, such +Contributor by reason of your accepting any such warranty or additional +liability.

+

END OF TERMS AND CONDITIONS

+

APPENDIX: How to apply the Apache License to your work

+

To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets "[]" replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included +on the same "printed page" as the copyright notice for easier +identification within third-party archives.

+
Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ + + + + + + + + + + diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-utils-3.0.20.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-utils-3.0.22.jar similarity index 84% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-utils-3.0.20.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-utils-3.0.22.jar index d2f340b1d785..249976617e65 100644 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-utils-3.0.20.jar and b/plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-utils-3.0.22.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/slf4j-api-1.7.5.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/slf4j-api-1.7.5.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/slf4j-api-1.7.5.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/slf4j-api-1.7.5.jar diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/slf4j-api.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/slf4j-api.license new file mode 100644 index 000000000000..6057ad8c6647 --- /dev/null +++ b/plugins/maven/maven3-server-impl/lib/maven3/lib/slf4j-api.license @@ -0,0 +1,370 @@ + + + + + + + + + + + + The MIT License (MIT) | Open Source Initiative + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+ + + + + + + + + + + + +
+ + + +
+
+ + + + +
+ + + +
+ + +
+ + + + +
+ +

The MIT License (MIT)

+ + + +
+
+ + + + + +
+
+ + +
+
+ + +
+

+ +View Summary of MIT License on TLDRLegal » + +(Disclaimer) +

+ +

The MIT License (MIT)

+ +
+

Copyright (c) <year> <copyright holders>

+ +

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+ +

The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software.

+ +

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE.

+ +
+
+ + + + +
+
+
+ +
+ + +
+ + +
+ + +
+ +
+
+ + + +
+ + + +
+
+ + +
+
+
+ +
+ + + + +
+ +
+
+
+ + +
+
+ + + \ No newline at end of file diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/slf4j-simple-1.7.5.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/slf4j-simple-1.7.5.jar similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/slf4j-simple-1.7.5.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/slf4j-simple-1.7.5.jar diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/slf4j-simple.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/slf4j-simple.license new file mode 100644 index 000000000000..6057ad8c6647 --- /dev/null +++ b/plugins/maven/maven3-server-impl/lib/maven3/lib/slf4j-simple.license @@ -0,0 +1,370 @@ + + + + + + + + + + + + The MIT License (MIT) | Open Source Initiative + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+ + + + + + + + + + + + +
+ + + +
+
+ + + + +
+ + + +
+ + +
+ + + + +
+ +

The MIT License (MIT)

+ + + +
+
+ + + + + +
+
+ + +
+
+ + +
+

+ +View Summary of MIT License on TLDRLegal » + +(Disclaimer) +

+ +

The MIT License (MIT)

+ +
+

Copyright (c) <year> <copyright holders>

+ +

Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+ +

The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software.

+ +

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE.

+ +
+
+ + + + +
+
+
+ +
+ + +
+ + +
+ + +
+ +
+
+ + + +
+ + + +
+
+ + +
+
+
+ +
+ + + + +
+ +
+
+
+ + +
+
+ + + \ No newline at end of file diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-file-2.8.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-file-2.10.jar similarity index 56% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-file-2.8.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-file-2.10.jar index b4be898b5999..f9e0266b6e6b 100644 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-file-2.8.jar and b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-file-2.10.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-http.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-file.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-http.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-file.license diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-http-2.8-shaded.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http-2.10-shaded.jar similarity index 88% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-http-2.8-shaded.jar rename to plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http-2.10-shaded.jar index bd8ce065b1fd..49657885ecf8 100644 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-http-2.8-shaded.jar and b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http-2.10-shaded.jar differ diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http-shared-2.10.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http-shared-2.10.jar new file mode 100644 index 000000000000..67d3d1b48796 Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http-shared-2.10.jar differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-provider-api.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http-shared.license similarity index 100% rename from plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-provider-api.license rename to plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http-shared.license diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http.license new file mode 100644 index 000000000000..d64569567334 --- /dev/null +++ b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http.license @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-provider-api-2.10.jar b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-provider-api-2.10.jar new file mode 100644 index 000000000000..454d3cde7043 Binary files /dev/null and b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-provider-api-2.10.jar differ diff --git a/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-provider-api.license b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-provider-api.license new file mode 100644 index 000000000000..d64569567334 --- /dev/null +++ b/plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-provider-api.license @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/plugins/maven/maven32-server-impl/maven32-server-impl.iml b/plugins/maven/maven3-server-impl/maven3-server-impl.iml similarity index 90% rename from plugins/maven/maven32-server-impl/maven32-server-impl.iml rename to plugins/maven/maven3-server-impl/maven3-server-impl.iml index 1b362d0a45b7..ca8f160e312b 100644 --- a/plugins/maven/maven32-server-impl/maven32-server-impl.iml +++ b/plugins/maven/maven3-server-impl/maven3-server-impl.iml @@ -11,14 +11,14 @@ - + - - + + - + diff --git a/plugins/maven/maven32-server-impl/src/META-INF/plexus/components.xml b/plugins/maven/maven3-server-impl/src/META-INF/plexus/components.xml similarity index 98% rename from plugins/maven/maven32-server-impl/src/META-INF/plexus/components.xml rename to plugins/maven/maven3-server-impl/src/META-INF/plexus/components.xml index 2d9f960273bf..fd5911c48a92 100644 --- a/plugins/maven/maven32-server-impl/src/META-INF/plexus/components.xml +++ b/plugins/maven/maven3-server-impl/src/META-INF/plexus/components.xml @@ -28,7 +28,7 @@ org.apache.maven.artifact.resolver.ArtifactResolver ide - org.jetbrains.idea.maven.server.embedder.CustomMaven32ArtifactResolver + org.jetbrains.idea.maven.server.embedder.CustomMaven3ArtifactResolver false diff --git a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32AetherModelConverter.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3AetherModelConverter.java similarity index 96% rename from plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32AetherModelConverter.java rename to plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3AetherModelConverter.java index 94d2851fe181..b11d7082f948 100644 --- a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32AetherModelConverter.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3AetherModelConverter.java @@ -31,12 +31,12 @@ import java.rmi.RemoteException; import java.util.*; /** - * {@link Maven32AetherModelConverter} provides adapted methods of {@link MavenModelConverter} for aether models conversion + * {@link Maven3AetherModelConverter} provides adapted methods of {@link MavenModelConverter} for aether models conversion * * @author Vladislav.Soroka * @since 9/24/2014 */ -public class Maven32AetherModelConverter extends MavenModelConverter { +public class Maven3AetherModelConverter extends MavenModelConverter { public static MavenModel convertModelWithAetherDependencyTree(Model model, List sources, diff --git a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32ServerEmbedderImpl.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java similarity index 98% rename from plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32ServerEmbedderImpl.java rename to plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java index 962c3e363e12..97063765e793 100644 --- a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32ServerEmbedderImpl.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java @@ -115,7 +115,7 @@ import java.util.*; * maven-model-builder: * org.jetbrains.idea.maven.server.embedder.CustomMaven3ModelInterpolator2 <-> org.apache.maven.model.interpolation.StringSearchModelInterpolator */ -public class Maven32ServerEmbedderImpl extends Maven3ServerEmbedder { +public class Maven3ServerEmbedderImpl extends Maven3ServerEmbedder { @NotNull private final DefaultPlexusContainer myContainer; @NotNull private final Settings myMavenSettings; @@ -133,7 +133,7 @@ public class Maven32ServerEmbedderImpl extends Maven3ServerEmbedder { private boolean myAlwaysUpdateSnapshots; - public Maven32ServerEmbedderImpl(MavenServerSettings settings) throws RemoteException { + public Maven3ServerEmbedderImpl(MavenServerSettings settings) throws RemoteException { super(settings); File mavenHome = settings.getMavenHome(); @@ -513,7 +513,7 @@ public class Maven32ServerEmbedderImpl extends Maven3ServerEmbedder { customizeComponents(); ((CustomMaven3ArtifactFactory)getComponent(ArtifactFactory.class)).customize(); - ((CustomMaven32ArtifactResolver)getComponent(ArtifactResolver.class)).customize(workspaceMap, failOnUnresolvedDependency); + ((CustomMaven3ArtifactResolver)getComponent(ArtifactResolver.class)).customize(workspaceMap, failOnUnresolvedDependency); ((CustomMaven3RepositoryMetadataManager)getComponent(RepositoryMetadataManager.class)).customize(workspaceMap); //((CustomMaven3WagonManager)getComponent(WagonManager.class)).customize(failOnUnresolvedDependency); @@ -631,7 +631,7 @@ public class Maven32ServerEmbedderImpl extends Maven3ServerEmbedder { session.setTransferListener(new TransferListenerAdapter(myCurrentIndicator)); if (myWorkspaceMap != null) { - session.setWorkspaceReader(new Maven32WorkspaceReader(myWorkspaceMap)); + session.setWorkspaceReader(new Maven3WorkspaceReader(myWorkspaceMap)); } session.setConfigProperty(ConflictResolver.CONFIG_PROP_VERBOSE, true); @@ -931,7 +931,7 @@ public class Maven32ServerEmbedderImpl extends Maven3ServerEmbedder { final List dependencyNodes = dependencyGraph != null ? dependencyGraph.getChildren() : Collections.emptyList(); - model = Maven32AetherModelConverter.convertModelWithAetherDependencyTree( + model = Maven3AetherModelConverter.convertModelWithAetherDependencyTree( mavenProject.getModel(), mavenProject.getCompileSourceRoots(), mavenProject.getTestCompileSourceRoots(), mavenProject.getArtifacts(), dependencyNodes, mavenProject.getExtensionArtifacts(), getLocalRepositoryFile()); } @@ -1003,7 +1003,7 @@ public class Maven32ServerEmbedderImpl extends Maven3ServerEmbedder { Set result = new THashSet(); // TODO collect unresolved artifacts //((CustomMaven3WagonManager)getComponent(WagonManager.class)).getUnresolvedCollector().retrieveUnresolvedIds(result); - //((CustomMaven3ArtifactResolver)getComponent(ArtifactResolver.class)).getUnresolvedCollector().retrieveUnresolvedIds(result); + //((CustomMaven30ArtifactResolver)getComponent(ArtifactResolver.class)).getUnresolvedCollector().retrieveUnresolvedIds(result); return result; } @@ -1249,8 +1249,8 @@ public class Maven32ServerEmbedderImpl extends Maven3ServerEmbedder { ((CustomMaven3ArtifactFactory)artifactFactory).reset(); } final ArtifactResolver artifactResolver = getComponent(ArtifactResolver.class); - if(artifactResolver instanceof CustomMaven32ArtifactResolver) { - ((CustomMaven32ArtifactResolver)artifactResolver).reset(); + if(artifactResolver instanceof CustomMaven3ArtifactResolver) { + ((CustomMaven3ArtifactResolver)artifactResolver).reset(); } final RepositoryMetadataManager repositoryMetadataManager = getComponent(RepositoryMetadataManager.class); if(repositoryMetadataManager instanceof CustomMaven3RepositoryMetadataManager) { diff --git a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32ServerImpl.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java similarity index 82% rename from plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32ServerImpl.java rename to plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java index 64e79dd8b945..e8ad08cd27c8 100644 --- a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32ServerImpl.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java @@ -23,7 +23,7 @@ import java.rmi.RemoteException; import java.rmi.server.UnicastRemoteObject; import java.util.Collection; -public class Maven32ServerImpl extends MavenRemoteObject implements MavenServer { +public class Maven3ServerImpl extends MavenRemoteObject implements MavenServer { public void set(MavenServerLogger logger, MavenServerDownloadListener downloadListener) throws RemoteException { try { Maven3ServerGlobals.set(logger, downloadListener); @@ -35,7 +35,7 @@ public class Maven32ServerImpl extends MavenRemoteObject implements MavenServer public MavenServerEmbedder createEmbedder(MavenServerSettings settings) throws RemoteException { try { - Maven32ServerEmbedderImpl result = new Maven32ServerEmbedderImpl(settings); + Maven3ServerEmbedderImpl result = new Maven3ServerEmbedderImpl(settings); UnicastRemoteObject.exportObject(result, 0); return result; } @@ -46,10 +46,10 @@ public class Maven32ServerImpl extends MavenRemoteObject implements MavenServer public MavenServerIndexer createIndexer() throws RemoteException { try { - Maven3ServerIndexerImpl result = new Maven3ServerIndexerImpl(new Maven32ServerEmbedderImpl(new MavenServerSettings())) { + Maven3ServerIndexerImpl result = new Maven3ServerIndexerImpl(new Maven3ServerEmbedderImpl(new MavenServerSettings())) { @Override public Maven3ServerEmbedder createEmbedder(MavenServerSettings settings) throws RemoteException { - return new Maven32ServerEmbedderImpl(settings); + return new Maven3ServerEmbedderImpl(settings); } }; UnicastRemoteObject.exportObject(result, 0); @@ -62,7 +62,7 @@ public class Maven32ServerImpl extends MavenRemoteObject implements MavenServer public MavenModel interpolateAndAlignModel(MavenModel model, File basedir) { try { - return Maven32ServerEmbedderImpl.interpolateAndAlignModel(model, basedir); + return Maven3ServerEmbedderImpl.interpolateAndAlignModel(model, basedir); } catch (Exception e) { throw rethrowException(e); @@ -71,7 +71,7 @@ public class Maven32ServerImpl extends MavenRemoteObject implements MavenServer public MavenModel assembleInheritance(MavenModel model, MavenModel parentModel) { try { - return Maven32ServerEmbedderImpl.assembleInheritance(model, parentModel); + return Maven3ServerEmbedderImpl.assembleInheritance(model, parentModel); } catch (Exception e) { throw rethrowException(e); @@ -83,7 +83,7 @@ public class Maven32ServerImpl extends MavenRemoteObject implements MavenServer MavenExplicitProfiles explicitProfiles, Collection alwaysOnProfiles) { try { - return Maven32ServerEmbedderImpl.applyProfiles(model, basedir, explicitProfiles, alwaysOnProfiles); + return Maven3ServerEmbedderImpl.applyProfiles(model, basedir, explicitProfiles, alwaysOnProfiles); } catch (Exception e) { throw rethrowException(e); diff --git a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32WorkspaceReader.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3WorkspaceReader.java similarity index 94% rename from plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32WorkspaceReader.java rename to plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3WorkspaceReader.java index 13062e878bae..84b606e21726 100644 --- a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32WorkspaceReader.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3WorkspaceReader.java @@ -25,13 +25,13 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -public class Maven32WorkspaceReader implements WorkspaceReader { +public class Maven3WorkspaceReader implements WorkspaceReader { private final WorkspaceRepository myRepository = new WorkspaceRepository(); private final MavenWorkspaceMap myWorkspaceMap; - public Maven32WorkspaceReader(MavenWorkspaceMap workspaceMap) { + public Maven3WorkspaceReader(MavenWorkspaceMap workspaceMap) { myWorkspaceMap = workspaceMap; } diff --git a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/RemoteMavenServer.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/RemoteMavenServer.java similarity index 95% rename from plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/RemoteMavenServer.java rename to plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/RemoteMavenServer.java index 42ac458ea16f..7dbbf16bdb71 100644 --- a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/RemoteMavenServer.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/RemoteMavenServer.java @@ -19,6 +19,6 @@ import com.intellij.execution.rmi.RemoteServer; public class RemoteMavenServer extends RemoteServer { public static void main(String[] args) throws Exception { - start(new Maven32ServerImpl()); + start(new Maven3ServerImpl()); } } diff --git a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/TransferListenerAdapter.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/TransferListenerAdapter.java similarity index 100% rename from plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/TransferListenerAdapter.java rename to plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/TransferListenerAdapter.java diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/embedder/CustomMaven3ArtifactResolver.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven3ArtifactResolver.java similarity index 76% rename from plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/embedder/CustomMaven3ArtifactResolver.java rename to plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven3ArtifactResolver.java index cb67f89ff2ff..593a26729e4c 100644 --- a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/embedder/CustomMaven3ArtifactResolver.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven3ArtifactResolver.java @@ -1,5 +1,42 @@ package org.jetbrains.idea.maven.server.embedder; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.regex.Matcher; + import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; @@ -24,29 +61,23 @@ import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.logging.Logger; +import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable; +import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.repository.LocalRepositoryManager; +import org.eclipse.aether.resolution.ArtifactRequest; +import org.eclipse.aether.resolution.ArtifactResult; import org.jetbrains.idea.maven.model.MavenWorkspaceMap; import org.jetbrains.idea.maven.server.MavenModelConverter; import org.jetbrains.idea.maven.server.UnresolvedArtifactsCollector; -import org.sonatype.aether.RepositorySystem; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.repository.LocalRepositoryManager; -import org.sonatype.aether.resolution.ArtifactRequest; -import org.sonatype.aether.resolution.ArtifactResult; - -import java.io.File; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.regex.Matcher; /** * Copy pasted from org.apache.maven.artifact.resolver.DefaultArtifactResolver, - * overriden method resolve( Artifact artifact, List remoteRepositories, RepositorySystemSession session ) - * @author Sergey Evdokimov + * overridden method resolve( Artifact artifact, List remoteRepositories, RepositorySystemSession session ) */ @Component(role = ArtifactResolver.class, hint = "ide") public class CustomMaven3ArtifactResolver - implements ArtifactResolver + implements ArtifactResolver, Disposable { @Requirement private Logger logger; @@ -77,10 +108,9 @@ public class CustomMaven3ArtifactResolver private volatile MavenWorkspaceMap myWorkspaceMap; private volatile UnresolvedArtifactsCollector myUnresolvedCollector; - public CustomMaven3ArtifactResolver() { - int threads = Integer.getInteger( "maven.artifact.threads", 5 ).intValue(); + int threads = Integer.getInteger( "maven.artifact.threads", 5 ); if ( threads <= 1 ) { executor = new Executor() @@ -94,21 +124,13 @@ public class CustomMaven3ArtifactResolver else { executor = - new ThreadPoolExecutor( threads, threads, 3, TimeUnit.SECONDS, new LinkedBlockingQueue(), new DaemonThreadCreator()); + new ThreadPoolExecutor( threads, threads, 3, TimeUnit.SECONDS, new LinkedBlockingQueue(), + new DaemonThreadCreator() ); } } - @Override - protected void finalize() - throws Throwable + private RepositorySystemSession getSession( ArtifactRepository localRepository ) { - if ( executor instanceof ExecutorService ) - { - ( (ExecutorService) executor ).shutdown(); - } - } - - private RepositorySystemSession getSession(ArtifactRepository localRepository) { return LegacyLocalRepositoryManager.overlay( localRepository, legacySupport.getRepositorySession(), repoSystem ); } @@ -133,13 +155,15 @@ public class CustomMaven3ArtifactResolver } } - public void resolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository, TransferListener resolutionListener ) + public void resolve( Artifact artifact, List remoteRepositories, + ArtifactRepository localRepository, TransferListener resolutionListener ) throws ArtifactResolutionException, ArtifactNotFoundException { resolve( artifact, remoteRepositories, getSession( localRepository ) ); } - public void resolveAlways( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository ) + public void resolveAlways( Artifact artifact, List remoteRepositories, + ArtifactRepository localRepository ) throws ArtifactResolutionException, ArtifactNotFoundException { resolve( artifact, remoteRepositories, getSession( localRepository ) ); @@ -156,7 +180,8 @@ public class CustomMaven3ArtifactResolver } } - private void resolveOld( Artifact artifact, List remoteRepositories, RepositorySystemSession session ) + private void resolveOld( Artifact artifact, List remoteRepositories, + RepositorySystemSession session ) throws ArtifactResolutionException, ArtifactNotFoundException { if ( artifact == null ) @@ -205,15 +230,15 @@ public class CustomMaven3ArtifactResolver result = repoSystem.resolveArtifact( session, artifactRequest ); } - catch ( org.sonatype.aether.resolution.ArtifactResolutionException e ) + catch ( org.eclipse.aether.resolution.ArtifactResolutionException e ) { - if ( e.getCause() instanceof org.sonatype.aether.transfer.ArtifactNotFoundException ) - { - throw new ArtifactNotFoundException( e.getMessage(), artifact, remoteRepositories, e ) {}; + if (e.getCause() instanceof org.eclipse.aether.transfer.ArtifactNotFoundException) { + throw new ArtifactNotFoundException(e.getMessage(), artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), + artifact.getType(), artifact.getClassifier(), remoteRepositories, artifact.getDownloadUrl(), + artifact.getDependencyTrail(), e); } - else - { - throw new ArtifactResolutionException( e.getMessage(), artifact, remoteRepositories, e ); + else { + throw new ArtifactResolutionException(e.getMessage(), artifact, remoteRepositories, e); } } @@ -242,52 +267,77 @@ public class CustomMaven3ArtifactResolver } } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, ArtifactRepository localRepository, List remoteRepositories, + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, + ArtifactRepository localRepository, + List remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter ) throws ArtifactResolutionException, ArtifactNotFoundException { - return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository, remoteRepositories, source, filter ); + return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository, + remoteRepositories, source, filter ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, - List remoteRepositories, ArtifactMetadataSource source ) + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, + Map managedVersions, + ArtifactRepository localRepository, + List remoteRepositories, + ArtifactMetadataSource source ) throws ArtifactResolutionException, ArtifactNotFoundException { - return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, null ); + return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, + remoteRepositories, source, null ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, - List remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter ) + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, + Map managedVersions, + ArtifactRepository localRepository, + List remoteRepositories, + ArtifactMetadataSource source, ArtifactFilter filter ) throws ArtifactResolutionException, ArtifactNotFoundException { - return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, filter, null ); + return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, + remoteRepositories, source, filter, null ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, List remoteRepositories, ArtifactRepository localRepository, + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, + List remoteRepositories, + ArtifactRepository localRepository, ArtifactMetadataSource source ) throws ArtifactResolutionException, ArtifactNotFoundException { return resolveTransitively( artifacts, originatingArtifact, localRepository, remoteRepositories, source, null ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, List remoteRepositories, ArtifactRepository localRepository, - ArtifactMetadataSource source, List listeners ) + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, + List remoteRepositories, + ArtifactRepository localRepository, + ArtifactMetadataSource source, + List listeners ) throws ArtifactResolutionException, ArtifactNotFoundException { return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository, remoteRepositories, source, null, listeners ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, - List remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter, List listeners ) + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, + Map managedVersions, + ArtifactRepository localRepository, + List remoteRepositories, + ArtifactMetadataSource source, ArtifactFilter filter, + List listeners ) throws ArtifactResolutionException, ArtifactNotFoundException { - return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, filter, listeners, null ); + return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, + remoteRepositories, source, filter, listeners, null ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, - List remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter, List listeners, + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, + Map managedVersions, + ArtifactRepository localRepository, + List remoteRepositories, + ArtifactMetadataSource source, ArtifactFilter filter, + List listeners, List conflictResolvers ) throws ArtifactResolutionException, ArtifactNotFoundException { @@ -329,7 +379,7 @@ public class CustomMaven3ArtifactResolver { Artifact rootArtifact = request.getArtifact(); Set artifacts = request.getArtifactDependencies(); - Map managedVersions = request.getManagedVersionMap(); + Map managedVersions = request.getManagedVersionMap(); List listeners = request.getListeners(); ArtifactFilter collectionFilter = request.getCollectionFilter(); ArtifactFilter resolutionFilter = request.getResolutionFilter(); @@ -547,22 +597,24 @@ public class CustomMaven3ArtifactResolver return true; } + /** * ThreadCreator for creating daemon threads with fixed ThreadGroup-name. */ - final static class DaemonThreadCreator + static final class DaemonThreadCreator implements ThreadFactory { static final String THREADGROUP_NAME = "org.apache.maven.artifact.resolver.DefaultArtifactResolver"; - final static ThreadGroup group = new ThreadGroup( THREADGROUP_NAME ); + static final ThreadGroup GROUP = new ThreadGroup( THREADGROUP_NAME ); - final static AtomicInteger threadNumber = new AtomicInteger( 1 ); + static final AtomicInteger THREAD_NUMBER = new AtomicInteger( 1 ); public Thread newThread( Runnable r ) { - Thread newThread = new Thread( group, r, "resolver-" + threadNumber.getAndIncrement() ); + Thread newThread = new Thread( GROUP, r, "resolver-" + THREAD_NUMBER.getAndIncrement() ); newThread.setDaemon( true ); + newThread.setContextClassLoader( null ); return newThread; } } @@ -596,6 +648,7 @@ public class CustomMaven3ArtifactResolver public void run() { + ClassLoader old = Thread.currentThread().getContextClassLoader(); try { Thread.currentThread().setContextClassLoader( classLoader ); @@ -624,9 +677,20 @@ public class CustomMaven3ArtifactResolver finally { latch.countDown(); + Thread.currentThread().setContextClassLoader( old ); + } } } -} + @Override + public void dispose() + { + if ( executor instanceof ExecutorService ) + { + ( (ExecutorService) executor ).shutdownNow(); + } + } + +} \ No newline at end of file diff --git a/plugins/maven/maven30-server-impl/src/META-INF/plexus/components.xml b/plugins/maven/maven30-server-impl/src/META-INF/plexus/components.xml index d0dd37610582..b4b465e64bd4 100644 --- a/plugins/maven/maven30-server-impl/src/META-INF/plexus/components.xml +++ b/plugins/maven/maven30-server-impl/src/META-INF/plexus/components.xml @@ -28,7 +28,7 @@ org.apache.maven.artifact.resolver.ArtifactResolver ide - org.jetbrains.idea.maven.server.embedder.CustomMaven3ArtifactResolver + org.jetbrains.idea.maven.server.embedder.CustomMaven30ArtifactResolver false diff --git a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java index 1686f07ea5fa..5c9cffd65599 100644 --- a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java +++ b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java @@ -94,7 +94,7 @@ import java.util.*; *

* maven-compat: * org.jetbrains.idea.maven.server.embedder.CustomMaven3RepositoryMetadataManager <-> org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataManager - * org.jetbrains.idea.maven.server.embedder.CustomMaven3ArtifactResolver <-> org.apache.maven.artifact.resolver.DefaultArtifactResolver + * org.jetbrains.idea.maven.server.embedder.CustomMaven30ArtifactResolver <-> org.apache.maven.artifact.resolver.DefaultArtifactResolver * org.jetbrains.idea.maven.server.embedder.CustomMaven3ModelInterpolator <-> org.apache.maven.project.interpolation.StringSearchModelInterpolator *

* maven-core: @@ -491,7 +491,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { customizeComponents(); ((CustomMaven3ArtifactFactory)getComponent(ArtifactFactory.class)).customize(); - ((CustomMaven3ArtifactResolver)getComponent(ArtifactResolver.class)).customize(workspaceMap, failOnUnresolvedDependency); + ((CustomMaven30ArtifactResolver)getComponent(ArtifactResolver.class)).customize(workspaceMap, failOnUnresolvedDependency); ((CustomMaven3RepositoryMetadataManager)getComponent(RepositoryMetadataManager.class)).customize(workspaceMap); //((CustomMaven3WagonManager)getComponent(WagonManager.class)).customize(failOnUnresolvedDependency); @@ -924,7 +924,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { Set result = new THashSet(); // TODO collect unresolved artifacts //((CustomMaven3WagonManager)getComponent(WagonManager.class)).getUnresolvedCollector().retrieveUnresolvedIds(result); - //((CustomMaven3ArtifactResolver)getComponent(ArtifactResolver.class)).getUnresolvedCollector().retrieveUnresolvedIds(result); + //((CustomMaven30ArtifactResolver)getComponent(ArtifactResolver.class)).getUnresolvedCollector().retrieveUnresolvedIds(result); return result; } @@ -1132,8 +1132,8 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { ((CustomMaven3ArtifactFactory)artifactFactory).reset(); } final ArtifactResolver artifactResolver = getComponent(ArtifactResolver.class); - if(artifactResolver instanceof CustomMaven3ArtifactResolver) { - ((CustomMaven3ArtifactResolver)artifactResolver).reset(); + if(artifactResolver instanceof CustomMaven30ArtifactResolver) { + ((CustomMaven30ArtifactResolver)artifactResolver).reset(); } final RepositoryMetadataManager repositoryMetadataManager = getComponent(RepositoryMetadataManager.class); if(repositoryMetadataManager instanceof CustomMaven3RepositoryMetadataManager) { diff --git a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven32ArtifactResolver.java b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven30ArtifactResolver.java similarity index 77% rename from plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven32ArtifactResolver.java rename to plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven30ArtifactResolver.java index b9130c5d9e59..1ab1fd0cb3a7 100644 --- a/plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven32ArtifactResolver.java +++ b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven30ArtifactResolver.java @@ -1,42 +1,5 @@ package org.jetbrains.idea.maven.server.embedder; -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.regex.Matcher; - import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; @@ -61,23 +24,29 @@ import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.resolution.ArtifactRequest; -import org.eclipse.aether.resolution.ArtifactResult; import org.jetbrains.idea.maven.model.MavenWorkspaceMap; import org.jetbrains.idea.maven.server.MavenModelConverter; import org.jetbrains.idea.maven.server.UnresolvedArtifactsCollector; +import org.sonatype.aether.RepositorySystem; +import org.sonatype.aether.RepositorySystemSession; +import org.sonatype.aether.repository.LocalRepositoryManager; +import org.sonatype.aether.resolution.ArtifactRequest; +import org.sonatype.aether.resolution.ArtifactResult; + +import java.io.File; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.regex.Matcher; /** * Copy pasted from org.apache.maven.artifact.resolver.DefaultArtifactResolver, * overriden method resolve( Artifact artifact, List remoteRepositories, RepositorySystemSession session ) + * @author Sergey Evdokimov */ @Component(role = ArtifactResolver.class, hint = "ide") -public class CustomMaven32ArtifactResolver - implements ArtifactResolver, Disposable +public class CustomMaven30ArtifactResolver + implements ArtifactResolver { @Requirement private Logger logger; @@ -108,9 +77,10 @@ public class CustomMaven32ArtifactResolver private volatile MavenWorkspaceMap myWorkspaceMap; private volatile UnresolvedArtifactsCollector myUnresolvedCollector; - public CustomMaven32ArtifactResolver() + + public CustomMaven30ArtifactResolver() { - int threads = Integer.getInteger( "maven.artifact.threads", 5 ); + int threads = Integer.getInteger( "maven.artifact.threads", 5 ).intValue(); if ( threads <= 1 ) { executor = new Executor() @@ -124,13 +94,21 @@ public class CustomMaven32ArtifactResolver else { executor = - new ThreadPoolExecutor( threads, threads, 3, TimeUnit.SECONDS, new LinkedBlockingQueue(), - new DaemonThreadCreator() ); + new ThreadPoolExecutor( threads, threads, 3, TimeUnit.SECONDS, new LinkedBlockingQueue(), new DaemonThreadCreator()); } } - private RepositorySystemSession getSession( ArtifactRepository localRepository ) + @Override + protected void finalize() + throws Throwable { + if ( executor instanceof ExecutorService ) + { + ( (ExecutorService) executor ).shutdown(); + } + } + + private RepositorySystemSession getSession(ArtifactRepository localRepository) { return LegacyLocalRepositoryManager.overlay( localRepository, legacySupport.getRepositorySession(), repoSystem ); } @@ -155,15 +133,13 @@ public class CustomMaven32ArtifactResolver } } - public void resolve( Artifact artifact, List remoteRepositories, - ArtifactRepository localRepository, TransferListener resolutionListener ) + public void resolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository, TransferListener resolutionListener ) throws ArtifactResolutionException, ArtifactNotFoundException { resolve( artifact, remoteRepositories, getSession( localRepository ) ); } - public void resolveAlways( Artifact artifact, List remoteRepositories, - ArtifactRepository localRepository ) + public void resolveAlways( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository ) throws ArtifactResolutionException, ArtifactNotFoundException { resolve( artifact, remoteRepositories, getSession( localRepository ) ); @@ -180,8 +156,7 @@ public class CustomMaven32ArtifactResolver } } - private void resolveOld( Artifact artifact, List remoteRepositories, - RepositorySystemSession session ) + private void resolveOld( Artifact artifact, List remoteRepositories, RepositorySystemSession session ) throws ArtifactResolutionException, ArtifactNotFoundException { if ( artifact == null ) @@ -230,15 +205,15 @@ public class CustomMaven32ArtifactResolver result = repoSystem.resolveArtifact( session, artifactRequest ); } - catch ( org.eclipse.aether.resolution.ArtifactResolutionException e ) + catch ( org.sonatype.aether.resolution.ArtifactResolutionException e ) { - if (e.getCause() instanceof org.eclipse.aether.transfer.ArtifactNotFoundException) { - throw new ArtifactNotFoundException(e.getMessage(), artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), - artifact.getType(), artifact.getClassifier(), remoteRepositories, artifact.getDownloadUrl(), - artifact.getDependencyTrail(), e); + if ( e.getCause() instanceof org.sonatype.aether.transfer.ArtifactNotFoundException ) + { + throw new ArtifactNotFoundException( e.getMessage(), artifact, remoteRepositories, e ) {}; } - else { - throw new ArtifactResolutionException(e.getMessage(), artifact, remoteRepositories, e); + else + { + throw new ArtifactResolutionException( e.getMessage(), artifact, remoteRepositories, e ); } } @@ -267,73 +242,52 @@ public class CustomMaven32ArtifactResolver } } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, - ArtifactRepository localRepository, - List remoteRepositories, + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, ArtifactRepository localRepository, List remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter ) throws ArtifactResolutionException, ArtifactNotFoundException { - return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository, - remoteRepositories, source, filter ); + return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository, remoteRepositories, source, filter ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, - Map managedVersions, ArtifactRepository localRepository, - List remoteRepositories, - ArtifactMetadataSource source ) + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, + List remoteRepositories, ArtifactMetadataSource source ) throws ArtifactResolutionException, ArtifactNotFoundException { - return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, - remoteRepositories, source, null ); + return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, null ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, - Map managedVersions, ArtifactRepository localRepository, - List remoteRepositories, - ArtifactMetadataSource source, ArtifactFilter filter ) + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, + List remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter ) throws ArtifactResolutionException, ArtifactNotFoundException { - return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, - remoteRepositories, source, filter, null ); + return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, filter, null ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, - List remoteRepositories, - ArtifactRepository localRepository, + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, List remoteRepositories, ArtifactRepository localRepository, ArtifactMetadataSource source ) throws ArtifactResolutionException, ArtifactNotFoundException { return resolveTransitively( artifacts, originatingArtifact, localRepository, remoteRepositories, source, null ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, - List remoteRepositories, - ArtifactRepository localRepository, - ArtifactMetadataSource source, - List listeners ) + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, List remoteRepositories, ArtifactRepository localRepository, + ArtifactMetadataSource source, List listeners ) throws ArtifactResolutionException, ArtifactNotFoundException { return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository, remoteRepositories, source, null, listeners ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, - Map managedVersions, ArtifactRepository localRepository, - List remoteRepositories, - ArtifactMetadataSource source, ArtifactFilter filter, - List listeners ) + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, + List remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter, List listeners ) throws ArtifactResolutionException, ArtifactNotFoundException { - return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, - remoteRepositories, source, filter, listeners, null ); + return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, filter, listeners, null ); } - public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, - Map managedVersions, ArtifactRepository localRepository, - List remoteRepositories, - ArtifactMetadataSource source, ArtifactFilter filter, - List listeners, + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository, + List remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter, List listeners, List conflictResolvers ) throws ArtifactResolutionException, ArtifactNotFoundException { @@ -375,7 +329,7 @@ public class CustomMaven32ArtifactResolver { Artifact rootArtifact = request.getArtifact(); Set artifacts = request.getArtifactDependencies(); - Map managedVersions = request.getManagedVersionMap(); + Map managedVersions = request.getManagedVersionMap(); List listeners = request.getListeners(); ArtifactFilter collectionFilter = request.getCollectionFilter(); ArtifactFilter resolutionFilter = request.getResolutionFilter(); @@ -593,24 +547,22 @@ public class CustomMaven32ArtifactResolver return true; } - /** * ThreadCreator for creating daemon threads with fixed ThreadGroup-name. */ - static final class DaemonThreadCreator + final static class DaemonThreadCreator implements ThreadFactory { static final String THREADGROUP_NAME = "org.apache.maven.artifact.resolver.DefaultArtifactResolver"; - static final ThreadGroup GROUP = new ThreadGroup( THREADGROUP_NAME ); + final static ThreadGroup group = new ThreadGroup( THREADGROUP_NAME ); - static final AtomicInteger THREAD_NUMBER = new AtomicInteger( 1 ); + final static AtomicInteger threadNumber = new AtomicInteger( 1 ); public Thread newThread( Runnable r ) { - Thread newThread = new Thread( GROUP, r, "resolver-" + THREAD_NUMBER.getAndIncrement() ); + Thread newThread = new Thread( group, r, "resolver-" + threadNumber.getAndIncrement() ); newThread.setDaemon( true ); - newThread.setContextClassLoader( null ); return newThread; } } @@ -644,7 +596,6 @@ public class CustomMaven32ArtifactResolver public void run() { - ClassLoader old = Thread.currentThread().getContextClassLoader(); try { Thread.currentThread().setContextClassLoader( classLoader ); @@ -673,20 +624,9 @@ public class CustomMaven32ArtifactResolver finally { latch.countDown(); - Thread.currentThread().setContextClassLoader( old ); - } } } - @Override - public void dispose() - { - if ( executor instanceof ExecutorService ) - { - ( (ExecutorService) executor ).shutdownNow(); - } - } - -} \ No newline at end of file +} diff --git a/plugins/maven/maven32-server-impl/lib/maven32/bin/mvnDebug b/plugins/maven/maven32-server-impl/lib/maven32/bin/mvnDebug deleted file mode 100644 index 71103528262b..000000000000 --- a/plugins/maven/maven32-server-impl/lib/maven32/bin/mvnDebug +++ /dev/null @@ -1,200 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -MAVEN_DEBUG_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" - -echo Preparing to Execute Maven in Debug Mode - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # - # Look for the Apple JDKs first to preserve the existing behaviour, and then look - # for the new JDKs provided by Oracle. - # - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then - # - # Oracle JDKs - # - export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - javaExecutable="`readlink -f \"$javaExecutable\"`" - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$@" -export MAVEN_CMD_LINE_ARGS - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \ - "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ - "-Dmaven.home=${M2_HOME}" \ - ${CLASSWORLDS_LAUNCHER} "$@" diff --git a/plugins/maven/maven32-server-impl/lib/maven32/bin/mvnDebug.bat b/plugins/maven/maven32-server-impl/lib/maven32/bin/mvnDebug.bat deleted file mode 100644 index b7b42b9863e8..000000000000 --- a/plugins/maven/maven32-server-impl/lib/maven32/bin/mvnDebug.bat +++ /dev/null @@ -1,200 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@echo Preparing to Execute Maven in Debug Mode - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -:skipRcPre - -set ERROR_CODE=0 - -@REM set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" @setlocal -if "%OS%"=="WINNT" @setlocal - -set MAVEN_DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation >&2 -echo. -goto error - -:chkMHome -if not "%M2_HOME%"=="" goto valMHome - -if "%OS%"=="Windows_NT" SET "M2_HOME=%~dp0.." -if "%OS%"=="WINNT" SET "M2_HOME=%~dp0.." -if not "%M2_HOME%"=="" goto valMHome - -echo. -echo Error: M2_HOME not found in your environment. >&2 -echo Please set the M2_HOME variable in your environment to match the >&2 -echo location of the Maven installation >&2 -echo. -goto error - -:valMHome - -:stripMHome -if not "_%M2_HOME:~-1%"=="_\" goto checkMBat -set "M2_HOME=%M2_HOME:~0,-1%" -goto stripMHome - -:checkMBat -if exist "%M2_HOME%\bin\mvn.bat" goto init - -echo. -echo Error: M2_HOME is set to an invalid directory. >&2 -echo M2_HOME = "%M2_HOME%" >&2 -echo Please set the M2_HOME variable in your environment to match the >&2 -echo location of the Maven installation >&2 -echo. -goto error -@REM ==== END VALIDATION ==== - -:init -@REM Decide how to startup depending on the version of windows - -@REM -- Windows NT with Novell Login -if "%OS%"=="WINNT" goto WinNTNovell - -@REM -- Win98ME -if NOT "%OS%"=="Windows_NT" goto Win9xArg - -:WinNTNovell - -@REM -- 4NT shell -if "%@eval[2+2]" == "4" goto 4NTArgs - -@REM -- Regular WinNT shell -set MAVEN_CMD_LINE_ARGS=%* -goto endInit - -@REM The 4NT Shell from jp software -:4NTArgs -set MAVEN_CMD_LINE_ARGS=%$ -goto endInit - -:Win9xArg -@REM Slurp the command line arguments. This loop allows for an unlimited number -@REM of agruments (up to the command line limit, anyway). -set MAVEN_CMD_LINE_ARGS= -:Win9xApp -if %1a==a goto endInit -set MAVEN_CMD_LINE_ARGS=%MAVEN_CMD_LINE_ARGS% %1 -shift -goto Win9xApp - -@REM Reaching here means variables are defined and arguments have been captured -:endInit -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -@REM -- 4NT shell -if "%@eval[2+2]" == "4" goto 4NTCWJars - -@REM -- Regular WinNT shell -for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i" -goto runm2 - -@REM The 4NT Shell from jp software -:4NTCWJars -for %%i in ("%M2_HOME%\boot\plexus-classworlds-*") do set CLASSWORLDS_JAR="%%i" -goto runm2 - -@REM Start MAVEN2 -:runm2 -set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher -%MAVEN_JAVA_EXE% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% -if ERRORLEVEL 1 goto error -goto end - -:error -if "%OS%"=="Windows_NT" @endlocal -if "%OS%"=="WINNT" @endlocal -set ERROR_CODE=1 - -:end -@REM set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" goto endNT -if "%OS%"=="WINNT" goto endNT - -@REM For old DOS remove the set variables from ENV - we assume they were not set -@REM before we started - at least we don't leave any baggage around -set MAVEN_JAVA_EXE= -set MAVEN_CMD_LINE_ARGS= -goto postExec - -:endNT -@endlocal & set ERROR_CODE=%ERROR_CODE% - -:postExec - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -:skipRcPost - -@REM pause the batch file if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% - diff --git a/plugins/maven/maven32-server-impl/lib/maven32/bin/mvnyjp b/plugins/maven/maven32-server-impl/lib/maven32/bin/mvnyjp deleted file mode 100644 index d66d354cba50..000000000000 --- a/plugins/maven/maven32-server-impl/lib/maven32/bin/mvnyjp +++ /dev/null @@ -1,207 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -QUOTED_ARGS="" -while [ "$1" != "" ] ; do - - QUOTED_ARGS="$QUOTED_ARGS \"$1\"" - shift - -done - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # - # Look for the Apple JDKs first to preserve the existing behaviour, and then look - # for the new JDKs provided by Oracle. - # - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then - # - # Oracle JDKs - # - export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - javaExecutable="`readlink -f \"$javaExecutable\"`" - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` -fi - -if [ ! -f "$YJPLIB" ]; then - echo "Error: Unable to autodetect the YJP library location. Please set YJPLIB variable" >&2 - exit 1 -fi - -MAVEN_OPTS="-agentpath:$YJPLIB=onexit=snapshot,onexit=memory,tracing,onlylocal $MAVEN_OPTS" - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \ - "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ - "-Dmaven.home=${M2_HOME}" \ - ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS - - diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/cdi-api.license b/plugins/maven/maven32-server-impl/lib/maven32/lib/cdi-api.license deleted file mode 100644 index ab190e53691f..000000000000 --- a/plugins/maven/maven32-server-impl/lib/maven32/lib/cdi-api.license +++ /dev/null @@ -1,445 +0,0 @@ - - - - Apache License, Version 2.0 - - - - - - - - - - - - - - - - - -

- - -
-

Apache License

Version 2.0, January 2004

-http://www.apache.org/licenses/

-

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

1. Definitions.

-

"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document.

-

"Licensor" shall mean the copyright owner or entity authorized by the -copyright owner that is granting the License.

-

"Legal Entity" shall mean the union of the acting entity and all other -entities that control, are controlled by, or are under common control with -that entity. For the purposes of this definition, "control" means (i) the -power, direct or indirect, to cause the direction or management of such -entity, whether by contract or otherwise, or (ii) ownership of fifty -percent (50%) or more of the outstanding shares, or (iii) beneficial -ownership of such entity.

-

"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License.

-

"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation source, -and configuration files.

-

"Object" form shall mean any form resulting from mechanical transformation -or translation of a Source form, including but not limited to compiled -object code, generated documentation, and conversions to other media types.

-

"Work" shall mean the work of authorship, whether in Source or Object form, -made available under the License, as indicated by a copyright notice that -is included in or attached to the work (an example is provided in the -Appendix below).

-

"Derivative Works" shall mean any work, whether in Source or Object form, -that is based on (or derived from) the Work and for which the editorial -revisions, annotations, elaborations, or other modifications represent, as -a whole, an original work of authorship. For the purposes of this License, -Derivative Works shall not include works that remain separable from, or -merely link (or bind by name) to the interfaces of, the Work and Derivative -Works thereof.

-

"Contribution" shall mean any work of authorship, including the original -version of the Work and any modifications or additions to that Work or -Derivative Works thereof, that is intentionally submitted to Licensor for -inclusion in the Work by the copyright owner or by an individual or Legal -Entity authorized to submit on behalf of the copyright owner. For the -purposes of this definition, "submitted" means any form of electronic, -verbal, or written communication sent to the Licensor or its -representatives, including but not limited to communication on electronic -mailing lists, source code control systems, and issue tracking systems that -are managed by, or on behalf of, the Licensor for the purpose of discussing -and improving the Work, but excluding communication that is conspicuously -marked or otherwise designated in writing by the copyright owner as "Not a -Contribution."

-

"Contributor" shall mean Licensor and any individual or Legal Entity on -behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work.

-

2. Grant of Copyright License. Subject to the -terms and conditions of this License, each Contributor hereby grants to You -a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare Derivative Works of, publicly -display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form.

-

3. Grant of Patent License. Subject to the terms -and conditions of this License, each Contributor hereby grants to You a -perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except as stated in this section) patent license to make, have made, use, -offer to sell, sell, import, and otherwise transfer the Work, where such -license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by -combination of their Contribution(s) with the Work to which such -Contribution(s) was submitted. If You institute patent litigation against -any entity (including a cross-claim or counterclaim in a lawsuit) alleging -that the Work or a Contribution incorporated within the Work constitutes -direct or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate as of the -date such litigation is filed.

-

4. Redistribution. You may reproduce and -distribute copies of the Work or Derivative Works thereof in any medium, -with or without modifications, and in Source or Object form, provided that -You meet the following conditions:

-
    -
  1. You must give any other recipients of the Work or Derivative Works a -copy of this License; and
  2. - -
  3. You must cause any modified files to carry prominent notices stating -that You changed the files; and
  4. - -
  5. You must retain, in the Source form of any Derivative Works that You -distribute, all copyright, patent, trademark, and attribution notices from -the Source form of the Work, excluding those notices that do not pertain to -any part of the Derivative Works; and
  6. - -
  7. If the Work includes a "NOTICE" text file as part of its distribution, -then any Derivative Works that You distribute must include a readable copy -of the attribution notices contained within such NOTICE file, excluding -those notices that do not pertain to any part of the Derivative Works, in -at least one of the following places: within a NOTICE text file distributed -as part of the Derivative Works; within the Source form or documentation, -if provided along with the Derivative Works; or, within a display generated -by the Derivative Works, if and wherever such third-party notices normally -appear. The contents of the NOTICE file are for informational purposes only -and do not modify the License. You may add Your own attribution notices -within Derivative Works that You distribute, alongside or as an addendum to -the NOTICE text from the Work, provided that such additional attribution -notices cannot be construed as modifying the License. -
    -
    -You may add Your own copyright statement to Your modifications and may -provide additional or different license terms and conditions for use, -reproduction, or distribution of Your modifications, or for any such -Derivative Works as a whole, provided Your use, reproduction, and -distribution of the Work otherwise complies with the conditions stated in -this License. -
  8. - -
- -

5. Submission of Contributions. Unless You -explicitly state otherwise, any Contribution intentionally submitted for -inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the -terms of any separate license agreement you may have executed with Licensor -regarding such Contributions.

-

6. Trademarks. This License does not grant -permission to use the trade names, trademarks, service marks, or product -names of the Licensor, except as required for reasonable and customary use -in describing the origin of the Work and reproducing the content of the -NOTICE file.

-

7. Disclaimer of Warranty. Unless required by -applicable law or agreed to in writing, Licensor provides the Work (and -each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, -without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You -are solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise -of permissions under this License.

-

8. Limitation of Liability. In no event and -under no legal theory, whether in tort (including negligence), contract, or -otherwise, unless required by applicable law (such as deliberate and -grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, -incidental, or consequential damages of any character arising as a result -of this License or out of the use or inability to use the Work (including -but not limited to damages for loss of goodwill, work stoppage, computer -failure or malfunction, or any and all other commercial damages or losses), -even if such Contributor has been advised of the possibility of such -damages.

-

9. Accepting Warranty or Additional Liability. -While redistributing the Work or Derivative Works thereof, You may choose -to offer, and charge a fee for, acceptance of support, warranty, indemnity, -or other liability obligations and/or rights consistent with this License. -However, in accepting such obligations, You may act only on Your own behalf -and on Your sole responsibility, not on behalf of any other Contributor, -and only if You agree to indemnify, defend, and hold each Contributor -harmless for any liability incurred by, or claims asserted against, such -Contributor by reason of your accepting any such warranty or additional -liability.

-

END OF TERMS AND CONDITIONS

-

APPENDIX: How to apply the Apache License to your work

-

To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "[]" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included -on the same "printed page" as the copyright notice for easier -identification within third-party archives.

-
Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-
- - - - diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-aether-provider-3.2.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-aether-provider-3.2.5.jar deleted file mode 100644 index 0abe65e58679..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-aether-provider-3.2.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-artifact-3.2.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-artifact-3.2.5.jar deleted file mode 100644 index a90e72d6db56..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-artifact-3.2.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-compat-3.2.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-compat-3.2.5.jar deleted file mode 100644 index 2d2e0469ae89..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-compat-3.2.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-core-3.2.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-core-3.2.5.jar deleted file mode 100644 index 18853458ef79..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-core-3.2.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-embedder-3.2.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-embedder-3.2.5.jar deleted file mode 100644 index 337dd879c0cc..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-embedder-3.2.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-model-3.2.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-model-3.2.5.jar deleted file mode 100644 index 04eeeabf5c0b..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-model-3.2.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-model-builder-3.2.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-model-builder-3.2.5.jar deleted file mode 100644 index 5a62f9c9a3c9..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-model-builder-3.2.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-plugin-api-3.2.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-plugin-api-3.2.5.jar deleted file mode 100644 index 37e847b66113..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-plugin-api-3.2.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-repository-metadata-3.2.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-repository-metadata-3.2.5.jar deleted file mode 100644 index 9a0fb9782d60..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-repository-metadata-3.2.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-settings-3.2.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-settings-3.2.5.jar deleted file mode 100644 index d99362cc756d..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-settings-3.2.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-settings-builder-3.2.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-settings-builder-3.2.5.jar deleted file mode 100644 index e6297df405cd..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/maven-settings-builder-3.2.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/org.eclipse.sisu.inject-0.3.0.M1.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/org.eclipse.sisu.inject-0.3.0.M1.jar deleted file mode 100644 index 6c147f212faf..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/org.eclipse.sisu.inject-0.3.0.M1.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/org.eclipse.sisu.plexus-0.3.0.M1.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/org.eclipse.sisu.plexus-0.3.0.M1.jar deleted file mode 100644 index ce4806c4f123..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/org.eclipse.sisu.plexus-0.3.0.M1.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-cipher.license b/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-cipher.license deleted file mode 100644 index ab190e53691f..000000000000 --- a/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-cipher.license +++ /dev/null @@ -1,445 +0,0 @@ - - - - Apache License, Version 2.0 - - - - - - - - - - - - - - - - - -
- - -
-

Apache License

Version 2.0, January 2004

-http://www.apache.org/licenses/

-

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

1. Definitions.

-

"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document.

-

"Licensor" shall mean the copyright owner or entity authorized by the -copyright owner that is granting the License.

-

"Legal Entity" shall mean the union of the acting entity and all other -entities that control, are controlled by, or are under common control with -that entity. For the purposes of this definition, "control" means (i) the -power, direct or indirect, to cause the direction or management of such -entity, whether by contract or otherwise, or (ii) ownership of fifty -percent (50%) or more of the outstanding shares, or (iii) beneficial -ownership of such entity.

-

"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License.

-

"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation source, -and configuration files.

-

"Object" form shall mean any form resulting from mechanical transformation -or translation of a Source form, including but not limited to compiled -object code, generated documentation, and conversions to other media types.

-

"Work" shall mean the work of authorship, whether in Source or Object form, -made available under the License, as indicated by a copyright notice that -is included in or attached to the work (an example is provided in the -Appendix below).

-

"Derivative Works" shall mean any work, whether in Source or Object form, -that is based on (or derived from) the Work and for which the editorial -revisions, annotations, elaborations, or other modifications represent, as -a whole, an original work of authorship. For the purposes of this License, -Derivative Works shall not include works that remain separable from, or -merely link (or bind by name) to the interfaces of, the Work and Derivative -Works thereof.

-

"Contribution" shall mean any work of authorship, including the original -version of the Work and any modifications or additions to that Work or -Derivative Works thereof, that is intentionally submitted to Licensor for -inclusion in the Work by the copyright owner or by an individual or Legal -Entity authorized to submit on behalf of the copyright owner. For the -purposes of this definition, "submitted" means any form of electronic, -verbal, or written communication sent to the Licensor or its -representatives, including but not limited to communication on electronic -mailing lists, source code control systems, and issue tracking systems that -are managed by, or on behalf of, the Licensor for the purpose of discussing -and improving the Work, but excluding communication that is conspicuously -marked or otherwise designated in writing by the copyright owner as "Not a -Contribution."

-

"Contributor" shall mean Licensor and any individual or Legal Entity on -behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work.

-

2. Grant of Copyright License. Subject to the -terms and conditions of this License, each Contributor hereby grants to You -a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare Derivative Works of, publicly -display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form.

-

3. Grant of Patent License. Subject to the terms -and conditions of this License, each Contributor hereby grants to You a -perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except as stated in this section) patent license to make, have made, use, -offer to sell, sell, import, and otherwise transfer the Work, where such -license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by -combination of their Contribution(s) with the Work to which such -Contribution(s) was submitted. If You institute patent litigation against -any entity (including a cross-claim or counterclaim in a lawsuit) alleging -that the Work or a Contribution incorporated within the Work constitutes -direct or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate as of the -date such litigation is filed.

-

4. Redistribution. You may reproduce and -distribute copies of the Work or Derivative Works thereof in any medium, -with or without modifications, and in Source or Object form, provided that -You meet the following conditions:

-
    -
  1. You must give any other recipients of the Work or Derivative Works a -copy of this License; and
  2. - -
  3. You must cause any modified files to carry prominent notices stating -that You changed the files; and
  4. - -
  5. You must retain, in the Source form of any Derivative Works that You -distribute, all copyright, patent, trademark, and attribution notices from -the Source form of the Work, excluding those notices that do not pertain to -any part of the Derivative Works; and
  6. - -
  7. If the Work includes a "NOTICE" text file as part of its distribution, -then any Derivative Works that You distribute must include a readable copy -of the attribution notices contained within such NOTICE file, excluding -those notices that do not pertain to any part of the Derivative Works, in -at least one of the following places: within a NOTICE text file distributed -as part of the Derivative Works; within the Source form or documentation, -if provided along with the Derivative Works; or, within a display generated -by the Derivative Works, if and wherever such third-party notices normally -appear. The contents of the NOTICE file are for informational purposes only -and do not modify the License. You may add Your own attribution notices -within Derivative Works that You distribute, alongside or as an addendum to -the NOTICE text from the Work, provided that such additional attribution -notices cannot be construed as modifying the License. -
    -
    -You may add Your own copyright statement to Your modifications and may -provide additional or different license terms and conditions for use, -reproduction, or distribution of Your modifications, or for any such -Derivative Works as a whole, provided Your use, reproduction, and -distribution of the Work otherwise complies with the conditions stated in -this License. -
  8. - -
- -

5. Submission of Contributions. Unless You -explicitly state otherwise, any Contribution intentionally submitted for -inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the -terms of any separate license agreement you may have executed with Licensor -regarding such Contributions.

-

6. Trademarks. This License does not grant -permission to use the trade names, trademarks, service marks, or product -names of the Licensor, except as required for reasonable and customary use -in describing the origin of the Work and reproducing the content of the -NOTICE file.

-

7. Disclaimer of Warranty. Unless required by -applicable law or agreed to in writing, Licensor provides the Work (and -each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, -without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You -are solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise -of permissions under this License.

-

8. Limitation of Liability. In no event and -under no legal theory, whether in tort (including negligence), contract, or -otherwise, unless required by applicable law (such as deliberate and -grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, -incidental, or consequential damages of any character arising as a result -of this License or out of the use or inability to use the Work (including -but not limited to damages for loss of goodwill, work stoppage, computer -failure or malfunction, or any and all other commercial damages or losses), -even if such Contributor has been advised of the possibility of such -damages.

-

9. Accepting Warranty or Additional Liability. -While redistributing the Work or Derivative Works thereof, You may choose -to offer, and charge a fee for, acceptance of support, warranty, indemnity, -or other liability obligations and/or rights consistent with this License. -However, in accepting such obligations, You may act only on Your own behalf -and on Your sole responsibility, not on behalf of any other Contributor, -and only if You agree to indemnify, defend, and hold each Contributor -harmless for any liability incurred by, or claims asserted against, such -Contributor by reason of your accepting any such warranty or additional -liability.

-

END OF TERMS AND CONDITIONS

-

APPENDIX: How to apply the Apache License to your work

-

To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "[]" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included -on the same "printed page" as the copyright notice for easier -identification within third-party archives.

-
Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-
- - - - diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-component-annotations-1.5.5.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-component-annotations-1.5.5.jar deleted file mode 100644 index e4de16fef89c..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-component-annotations-1.5.5.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-sec-dispatcher.license b/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-sec-dispatcher.license deleted file mode 100644 index ab190e53691f..000000000000 --- a/plugins/maven/maven32-server-impl/lib/maven32/lib/plexus-sec-dispatcher.license +++ /dev/null @@ -1,445 +0,0 @@ - - - - Apache License, Version 2.0 - - - - - - - - - - - - - - - - - -
- - -
-

Apache License

Version 2.0, January 2004

-http://www.apache.org/licenses/

-

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

1. Definitions.

-

"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document.

-

"Licensor" shall mean the copyright owner or entity authorized by the -copyright owner that is granting the License.

-

"Legal Entity" shall mean the union of the acting entity and all other -entities that control, are controlled by, or are under common control with -that entity. For the purposes of this definition, "control" means (i) the -power, direct or indirect, to cause the direction or management of such -entity, whether by contract or otherwise, or (ii) ownership of fifty -percent (50%) or more of the outstanding shares, or (iii) beneficial -ownership of such entity.

-

"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License.

-

"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation source, -and configuration files.

-

"Object" form shall mean any form resulting from mechanical transformation -or translation of a Source form, including but not limited to compiled -object code, generated documentation, and conversions to other media types.

-

"Work" shall mean the work of authorship, whether in Source or Object form, -made available under the License, as indicated by a copyright notice that -is included in or attached to the work (an example is provided in the -Appendix below).

-

"Derivative Works" shall mean any work, whether in Source or Object form, -that is based on (or derived from) the Work and for which the editorial -revisions, annotations, elaborations, or other modifications represent, as -a whole, an original work of authorship. For the purposes of this License, -Derivative Works shall not include works that remain separable from, or -merely link (or bind by name) to the interfaces of, the Work and Derivative -Works thereof.

-

"Contribution" shall mean any work of authorship, including the original -version of the Work and any modifications or additions to that Work or -Derivative Works thereof, that is intentionally submitted to Licensor for -inclusion in the Work by the copyright owner or by an individual or Legal -Entity authorized to submit on behalf of the copyright owner. For the -purposes of this definition, "submitted" means any form of electronic, -verbal, or written communication sent to the Licensor or its -representatives, including but not limited to communication on electronic -mailing lists, source code control systems, and issue tracking systems that -are managed by, or on behalf of, the Licensor for the purpose of discussing -and improving the Work, but excluding communication that is conspicuously -marked or otherwise designated in writing by the copyright owner as "Not a -Contribution."

-

"Contributor" shall mean Licensor and any individual or Legal Entity on -behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work.

-

2. Grant of Copyright License. Subject to the -terms and conditions of this License, each Contributor hereby grants to You -a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare Derivative Works of, publicly -display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form.

-

3. Grant of Patent License. Subject to the terms -and conditions of this License, each Contributor hereby grants to You a -perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except as stated in this section) patent license to make, have made, use, -offer to sell, sell, import, and otherwise transfer the Work, where such -license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by -combination of their Contribution(s) with the Work to which such -Contribution(s) was submitted. If You institute patent litigation against -any entity (including a cross-claim or counterclaim in a lawsuit) alleging -that the Work or a Contribution incorporated within the Work constitutes -direct or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate as of the -date such litigation is filed.

-

4. Redistribution. You may reproduce and -distribute copies of the Work or Derivative Works thereof in any medium, -with or without modifications, and in Source or Object form, provided that -You meet the following conditions:

-
    -
  1. You must give any other recipients of the Work or Derivative Works a -copy of this License; and
  2. - -
  3. You must cause any modified files to carry prominent notices stating -that You changed the files; and
  4. - -
  5. You must retain, in the Source form of any Derivative Works that You -distribute, all copyright, patent, trademark, and attribution notices from -the Source form of the Work, excluding those notices that do not pertain to -any part of the Derivative Works; and
  6. - -
  7. If the Work includes a "NOTICE" text file as part of its distribution, -then any Derivative Works that You distribute must include a readable copy -of the attribution notices contained within such NOTICE file, excluding -those notices that do not pertain to any part of the Derivative Works, in -at least one of the following places: within a NOTICE text file distributed -as part of the Derivative Works; within the Source form or documentation, -if provided along with the Derivative Works; or, within a display generated -by the Derivative Works, if and wherever such third-party notices normally -appear. The contents of the NOTICE file are for informational purposes only -and do not modify the License. You may add Your own attribution notices -within Derivative Works that You distribute, alongside or as an addendum to -the NOTICE text from the Work, provided that such additional attribution -notices cannot be construed as modifying the License. -
    -
    -You may add Your own copyright statement to Your modifications and may -provide additional or different license terms and conditions for use, -reproduction, or distribution of Your modifications, or for any such -Derivative Works as a whole, provided Your use, reproduction, and -distribution of the Work otherwise complies with the conditions stated in -this License. -
  8. - -
- -

5. Submission of Contributions. Unless You -explicitly state otherwise, any Contribution intentionally submitted for -inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the -terms of any separate license agreement you may have executed with Licensor -regarding such Contributions.

-

6. Trademarks. This License does not grant -permission to use the trade names, trademarks, service marks, or product -names of the Licensor, except as required for reasonable and customary use -in describing the origin of the Work and reproducing the content of the -NOTICE file.

-

7. Disclaimer of Warranty. Unless required by -applicable law or agreed to in writing, Licensor provides the Work (and -each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, -without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You -are solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise -of permissions under this License.

-

8. Limitation of Liability. In no event and -under no legal theory, whether in tort (including negligence), contract, or -otherwise, unless required by applicable law (such as deliberate and -grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, -incidental, or consequential damages of any character arising as a result -of this License or out of the use or inability to use the Work (including -but not limited to damages for loss of goodwill, work stoppage, computer -failure or malfunction, or any and all other commercial damages or losses), -even if such Contributor has been advised of the possibility of such -damages.

-

9. Accepting Warranty or Additional Liability. -While redistributing the Work or Derivative Works thereof, You may choose -to offer, and charge a fee for, acceptance of support, warranty, indemnity, -or other liability obligations and/or rights consistent with this License. -However, in accepting such obligations, You may act only on Your own behalf -and on Your sole responsibility, not on behalf of any other Contributor, -and only if You agree to indemnify, defend, and hold each Contributor -harmless for any liability incurred by, or claims asserted against, such -Contributor by reason of your accepting any such warranty or additional -liability.

-

END OF TERMS AND CONDITIONS

-

APPENDIX: How to apply the Apache License to your work

-

To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "[]" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included -on the same "printed page" as the copyright notice for easier -identification within third-party archives.

-
Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-
- - - - diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/sisu-guice-3.2.3-no_aop.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/sisu-guice-3.2.3-no_aop.jar deleted file mode 100644 index f4db997cefa9..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/sisu-guice-3.2.3-no_aop.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/slf4j-api.license b/plugins/maven/maven32-server-impl/lib/maven32/lib/slf4j-api.license deleted file mode 100644 index 93f38931e339..000000000000 --- a/plugins/maven/maven32-server-impl/lib/maven32/lib/slf4j-api.license +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - - - - The MIT License (MIT) | Open Source Initiative - - - - - - - - - - - - -
-
- - - - - -
-

You are here

-

The MIT License (MIT)

-
-
-
- - -
-
- - - - -
- [OSI Approved License] -

The MIT License (MIT)

-

Copyright (c) <year> <copyright holders>

-

Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.

-

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

-
- -
- - -
- -
-
-
-
-
- -
- - -
-
- - diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/slf4j-simple.license b/plugins/maven/maven32-server-impl/lib/maven32/lib/slf4j-simple.license deleted file mode 100644 index 93f38931e339..000000000000 --- a/plugins/maven/maven32-server-impl/lib/maven32/lib/slf4j-simple.license +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - - - - The MIT License (MIT) | Open Source Initiative - - - - - - - - - - - - -
-
- - - - - -
-

You are here

-

The MIT License (MIT)

-
-
-
- - -
-
- - - - -
- [OSI Approved License] -

The MIT License (MIT)

-

Copyright (c) <year> <copyright holders>

-

Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.

-

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

-
- -
- - -
- -
-
-
-
-
- -
- - -
-
- - diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-http-shared-2.8.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-http-shared-2.8.jar deleted file mode 100644 index a7284cdede5b..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-http-shared-2.8.jar and /dev/null differ diff --git a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-provider-api-2.8.jar b/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-provider-api-2.8.jar deleted file mode 100644 index 86f55059b512..000000000000 Binary files a/plugins/maven/maven32-server-impl/lib/maven32/lib/wagon-provider-api-2.8.jar and /dev/null differ diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java index 918a4d253073..57709762a91a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java @@ -103,7 +103,7 @@ public class MavenServerManager extends RemoteObjectWrapper impleme if (pluginFileOrDir.isDirectory()) { File parentFile = getMavenPluginParentFile(); myBundledMaven2Home = new File(parentFile, "maven2-server-impl/lib/maven2"); - myBundledMaven3Home = new File(parentFile, "maven30-server-impl/lib/maven3"); + myBundledMaven3Home = new File(parentFile, "maven3-server-impl/lib/maven3"); } else { myBundledMaven2Home = new File(root, "maven2"); @@ -407,7 +407,7 @@ public class MavenServerManager extends RemoteObjectWrapper impleme classpath.add(new File(root, "maven30-server-impl")); } else { - classpath.add(new File(root, "maven32-server-impl")); + classpath.add(new File(root, "maven3-server-impl")); } } } @@ -426,7 +426,7 @@ public class MavenServerManager extends RemoteObjectWrapper impleme classpath.add(new File(root, "maven30-server-impl.jar")); } else { - classpath.add(new File(root, "maven32-server-impl.jar")); + classpath.add(new File(root, "maven3-server-impl.jar")); } } }