[seam-commits] Seam SVN: r14130 - in branches/enterprise/JBPAPP_5_0/build/maven: bin and 1 other directories.

Author: manaRH Date: 2011-07-19 07:19:02 -0400 (Tue, 19 Jul 2011) New Revision: 14130 Added: branches/enterprise/JBPAPP_5_0/build/maven/lib/maven-2.0.11-uber.jar Removed: branches/enterprise/JBPAPP_5_0/build/maven/lib/maven-2.0.8-uber.jar Modified: branches/enterprise/JBPAPP_5_0/build/maven/LICENSE.txt branches/enterprise/JBPAPP_5_0/build/maven/NOTICE.txt branches/enterprise/JBPAPP_5_0/build/maven/README.txt branches/enterprise/JBPAPP_5_0/build/maven/bin/mvn.bat branches/enterprise/JBPAPP_5_0/build/maven/bin/mvnDebug branches/enterprise/JBPAPP_5_0/build/maven/bin/mvnDebug.bat Log: JBPAPP-6638 upgrading maven-ant-task.jar Modified: branches/enterprise/JBPAPP_5_0/build/maven/LICENSE.txt =================================================================== --- branches/enterprise/JBPAPP_5_0/build/maven/LICENSE.txt 2011-07-19 10:04:52 UTC (rev 14129) +++ branches/enterprise/JBPAPP_5_0/build/maven/LICENSE.txt 2011-07-19 11:19:02 UTC (rev 14130) @@ -1,202 +1,233 @@ - - 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. + + 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 + +License for JSch + +------------------------------------------------------------------------------ +Copyright (c) 2002,2003,2004,2005,2006,2007,2008 Atsuhiko Yamanaka, JCraft,Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 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. + + 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: branches/enterprise/JBPAPP_5_0/build/maven/NOTICE.txt =================================================================== --- branches/enterprise/JBPAPP_5_0/build/maven/NOTICE.txt 2011-07-19 10:04:52 UTC (rev 14129) +++ branches/enterprise/JBPAPP_5_0/build/maven/NOTICE.txt 2011-07-19 11:19:02 UTC (rev 14130) @@ -1,11 +1,20 @@ -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - -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/). + ========================================================================= + == 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/). + +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: branches/enterprise/JBPAPP_5_0/build/maven/README.txt =================================================================== --- branches/enterprise/JBPAPP_5_0/build/maven/README.txt 2011-07-19 10:04:52 UTC (rev 14129) +++ branches/enterprise/JBPAPP_5_0/build/maven/README.txt 2011-07-19 11:19:02 UTC (rev 14130) @@ -1,23 +1,78 @@ -Installing Maven 2 -================== - -The following instructions show how to install Maven 2: - -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 - -2) A directory called "maven-2.0" will be created. - -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% - -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 more information, please see http://maven.apache.org - + + Apache Maven + + What is it? + ----------- + + 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. + + Documentation + ------------- + + 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/. + + Release Notes + ------------- + + 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: branches/enterprise/JBPAPP_5_0/build/maven/bin/mvn.bat =================================================================== --- branches/enterprise/JBPAPP_5_0/build/maven/bin/mvn.bat 2011-07-19 10:04:52 UTC (rev 14129) +++ branches/enterprise/JBPAPP_5_0/build/maven/bin/mvn.bat 2011-07-19 11:19:02 UTC (rev 14130) @@ -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" @@ -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 @@ -63,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. @@ -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,11 +85,18 @@ 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. -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. @@ -97,9 +106,14 @@ :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 @@ -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 -@endlocal +@endlocal & set ERROR_CODE=%ERROR_CODE% :postExec if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" @@ -168,5 +184,5 @@ if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% -exit /B %ERROR_CODE% +cmd /C exit /B %ERROR_CODE% Modified: branches/enterprise/JBPAPP_5_0/build/maven/bin/mvnDebug =================================================================== --- branches/enterprise/JBPAPP_5_0/build/maven/bin/mvnDebug 2011-07-19 10:04:52 UTC (rev 14129) +++ branches/enterprise/JBPAPP_5_0/build/maven/bin/mvnDebug 2011-07-19 11:19:02 UTC (rev 14130) @@ -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,9 +159,11 @@ 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}" \ ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS + Modified: branches/enterprise/JBPAPP_5_0/build/maven/bin/mvnDebug.bat =================================================================== --- branches/enterprise/JBPAPP_5_0/build/maven/bin/mvnDebug.bat 2011-07-19 10:04:52 UTC (rev 14129) +++ branches/enterprise/JBPAPP_5_0/build/maven/bin/mvnDebug.bat 2011-07-19 11:19:02 UTC (rev 14130) @@ -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 -@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 +@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" @@ -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 @@ -66,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. @@ -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,11 +88,18 @@ 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. -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. @@ -100,9 +109,14 @@ :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 @@ -143,18 +157,19 @@ @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 :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 +178,7 @@ goto postExec :endNT -@endlocal +@endlocal & set ERROR_CODE=%ERROR_CODE% :postExec if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" Added: branches/enterprise/JBPAPP_5_0/build/maven/lib/maven-2.0.11-uber.jar =================================================================== (Binary files differ) Property changes on: branches/enterprise/JBPAPP_5_0/build/maven/lib/maven-2.0.11-uber.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: branches/enterprise/JBPAPP_5_0/build/maven/lib/maven-2.0.8-uber.jar =================================================================== (Binary files differ)