4302 Commits

Author SHA1 Message Date
Brett Leslie Porter
d69207adea fix bootstrap on linux
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345692 13f79535-47bb-0310-9956-ffa450edef68
2005-11-20 00:14:46 +00:00
Brett Leslie Porter
ab24e2805c PR: MNG-1620
Submitted by: Bruno Aranda
add .par and .ejb3 to the classpath.
also set the language to java


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345645 13f79535-47bb-0310-9956-ffa450edef68
2005-11-19 10:15:21 +00:00
Jason van Zyl
02902d53a2 --------------------------------------------------------------
Issue: MNG-1470
     URL: http://jira.codehaus.org/browse/MNG-1470
 Summary: mvn can't calculate M2_HOME when mvn is a relative symlink
Reporter: Nicolás Lichtmaier (niqueco)
--------------------------------------------------------------

o patch applied
 


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345559 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 20:12:21 +00:00
Jason van Zyl
4350da7547 Issue: MNG-1416
URL: http://jira.codehaus.org/browse/MNG-1416
 Summary: Patch:  Small addition to Settings.xml documentation
Reporter: K.C. Baltz (kcbaltz)

o apply patch to mdo file to doco on properties 


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345485 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 14:05:06 +00:00
Emmanuel Venisse
2da90eece1 Fix compile error
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345471 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 07:54:40 +00:00
Carlos Sanchez Gonzalez
23062dbf13 Prevent commons-logging-1.1-dev
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345397 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 01:00:16 +00:00
Emmanuel Venisse
bee6e222ee [MNG-1598] Allow user to not include META-INF/maven in jars
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345380 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 00:18:20 +00:00
John Dennis Casey
f936cfd675 Added code to assembleLineage(..) in DefaultMavenProjectBuilder that enforces the rule that parent POMs should have packaging == 'pom'.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345313 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 19:31:33 +00:00
John Dennis Casey
9584088c44 PR: MNG-1499
Submitted By: David Jackman
Reviewed By: John Casey

Applied. Thanks, David.

This patch makes the ordering of plugins deterministic after they are merged via inheritance or other mechanism.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345312 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 19:30:44 +00:00
John Dennis Casey
5d95af5f30 Using parent pom with packaging == pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345311 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 19:28:49 +00:00
John Dennis Casey
e4af55175e Adding code to verify that parent-model's packaging == pom inside the assembleLineage() method.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345299 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 18:28:12 +00:00
John Dennis Casey
df43187e32 PR: MNG-1466
Submitted By: Garrett Conaty
Reviewed By: John Casey

Applied patch, with small changes to the default repository id's to match those in Maven proper. "default-local" -> "local", and "default-remote" -> "central".

This patch adds ID handling to repositories in the maven ant tasks. It should enable definition of multiple remote repositories in an Ant script.

Thanks, Garrett and Konstantin, for the work!


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345281 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 16:46:16 +00:00
Emmanuel Venisse
e5320b624d Fix bootstrap under windows.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345219 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 10:27:31 +00:00
Brett Leslie Porter
e30e6ca949 fix bootstrap on Windows
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345178 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 03:39:28 +00:00
Brett Leslie Porter
3c5f84b6b6 fix encoding issues in parser
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345168 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 02:19:16 +00:00
John Dennis Casey
ad2dd60452 PR: MNG-1394
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied. Thanks, Edwin!

NOTE: I added a debug statement in the case where relativePath refers to a directory, to tell the user that we're looking for 'pom.xml' in that dir.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345109 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 20:35:36 +00:00
John Dennis Casey
524ae18b88 PR: MNG-1404
Submitted By: David Jackman
Reviewed By: John Casey

Did not apply this patch. The typo fix in MavenMetadataSource was already fixed, and the xpp3 parse error in the DefaultMavenProjectBuilder didn't need to be wrapped in a ModelValidationResult...Added it to the exception message instead.

