[jboss-cvs] JBossAS SVN: r74046 - in trunk: build and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 3 19:06:18 EDT 2008
Author: pgier
Date: 2008-06-03 19:06:17 -0400 (Tue, 03 Jun 2008)
New Revision: 74046
Added:
trunk/tools/maven/lib/maven-2.0.9-uber.jar
Removed:
trunk/tools/maven/lib/maven-2.0.8-uber.jar
Modified:
trunk/build/build.xml
trunk/pom.xml
trunk/tools/maven/NOTICE.txt
trunk/tools/maven/README.txt
trunk/tools/maven/bin/mvn
trunk/tools/maven/bin/mvn.bat
trunk/tools/maven/bin/mvnDebug
trunk/tools/maven/bin/mvnDebug.bat
Log:
[JBBUILD-474] Require maven 2.0.9 for the build.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-06-03 22:52:11 UTC (rev 74045)
+++ trunk/build/build.xml 2008-06-03 23:06:17 UTC (rev 74046)
@@ -909,13 +909,15 @@
<property name="maven.dir" value="${basedir}/../tools/maven"/>
<property name="thirdparty.maven.opts" value=""/>
-
+
<macrodef name="maven">
<attribute name="goal" />
<attribute name="basedir" />
<element name="args" implicit="true" optional="true" />
<sequential>
- <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}">
+ <echo message="Calling mvn command located in ${maven.dir}"/>
+ <java classname="org.codehaus.classworlds.Launcher" fork="true"
+ dir="@{basedir}" resultproperty="maven.result">
<classpath>
<fileset dir="${maven.dir}/boot">
<include name="*.jar" />
@@ -935,7 +937,15 @@
</macrodef>
<maven basedir="${basedir}/../thirdparty" goal="package"/>
-
+
+ <fail message="Unable to build thirdparty directory. See maven output for details.">
+ <condition>
+ <not>
+ <equals arg1="${maven.result}" arg2="0"/>
+ </not>
+ </condition>
+ </fail>
+
</target>
<!-- check if thirdparty libraries are to be downloaded -->
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-06-03 22:52:11 UTC (rev 74045)
+++ trunk/pom.xml 2008-06-03 23:06:17 UTC (rev 74046)
@@ -15,13 +15,6 @@
<url>http://www.jboss.com/products/jbossas</url>
<description>JBoss Application Server (aggregator)</description>
- <!-- Maven 2.0.8 or higher must be used to build this project because of
- - a bug in earlier versions when handling inter-module test scope dependencies.
- -->
- <prerequisites>
- <maven>2.0.8</maven>
- </prerequisites>
-
<build>
<plugins>
<plugin>
@@ -30,6 +23,29 @@
<version>2.0-beta-1</version>
<extensions>true</extensions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>2.0.9</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>1.5</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: trunk/tools/maven/NOTICE.txt
===================================================================
--- trunk/tools/maven/NOTICE.txt 2008-06-03 22:52:11 UTC (rev 74045)
+++ trunk/tools/maven/NOTICE.txt 2008-06-03 23:06:17 UTC (rev 74046)
@@ -1,3 +1,9 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Maven distribution. ==
+ =========================================================================
+
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
@@ -3,8 +9,2 @@
This product includes software (Plexus and Classworlds) developed by
The Codehaus Foundation (http://www.codehaus.org/).
-
-This product includes software (JSCH) developed by
-JCraft Inc. (http://www.jcraft.com/).
-
-This product includes software (JTidy) developed by
-SourceForge (http://www.sourceforge.net/).
Modified: trunk/tools/maven/README.txt
===================================================================
--- trunk/tools/maven/README.txt 2008-06-03 22:52:11 UTC (rev 74045)
+++ trunk/tools/maven/README.txt 2008-06-03 23:06:17 UTC (rev 74046)
@@ -1,23 +1,78 @@
-Installing Maven 2
-==================
-The following instructions show how to install Maven 2:
+ Apache Maven
-1) Unpack the archive where you would like to store the binaries, eg:
- tar zxvf maven-2.0.tar.gz
-or
- unzip maven-2.0.zip
+ What is it?
+ -----------
-2) A directory called "maven-2.0" will be created.
+ Maven is a software project management and comprehension tool. Based on
+ the concept of a Project Object Model (POM), Maven can manage a project's
+ build, reporting and documentation from a central piece of information.
-3) Add the bin directory to your PATH, eg:
- export PATH=/usr/local/maven-2.0/bin:$PATH
-or
- set PATH="c:\program files\maven-2.0\bin";%PATH%
+ Documentation
+ -------------
-4) Make sure JAVA_HOME is set to the location of your JDK
+ The documentation available as of the date of this release is included in
+ HTML format in the docs/ directory.
+ The most up-to-date documentation can be found at http://maven.apache.org/.
-5) Run "mvn --version" to verify that it is correctly installed.
+ Release Notes
+ -------------
-For more information, please see http://maven.apache.org
+ The full list of changes can be found at http://maven.apache.org/release-notes.html.
+ System Requirements
+ -------------------
+
+ JDK:
+ 1.4 or above (this is to execute Maven - it still allows you to build against 1.3
+ and prior JDK's).
+ Memory:
+ No minimum requirement.
+ Disk:
+ No minimum requirement. Approximately 100MB will be used for your local repository,
+ however this will vary depending on usage and can be removed and redownloaded at
+ any time.
+ Operating System:
+ No minimum requirement. On Windows, Windows NT and above or Cygwin is required for
+ the startup scripts. Tested on Windows XP, Fedora Core and Mac OS X.
+
+ Installing Maven
+ ----------------
+
+ 1) Unpack the archive where you would like to store the binaries, eg:
+
+ Unix-based Operating Systems (Linux, Solaris and Mac OS X)
+ tar zxvf apache-maven-2.0.x.tar.gz
+ Windows 2000/XP
+ unzip apache-maven-2.0.x.zip
+
+ 2) A directory called "apache-maven-2.0.x" will be created.
+
+ 3) Add the bin directory to your PATH, eg:
+
+ Unix-based Operating Systems (Linux, Solaris and Mac OS X)
+ export PATH=/usr/local/apache-maven-2.0.x/bin:$PATH
+ Windows 2000/XP
+ set PATH="c:\program files\apache-maven-2.0.x\bin";%PATH%
+
+ 4) Make sure JAVA_HOME is set to the location of your JDK
+
+ 5) Run "mvn --version" to verify that it is correctly installed.
+
+ For complete documentation, see http://maven.apache.org/download.html#Installation
+
+ Licensing
+ ---------
+
+ Please see the file called LICENSE.TXT
+
+ Maven URLS
+ ----------
+
+ Home Page: http://maven.apache.org/
+ Downloads: http://maven.apache.org/downloads.html
+ Mailing Lists: http://maven.apache.org/mail-lists.html
+ Source Code: http://svn.apache.org/repos/asf/maven/
+ Issue Tracking: http://jira.codehaus.org/browse/MNG
+ Wiki: http://docs.codehaus.org/display/MAVENUSER/
+ Available Plugins: http://maven.apache.org/plugins/index.html
Modified: trunk/tools/maven/bin/mvn
===================================================================
--- trunk/tools/maven/bin/mvn 2008-06-03 22:52:11 UTC (rev 74045)
+++ trunk/tools/maven/bin/mvn 2008-06-03 23:06:17 UTC (rev 74046)
@@ -128,7 +128,7 @@
JAVACMD="$JAVA_HOME/bin/java"
fi
else
- JAVACMD=java
+ JAVACMD="`which java`"
fi
fi
Modified: trunk/tools/maven/bin/mvn.bat
===================================================================
--- trunk/tools/maven/bin/mvn.bat 2008-06-03 22:52:11 UTC (rev 74045)
+++ trunk/tools/maven/bin/mvn.bat 2008-06-03 23:06:17 UTC (rev 74046)
@@ -47,6 +47,7 @@
@REM set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
@REM ==== START VALIDATION ====
if not "%JAVA_HOME%" == "" goto OkJHome
@@ -72,7 +73,8 @@
:chkMHome
if not "%M2_HOME%"=="" goto valMHome
-if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0\..
+if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0..
+if "%OS%"=="WINNT" SET M2_HOME=%~dp0..
if not "%M2_HOME%"=="" goto valMHome
echo.
@@ -83,6 +85,13 @@
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.
@@ -97,9 +106,14 @@
:init
@REM Decide how to startup depending on the version of windows
+ at 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
@@ -146,11 +160,13 @@
: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
@@ -159,7 +175,7 @@
goto postExec
:endNT
- at endlocal
+ at endlocal & set ERROR_CODE=%ERROR_CODE%
:postExec
if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
Modified: trunk/tools/maven/bin/mvnDebug
===================================================================
--- trunk/tools/maven/bin/mvnDebug 2008-06-03 22:52:11 UTC (rev 74045)
+++ trunk/tools/maven/bin/mvnDebug 2008-06-03 23:06:17 UTC (rev 74046)
@@ -33,7 +33,7 @@
# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
# ----------------------------------------------------------------------------
-INT_MAVEN_OPTS=$MAVEN_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+INT_MAVEN_OPTS="$MAVEN_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
echo Preparing to Execute Maven in Debug Mode
@@ -165,3 +165,4 @@
"-Dmaven.home=${M2_HOME}" \
${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
+
Modified: trunk/tools/maven/bin/mvnDebug.bat
===================================================================
--- trunk/tools/maven/bin/mvnDebug.bat 2008-06-03 22:52:11 UTC (rev 74045)
+++ trunk/tools/maven/bin/mvnDebug.bat 2008-06-03 23:06:17 UTC (rev 74046)
@@ -50,6 +50,7 @@
@REM set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
@REM ==== START VALIDATION ====
if not "%JAVA_HOME%" == "" goto OkJHome
@@ -75,7 +76,8 @@
:chkMHome
if not "%M2_HOME%"=="" goto valMHome
-if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0\..
+if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0..
+if "%OS%"=="WINNT" SET M2_HOME=%~dp0..
if not "%M2_HOME%"=="" goto valMHome
echo.
@@ -86,6 +88,13 @@
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.
@@ -100,9 +109,14 @@
:init
@REM Decide how to startup depending on the version of windows
+ at 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
@@ -150,11 +164,13 @@
: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
@@ -163,7 +179,7 @@
goto postExec
:endNT
- at endlocal
+ at endlocal & set ERROR_CODE=%ERROR_CODE%
:postExec
if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
Deleted: trunk/tools/maven/lib/maven-2.0.8-uber.jar
===================================================================
(Binary files differ)
Added: trunk/tools/maven/lib/maven-2.0.9-uber.jar
===================================================================
(Binary files differ)
Property changes on: trunk/tools/maven/lib/maven-2.0.9-uber.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-cvs-commits
mailing list