[jboss-cvs] JBossAS SVN: r92977 - in trunk/tools/maven: bin and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Aug 28 14:55:06 EDT 2009


Author: pgier
Date: 2009-08-28 14:55:05 -0400 (Fri, 28 Aug 2009)
New Revision: 92977

Added:
   trunk/tools/maven/lib/maven-2.2.1-uber.jar
Removed:
   trunk/tools/maven/bin/m2
   trunk/tools/maven/bin/m2.bat
   trunk/tools/maven/lib/maven-2.0.9-uber.jar
Modified:
   trunk/tools/maven/LICENSE.txt
   trunk/tools/maven/NOTICE.txt
   trunk/tools/maven/README.txt
   trunk/tools/maven/bin/m2.conf
   trunk/tools/maven/bin/mvn.bat
   trunk/tools/maven/bin/mvnDebug
   trunk/tools/maven/bin/mvnDebug.bat
   trunk/tools/maven/conf/settings.xml
Log:
[JBBUILD-554] Upgrade to Maven 2.2.1

Modified: trunk/tools/maven/LICENSE.txt
===================================================================
--- trunk/tools/maven/LICENSE.txt	2009-08-28 17:47:01 UTC (rev 92976)
+++ trunk/tools/maven/LICENSE.txt	2009-08-28 18:55:05 UTC (rev 92977)
@@ -176,27 +176,58 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
+License for JSch
 
-      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 (c) 2002,2003,2004,2005,2006,2007,2008 Atsuhiko Yamanaka, JCraft,Inc. 
+All rights reserved.
 
-   Copyright [yyyy] [name of copyright owner]
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-   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
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
 
-       http://www.apache.org/licenses/LICENSE-2.0
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
 
-   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.
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License for SLF4J
+
+Copyright (c) 2004-2008 QOS.ch
+ All rights reserved.
+
+ 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.
+
+

Modified: trunk/tools/maven/NOTICE.txt
===================================================================
--- trunk/tools/maven/NOTICE.txt	2009-08-28 17:47:01 UTC (rev 92976)
+++ trunk/tools/maven/NOTICE.txt	2009-08-28 18:55:05 UTC (rev 92977)
@@ -9,3 +9,12 @@
 
 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/jsch/).
+
+This product includes software (JTidy) developed at
+SourceForge (http://sourceforge.net/projects/jtidy).
+
+This product includes software (NekoHTML) developed at
+SourceForge (http://sourceforge.net/projects/nekohtml).

Modified: trunk/tools/maven/README.txt
===================================================================
--- trunk/tools/maven/README.txt	2009-08-28 17:47:01 UTC (rev 92976)
+++ trunk/tools/maven/README.txt	2009-08-28 18:55:05 UTC (rev 92977)
@@ -42,18 +42,18 @@
   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
+      tar zxvf apache-maven-2.1.x.tar.gz
     Windows 2000/XP
-      unzip apache-maven-2.0.x.zip
+      unzip apache-maven-2.1.x.zip
 
-  2) A directory called "apache-maven-2.0.x" will be created.
+  2) A directory called "apache-maven-2.1.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
+      export PATH=/usr/local/apache-maven-2.1.x/bin:$PATH
     Windows 2000/XP
-      set PATH="c:\program files\apache-maven-2.0.x\bin";%PATH%
+      set PATH="c:\program files\apache-maven-2.1.x\bin";%PATH%
 
   4) Make sure JAVA_HOME is set to the location of your JDK
 

Deleted: trunk/tools/maven/bin/m2
===================================================================
--- trunk/tools/maven/bin/m2	2009-08-28 17:47:01 UTC (rev 92976)
+++ trunk/tools/maven/bin/m2	2009-08-28 18:55:05 UTC (rev 92977)
@@ -1,26 +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.
-# ----------------------------------------------------------------------------
-
-echo ""
-echo THE m2 COMMMAND IS DEPRECATED - PLEASE RUN mvn INSTEAD
-echo ""
-
-. `dirname "$0"`/mvn
-exec "`dirname "$0"`/mvn" $QUOTED_ARGS

