mirror of https://github.com/apache/maven.git
we have to keep classwords in a separate jar and boot it by itself or we end up with everythign in the primordial classloade
which sucks ass. I didn't notice that until I ran a big slew of tests and the realm out put was entirely different. We defin definitely want to boot up with just classworlds in the primordial loader so we can do what we like with the rest git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561194 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl
parent
69a491ba0b
commit
19ba741d4d
|
|
@ -30,7 +30,7 @@ under the License.
|
|||
<artifactId>maven-embedder</artifactId>
|
||||
<name>Maven Embedder</name>
|
||||
<properties>
|
||||
<bundleVersion>2.1.0.v20070601-0109</bundleVersion>
|
||||
<bundleVersion>2.1.0.v20070728-1835</bundleVersion>
|
||||
</properties>
|
||||
<build>
|
||||
<resources>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,18 @@
|
|||
#!/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.
|
||||
# Copyright 2001-2004 The Apache Software Foundation.
|
||||
#
|
||||
# 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.
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
|
||||
|
|
@ -160,8 +157,9 @@ fi
|
|||
|
||||
exec "$JAVACMD" \
|
||||
$MAVEN_OPTS \
|
||||
-classpath "${M2_HOME}"/lib/maven-embedder-*.jar \
|
||||
-classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
|
||||
"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
|
||||
"-Dmaven.home=${M2_HOME}" \
|
||||
${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,19 @@
|
|||
@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 Copyright 2001-2004 The Apache Software Foundation.
|
||||
@REM
|
||||
@REM Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@REM you may not use this file except in compliance with the License.
|
||||
@REM 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, software
|
||||
@REM distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@REM See the License for the specific language governing permissions and
|
||||
@REM limitations under the License.
|
||||
@REM ----------------------------------------------------------------------------
|
||||
@REM
|
||||
|
||||
@REM ----------------------------------------------------------------------------
|
||||
@REM Maven2 Start Up Batch script
|
||||
|
|
@ -37,9 +35,6 @@
|
|||
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
|
||||
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
|
||||
|
||||
@REM set %HOME% to equivalent of $HOME
|
||||
if "%HOME%" == "" (set HOME=%HOMEDRIVE%%HOMEPATH%)
|
||||
|
||||
@REM Execute a user defined script before this one
|
||||
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
|
||||
|
||||
|
|
@ -101,7 +96,7 @@ goto error
|
|||
if NOT "%OS%"=="Windows_NT" goto Win9xArg
|
||||
|
||||
@REM -- 4NT shell
|
||||
if "%@eval[2+2]" == "4" goto 4NTArgs
|
||||
if "%eval[2+2]" == "4" goto 4NTArgs
|
||||
|
||||
@REM -- Regular WinNT shell
|
||||
set MAVEN_CMD_LINE_ARGS=%*
|
||||
|
|
@ -126,25 +121,14 @@ goto Win9xApp
|
|||
: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%"\lib\maven-embedder-*) do set MAVEN_JAR="%%i"
|
||||
goto runm2
|
||||
|
||||
@REM The 4NT Shell from jp software
|
||||
:4NTCWJars
|
||||
for %%i in ("%M2_HOME%\lib\maven-embedder-*") do set MAVEN_JAR="%%i"
|
||||
goto runm2
|
||||
|
||||
@REM Start MAVEN2
|
||||
:runm2
|
||||
%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %MAVEN_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
|
||||
for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i"
|
||||
%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.plexus.classworlds.launcher.Launcher %MAVEN_CMD_LINE_ARGS%
|
||||
if ERRORLEVEL 1 goto error
|
||||
goto end
|
||||
|
||||
:error
|
||||
if "%OS%"=="Windows_NT" @endlocal
|
||||
set ERROR_CODE=1
|
||||
|
||||
:end
|
||||
|
|
@ -169,3 +153,4 @@ if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
|
|||
|
||||
exit /B %ERROR_CODE%
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,14 @@ under the License.
|
|||
<format>tar.bz2</format>
|
||||
<format>zip</format>
|
||||
</formats>
|
||||
<dependencySets>
|
||||
<dependencySet>
|
||||
<outputDirectory>boot</outputDirectory>
|
||||
<includes>
|
||||
<include>org.codehaus.plexus:plexus-classworlds</include>
|
||||
</includes>
|
||||
</dependencySet>
|
||||
</dependencySets>
|
||||
<fileSets>
|
||||
<fileSet>
|
||||
<includes>
|
||||
|
|
@ -47,8 +55,6 @@ under the License.
|
|||
<includes>
|
||||
<include>m2</include>
|
||||
<include>mvn</include>
|
||||
<include>mvnr</include>
|
||||
<include>mvnr.rb</include>
|
||||
</includes>
|
||||
<lineEnding>unix</lineEnding>
|
||||
<fileMode>0755</fileMode>
|
||||
|
|
@ -61,7 +67,7 @@ under the License.
|
|||
<directory>target</directory>
|
||||
<outputDirectory>lib</outputDirectory>
|
||||
<includes>
|
||||
<include>maven-embedder-*.jar</include>
|
||||
<include>maven-embedder*.jar</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
</fileSets>
|
||||
|
|
|
|||
Loading…
Reference in New Issue