Still, thanks for isolating this code for reformatting, David.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345105 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 20:28:53 +00:00
John Dennis Casey
b8b8e02e2b PR: MNG-1276
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patch, with some modifications. Specifically, changed the validation message when <modelVersion>4.0.0</modelVersion> is not found, added reason to the warning line (no newlines here, just a hint at why it's wrong), and reformatted the debug output to be a bit more terse.

Thanks, Edwin.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345081 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 18:09:34 +00:00
Emmanuel Venisse
7e6eefa883 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345048 13f79535-47bb-0310-9956-ffa450edef68 2005-11-16 16:06:12 +00:00
Emmanuel Venisse
2d8bbe0e14 allow windows 2003
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345047 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 16:02:45 +00:00
Emmanuel Venisse
078027332e Add system environment variables to commandline. mvn need at least SystemRoot under windows
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345043 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 15:44:27 +00:00
Brett Leslie Porter
ca2105d0da clean up jar mojo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345030 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 15:05:02 +00:00
Emmanuel Venisse
8b2db947ad copy bootstrap-mini.jar in bootstrap directory, and delete it at the end
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345025 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 14:36:36 +00:00
Brett Leslie Porter
e0ed5f4247 fix paths
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345018 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 14:05:24 +00:00
Brett Leslie Porter
68d386c4b9 setup windows bootstrap
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345015 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 13:40:42 +00:00
Brett Leslie Porter
aa06bb1188 fix m2 home
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345012 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 13:32:45 +00:00
Brett Leslie Porter
ec3106b795 switch bootstrap
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345011 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 13:31:15 +00:00
Brett Leslie Porter
c42f1392a2 move plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345007 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 13:24:46 +00:00
Brett Leslie Porter
ade5ee1d50 match up bootstrap artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345001 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 13:17:50 +00:00
Brett Leslie Porter
20dd3744cc fix boolean args
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345000 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 13:03:07 +00:00
Brett Leslie Porter
fe47030632 show command
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344998 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 12:57:06 +00:00
Brett Leslie Porter
24d498554b need to download the plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344997 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 12:41:04 +00:00
Brett Leslie Porter
c7ede5c4c2 remove some hardcoding
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344992 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 12:31:08 +00:00
Brett Leslie Porter
6bd9ce4869 updated CI
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344986 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 12:13:19 +00:00
Brett Leslie Porter
436061ce93 build plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344983 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 11:25:11 +00:00
Emmanuel Venisse
750e08a984 Fix name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344977 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 11:04:23 +00:00
Brett Leslie Porter
f1f18322e9 add a command line parser
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344954 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 08:29:06 +00:00
Brett Leslie Porter
cabf3d4759 rnu integration tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344908 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 05:56:00 +00:00
Brett Leslie Porter
1248c893ec build assembly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344874 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 04:15:09 +00:00
Brett Leslie Porter
b30c5c3a30 move bootstrap script
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344865 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 03:43:28 +00:00
Brett Leslie Porter
c21cbfa66c make script executable
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344861 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 03:23:18 +00:00
John Dennis Casey
f684990abc PR: MNG-1462
Submitted By: Jerome Lacoste
Reviewed By: John Casey

Applied patch. Thanks, Jerome.

I had to apply parts of this manually, so the result may be slightly different from the original diff.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344428 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 20:17:34 +00:00
John Dennis Casey
ba7249b692 PR: MNG-1274
Submitted By: Jerome Lacoste
Reviewed By: John Casey

Applied patch. Thanks, Jerome!



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344424 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 20:00:37 +00:00
John Dennis Casey
8b824565b6 rolling back version of plugin parent, to keep this compatible with 2.0 release of maven-project...any API changes for maven-project will have to go in a later release of the assy plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344394 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 16:55:39 +00:00
John Dennis Casey
ab27ae65a7 Decoupling ${version} expressions from POM version before resolving it to a buildnumber/timestamp on install or deploy.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344386 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 16:15:21 +00:00
Vincent Massol
1d340a10f4 Fixed bootstrap on windows. For some reason the plugin plugin doesn't build the first time so we need to build it twice...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344377 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 15:37:46 +00:00
Brett Leslie Porter
9b2e3708a4 fix what appears to be a typo - need an inclusion
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344360 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 12:54:44 +00:00
Brett Leslie Porter
36f39fc926 split bootstrap into two stages
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344329 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 08:06:13 +00:00
John Dennis Casey
eb1651be3c Fixing CI. Had to move the addPlugin(..) call back to its original spot, and expose a new method in MavenProject to inject PluginManagement info to a Plugin instance that's passed in as a parameter.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344294 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 02:38:33 +00:00
Carlos Sanchez Gonzalez
adefb99e33 When overriding repoDirectory it's used for the next servers in the sync session
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344282 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 00:27:15 +00:00