Deleted: trunk/tools/maven/bin/m2.bat
===================================================================
--- trunk/tools/maven/bin/m2.bat	2009-08-28 17:47:01 UTC (rev 92976)
+++ trunk/tools/maven/bin/m2.bat	2009-08-28 18:55:05 UTC (rev 92977)
@@ -1,26 +0,0 @@
- at REM ----------------------------------------------------------------------------
- at REM Licensed to the Apache Software Foundation (ASF) under one
- at REM or more contributor license agreements.  See the NOTICE file
- at REM distributed with this work for additional information
- at REM regarding copyright ownership.  The ASF licenses this file
- at REM to you under the Apache License, Version 2.0 (the
- at REM "License"); you may not use this file except in compliance
- at REM with the License.  You may obtain a copy of the License at
- at REM
- at REM    http://www.apache.org/licenses/LICENSE-2.0
- at REM
- at REM Unless required by applicable law or agreed to in writing,
- at REM software distributed under the License is distributed on an
- at REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- at REM KIND, either express or implied.  See the License for the
- at REM specific language governing permissions and limitations
- at REM under the License.
- at REM ----------------------------------------------------------------------------
-
- at ECHO OFF
-echo.
-echo THE m2 COMMMAND IS DEPRECATED - PLEASE RUN mvn INSTEAD
-echo.
-
-"%~dp0\mvn" %*
-

Modified: trunk/tools/maven/bin/m2.conf
===================================================================
--- trunk/tools/maven/bin/m2.conf	2009-08-28 17:47:01 UTC (rev 92976)
+++ trunk/tools/maven/bin/m2.conf	2009-08-28 18:55:05 UTC (rev 92977)
@@ -1,4 +1,4 @@
-main is org.apache.maven.cli.MavenCli from plexus.core
+main is org.apache.maven.cli.compat.CompatibleMain from plexus.core
 
 set maven.home default ${user.home}/m2
 

Modified: trunk/tools/maven/bin/mvn.bat
===================================================================
--- trunk/tools/maven/bin/mvn.bat	2009-08-28 17:47:01 UTC (rev 92976)
+++ trunk/tools/maven/bin/mvn.bat	2009-08-28 18:55:05 UTC (rev 92977)
@@ -38,7 +38,7 @@
 @if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
 
 @REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set HOME=%HOMEDRIVE%%HOMEPATH%)
+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"
@@ -64,7 +64,7 @@
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory.
-echo JAVA_HOME = %JAVA_HOME%
+echo JAVA_HOME = "%JAVA_HOME%"
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation
 echo.
@@ -73,8 +73,8 @@
 :chkMHome
 if not "%M2_HOME%"=="" goto valMHome
 
-if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0..
-if "%OS%"=="WINNT" 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.
@@ -87,8 +87,8 @@
 :valMHome
 
 :stripMHome
-if not _%M2_HOME:~-1%==_\ goto checkMBat
-set M2_HOME=%M2_HOME:~0,-1%
+if not "_%M2_HOME:~-1%"=="_\" goto checkMBat
+set "M2_HOME=%M2_HOME:~0,-1%"
 goto stripMHome
 
 :checkMBat
@@ -96,7 +96,7 @@
 
 echo.
 echo ERROR: M2_HOME is set to an invalid directory.
-echo M2_HOME = %M2_HOME%
+echo M2_HOME = "%M2_HOME%"
 echo Please set the M2_HOME variable in your environment to match the
 echo location of the Maven installation
 echo.
@@ -184,5 +184,5 @@
 
 if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
 
-exit /B %ERROR_CODE%
+cmd /C exit /B %ERROR_CODE%
 

Modified: trunk/tools/maven/bin/mvnDebug
===================================================================
--- trunk/tools/maven/bin/mvnDebug	2009-08-28 17:47:01 UTC (rev 92976)
+++ trunk/tools/maven/bin/mvnDebug	2009-08-28 18:55:05 UTC (rev 92977)
@@ -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"
+MAVEN_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
 
 echo Preparing to Execute Maven in Debug Mode
 
@@ -159,7 +159,8 @@
 fi
 
 exec "$JAVACMD" \
-  $INT_MAVEN_OPTS \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
   -classpath "${M2_HOME}"/boot/classworlds-*.jar \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}"  \

Modified: trunk/tools/maven/bin/mvnDebug.bat
===================================================================
--- trunk/tools/maven/bin/mvnDebug.bat	2009-08-28 17:47:01 UTC (rev 92976)
+++ trunk/tools/maven/bin/mvnDebug.bat	2009-08-28 18:55:05 UTC (rev 92977)
@@ -32,16 +32,16 @@
 @REM set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
 @REM ----------------------------------------------------------------------------
 
-set INT_MAVEN_OPTS=%MAVEN_OPTS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
- at echo Preparing to Execute Maven in Debug Mode
-
 @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%
 
+set MAVEN_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+ at echo Preparing to Execute Maven in Debug Mode
+
 @REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set HOME=%HOMEDRIVE%%HOMEPATH%)
+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"
@@ -67,7 +67,7 @@
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory.
-echo JAVA_HOME = %JAVA_HOME%
+echo JAVA_HOME = "%JAVA_HOME%"
 echo Please set the JAVA_HOME variable in your environment to match the
 echo location of your Java installation
 echo.
@@ -76,8 +76,8 @@
 :chkMHome
 if not "%M2_HOME%"=="" goto valMHome
 
-if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0..
-if "%OS%"=="WINNT" 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.
@@ -90,8 +90,8 @@
 :valMHome
 
 :stripMHome
-if not _%M2_HOME:~-1%==_\ goto checkMBat
-set M2_HOME=%M2_HOME:~0,-1%
+if not "_%M2_HOME:~-1%"=="_\" goto checkMBat
+set "M2_HOME=%M2_HOME:~0,-1%"
 goto stripMHome
 
 :checkMBat
@@ -99,7 +99,7 @@
 
 echo.
 echo ERROR: M2_HOME is set to an invalid directory.
-echo M2_HOME = %M2_HOME%
+echo M2_HOME = "%M2_HOME%"
 echo Please set the M2_HOME variable in your environment to match the
 echo location of the Maven installation
 echo.
@@ -157,8 +157,7 @@
 
 @REM Start MAVEN2
 :runm2
-
-%MAVEN_JAVA_EXE% %INT_MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end
 

Modified: trunk/tools/maven/conf/settings.xml
===================================================================
--- trunk/tools/maven/conf/settings.xml	2009-08-28 17:47:01 UTC (rev 92976)
+++ trunk/tools/maven/conf/settings.xml	2009-08-28 18:55:05 UTC (rev 92977)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -20,28 +22,30 @@
 <!--
  | This is the configuration file for Maven. It can be specified at two levels:
  |
- |  1. User Level. This settings.xml file provides configuration for a single user, 
- |                 and is normally provided in $HOME/.m2/settings.xml.
+ |  1. User Level. This settings.xml file provides configuration for a single user,
+ |                 and is normally provided in ${user.home}/.m2/settings.xml.
  |
- |                 NOTE: This location can be overridden with the system property:
+ |                 NOTE: This location can be overridden with the CLI option:
  |
- |                 -Dorg.apache.maven.user-settings=/path/to/user/settings.xml
+ |                 -s /path/to/user/settings.xml
  |
- |  2. Global Level. This settings.xml file provides configuration for all maven
- |                 users on a machine (assuming they're all using the same maven
- |                 installation). It's normally provided in 
+ |  2. Global Level. This settings.xml file provides configuration for all Maven
+ |                 users on a machine (assuming they're all using the same Maven
+ |                 installation). It's normally provided in
  |                 ${maven.home}/conf/settings.xml.
  |
- |                 NOTE: This location can be overridden with the system property:
+ |                 NOTE: This location can be overridden with the CLI option:
  |
- |                 -Dorg.apache.maven.global-settings=/path/to/global/settings.xml
+ |                 -gs /path/to/global/settings.xml
  |
  | The sections in this sample file are intended to give you a running start at
  | getting the most out of your Maven installation. Where appropriate, the default
  | values (values used when the setting is not specified) are provided.
  |
  |-->
-<settings>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
   <!-- localRepository
    | The path to the local repository maven will use to store artifacts.
    |
@@ -66,6 +70,18 @@
   <offline>false</offline>
   -->
 
+  <!-- pluginGroups
+   | This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
+   | when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
+   | "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
+   |-->
+  <pluginGroups>
+    <!-- pluginGroup
+     | Specifies a further group identifier to use for plugin lookup.
+    <pluginGroup>com.your.plugins</pluginGroup>
+    -->
+  </pluginGroups>
+
   <!-- proxies
    | This is a list of proxies which can be used on this machine to connect to the network.
    | Unless otherwise specified (by system property or command-line switch), the first proxy
@@ -83,7 +99,7 @@
       <password>proxypass</password>
       <host>proxy.host.net</host>
       <port>80</port>
-      <nonProxyHosts>local.net,some.host.com</nonProxyHosts>
+      <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
     </proxy>
     -->
   </proxies>
@@ -96,8 +112,8 @@
     <!-- server
      | Specifies the authentication information to use when connecting to a particular server, identified by
      | a unique name within the system (referred to by the 'id' attribute below).
-     | 
-     | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are 
+     |
+     | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
      |       used together.
      |
     <server>
@@ -106,7 +122,7 @@
       <password>repopwd</password>
     </server>
     -->
-    
+
     <!-- Another sample, using keys to authenticate.
     <server>
       <id>siteServer</id>
@@ -118,13 +134,13 @@
 
   <!-- mirrors
    | This is a list of mirrors to be used in downloading artifacts from remote repositories.
-   | 
+   |
    | It works like this: a POM may declare a repository to use in resolving certain artifacts.
    | However, this repository may have problems with heavy traffic at times, so people have mirrored
    | it to several places.
    |
    | That repository definition will have a unique id, so we can create a mirror reference for that
-   | repository, to be used as an alternate download site. The mirror site will be the preferred 
+   | repository, to be used as an alternate download site. The mirror site will be the preferred
    | server for that repository.
    |-->
   <mirrors>
@@ -141,20 +157,20 @@
     </mirror>
      -->
   </mirrors>
-  
+
   <!-- profiles
    | This is a list of profiles which can be activated in a variety of ways, and which can modify
    | the build process. Profiles provided in the settings.xml are intended to provide local machine-
    | specific paths and repository locations which allow the build to work in the local environment.
    |
    | For example, if you have an integration testing plugin - like cactus - that needs to know where
-   | your Tomcat instance is installed, you can provide a variable here such that the variable is 
+   | your Tomcat instance is installed, you can provide a variable here such that the variable is
    | dereferenced during the build process to configure the cactus plugin.
    |
    | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
    | section of this document (settings.xml) - will be discussed later. Another way essentially
    | relies on the detection of a system property, either matching a particular value for the property,
-   | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a 
+   | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
    | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
    | Finally, the list of active profiles can be specified directly from the command line.
    |
@@ -184,12 +200,12 @@
 
       <repositories>
         <repository>
-	  <id>jdk14</id>
-	  <name>Repository for JDK 1.4 builds</name>
-	  <url>http://www.myhost.com/maven/jdk14</url>
-	  <layout>default</layout>
-	  <snapshotPolicy>always</snapshotPolicy>
-	</repository>
+          <id>jdk14</id>
+          <name>Repository for JDK 1.4 builds</name>
+          <url>http://www.myhost.com/maven/jdk14</url>
+          <layout>default</layout>
+          <snapshotPolicy>always</snapshotPolicy>
+        </repository>
       </repositories>
     </profile>
     -->
@@ -203,7 +219,7 @@
      | <plugin>
      |   <groupId>org.myco.myplugins</groupId>
      |   <artifactId>myplugin</artifactId>
-     |   
+     |
      |   <configuration>
      |     <tomcatLocation>${tomcatPath}</tomcatLocation>
      |   </configuration>
@@ -218,9 +234,9 @@
 
       <activation>
         <property>
-	  <name>target-env</name>
-	  <value>dev</value>
-	</property>
+          <name>target-env</name>
+          <value>dev</value>
+        </property>
       </activation>
 
       <properties>

Deleted: trunk/tools/maven/lib/maven-2.0.9-uber.jar
===================================================================
(Binary files differ)

Copied: trunk/tools/maven/lib/maven-2.2.1-uber.jar (from rev 92952, trunk/tools/maven/lib/maven-2.0.9-uber.jar)
===================================================================
(Binary files differ)


Property changes on: trunk/tools/maven/lib/maven-2.2.1-uber.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 




More information about the jboss-cvs-commits mailing list