Commit Graph

394 Commits

Author SHA1 Message Date
Brett Leslie Porter 726e4adbba this causes plexus-utils clashes, remove
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670348 13f79535-47bb-0310-9956-ffa450edef68
2008-06-22 12:38:31 +00:00
Brett Leslie Porter 3acaa63cf8 adjust the embedder tests:
- remove a number of downloads from central that were slowing the build significantly
- ensure the tests will run with a repo manager and no central access
- ensure the tests will run offline if the local repository is populated

The technique for populating the repository is very hacky. We really need the tests to be doing this themselves. Perhaps moving these IT-like tests into the IT section and alongside the core ITs is the way to go - but this is a start.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669222 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 16:56:56 +00:00
Paul Gier 9f84e95bab Allow use of ! to deactivate a profile. Remove use of E: and D: for enabling and disabling.
Issue id: MNG-3571


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@656846 13f79535-47bb-0310-9956-ffa450edef68
2008-05-15 21:21:31 +00:00
John Dennis Casey e28b62cbe7 Allow multiple -P options, and fix explicit en/disable notations of E:/+ for enable, D:/- for disable.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@654207 13f79535-47bb-0310-9956-ffa450edef68
2008-05-07 18:44:18 +00:00
Brian E Fox 1c50dc0d0d clean up the poms and move versions to dependencyManagement
Issue id: c


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@653481 13f79535-47bb-0310-9956-ffa450edef68
2008-05-05 13:46:40 +00:00
Paul Gier 1245ac784e Add support for multiple -P params on the command line.
Issue id: MNG-3268


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@652912 13f79535-47bb-0310-9956-ffa450edef68
2008-05-02 21:04:22 +00:00
John Dennis Casey 0c2243d407 Adding system/execution property maven.mode.standalone that will reflect whether maven started via MavenCli or not.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@651080 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 21:49:49 +00:00
Herve Boutemy 007fe63a03 added site descriptors to provide modules/parent links (merged from 2.0.x branch r649903)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649913 13f79535-47bb-0310-9956-ffa450edef68
2008-04-20 11:37:31 +00:00
John Dennis Casey 36092a009d Adding ProjectBuilderConfiguration method for buildProjectWithDependencies, then switch the embedder.readProject* to use the ProjectBuilderConfiguration-enabled methods.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649629 13f79535-47bb-0310-9956-ffa450edef68
2008-04-18 18:00:27 +00:00
Jason van Zyl db643afb25 o removing the distribution assembly from the embedder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648511 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 04:57:44 +00:00
Jason van Zyl c224eeefb2 o put the embedder documentation in the normal site
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648507 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 04:36:21 +00:00
Jason van Zyl cc68735fcc o we don't need the scripts as everyone is using the same embedder now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648481 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 01:19:28 +00:00
Jason van Zyl 18e797c7d0 o turn off the debugging output, shave off a minute from the build, you can tell what's wrong from the test reports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648479 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 01:03:33 +00:00
Jason van Zyl 8aa6300529 o version is now stated in the parent POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648294 13f79535-47bb-0310-9956-ffa450edef68
2008-04-15 15:55:34 +00:00
Herve Boutemy 19b26ee657 [MNG-3509] added default locale and platform encoding to "mvn -v" output
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@647626 13f79535-47bb-0310-9956-ffa450edef68
2008-04-13 21:04:55 +00:00
Herve Boutemy a36b220670 added Os.OS_FAMILY to showVersion() output (merged from 2.0.x branch r587331)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@647624 13f79535-47bb-0310-9956-ffa450edef68
2008-04-13 20:47:21 +00:00
John Dennis Casey c32aa5a656 Fixing unit test problems from it0103 fix, and fixing it0042...just 4 more failing ITs before this is back on its feet.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@645015 13f79535-47bb-0310-9956-ffa450edef68
2008-04-05 02:19:29 +00:00
John Dennis Casey 1d9d014cde Fixing MNG-3355 and MNG-2339.
This commit introduces three changes: user-level properties that are separated from the execution properties, where execution properties contain envars, sysprops, and user-level properties...user-level properties are useful for POM interpolation for 2339 and 3355.

Second, a ProjectBuilderConfiguration interface and default implementation, to stem the proliferation of method parameters to projectBuilder methods. This was a natural place to introduce it, as user-level properties had to be passed in separately from the execution properties, for interpolation.

Finally, interpolation has been switched to use the new plexus-interpolation project, which is based on the classes in plexus-utils.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644354 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 15:18:18 +00:00
Brian E Fox 8ff17e2654 MNG-3484: patch from James William Dumay to quote MAVEN_OPTS
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@641699 13f79535-47bb-0310-9956-ffa450edef68
2008-03-27 03:07:26 +00:00
Benjamin Bentmann 1c3af9f908 o Fixed svn:keywords
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640236 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 18:20:22 +00:00
Benjamin Bentmann 898e4afab6 o Added svn:eol-style=native
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640234 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 18:04:33 +00:00
Benjamin Bentmann 4efc9b5de9 o Removed svn:executable
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640229 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 17:57:41 +00:00
John Dennis Casey fdf69050f1 Reinstate mojo execution logging to the console using the default event monitor. Also, have the error-reporting unit test cleanup after itself.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634134 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 02:48:44 +00:00
Jason van Zyl 9bf54d4984 o rolling back r631468, we will use the container to dynamically pull in wagons in 2.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634081 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 23:34:06 +00:00
Milos Kleint 696823a995 include toolchain in the final build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633982 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 19:14:49 +00:00
Brett Leslie Porter 97e9f53ac3 [MNG-2234] activate profiles that are not present in the settings so that they can be defined in the POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633766 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 04:56:46 +00:00
Vincent Siveton 80a6818f01 o merged from r633053 (fixed potential NPE)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633054 13f79535-47bb-0310-9956-ffa450edef68
2008-03-03 12:09:01 +00:00
John Dennis Casey a5f49900f2 Adding the beginnings of a workspace to Maven, which is just a shared cache component for project, model, and POM file instances (for now). This allows fine-grained control over when such caches are cleared in environments where embedder instances may be reused multiple times, and will eventually enable new profile activators that require access to project information in the current build along with other advanced caching and cache-querying features.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632482 13f79535-47bb-0310-9956-ffa450edef68
2008-02-29 22:58:00 +00:00
Jason van Zyl 4411b1c425 Changing to name and not email.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632468 13f79535-47bb-0310-9956-ffa450edef68
2008-02-29 22:36:19 +00:00
Brett Leslie Porter c2bc33050c [MNG-2664] add wagon-webdav to the built in providers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@631468 13f79535-47bb-0310-9956-ffa450edef68
2008-02-27 02:46:17 +00:00
John Dennis Casey f88f9df9ff Fixing bad logic in unit tests where a test plugin must build first.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@630047 13f79535-47bb-0310-9956-ffa450edef68
2008-02-21 23:30:48 +00:00
John Dennis Casey d54cf5b9bb Ignore missing modules during extension-scanning when MavenEmbedder.readProject(..) is called. At other times, as in the case of normal builds, don't suppress missing module exceptions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629571 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 18:53:09 +00:00
John Dennis Casey 793020c798 Tests to verify that SCM inheritance calculations are correct, using both project builder directly and the embedder's readProject(..) method.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629549 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 18:11:15 +00:00
John Dennis Casey f72505bc77 Removing unstable test...it should be covered well enough with a conventional unit test on DefaultMavenExecutionRequestPopulator. Also, rolling back changes to the standard embedder test project pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629188 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 18:46:18 +00:00
John Dennis Casey 8c34003044 Trying to diagnose a build failure on a remote server...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629184 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 18:40:29 +00:00
John Dennis Casey 4bc04c413b Re-enable offline flag from the settings.xml.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629161 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 16:57:12 +00:00
Vincent Siveton f8bc0a121f o fixed plexus-classworlds due to r619106
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619231 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 00:37:34 +00:00
John Dennis Casey 37b11eb9e9 [MNG-2178] Modding M2_HOME detection for winnt.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619114 13f79535-47bb-0310-9956-ffa450edef68
2008-02-06 19:26:54 +00:00
John Dennis Casey 1611fcfbdf [MNG-3354] & [MNG-3296] Patching Windows batch files for maven, to improve support for Windows+Novell integration, and to handle the end of winnt's local scope with the errorlevel preserved.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619106 13f79535-47bb-0310-9956-ffa450edef68
2008-02-06 19:03:43 +00:00
John Dennis Casey 10da177f1d [MNG-3119] Modifying MavenProject.addAttachment(..) and MavenProjectHelper.attachArtifact(..) implementations to throw an unchecked exception when a project attachment will collide with existing attachments. This includes tests to verify the behavior. The unchecked exception allows Maven to deal with it as a real build failure, while avoiding the need to modify the MavenProjectHelper API, which is part of Maven's core and which would render many existing plugins incompatible with new Maven releases.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@618497 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 00:09:27 +00:00
Vincent Siveton 4733739db6 o merged r617829
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@617830 13f79535-47bb-0310-9956-ffa450edef68
2008-02-02 16:44:10 +00:00
John Dennis Casey b7ce1b8c93 Fixing the case where there were exceptions in the build, but for whatever reason they didn't trigger a reactor-manager build failure flag...in cases where there isn't really a project against which to log the error, for instance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@616968 13f79535-47bb-0310-9956-ffa450edef68
2008-01-31 00:36:26 +00:00
John Dennis Casey f2d7a5aa5f Fine-tuning an error reporting pointcut, and also adding a method to the embedder to allow a third party access to the build plan for a specific project, given a set of goals to be invoked.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@616825 13f79535-47bb-0310-9956-ffa450edef68
2008-01-30 18:13:07 +00:00
John Dennis Casey ba9624676d Cleanup use of repositories for resolving plugin dependencies by using a LinkedHashSet to avoid duplicated repository defs (although two defs pointing to the same URL but with different id's will still look like two repos).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@615004 13f79535-47bb-0310-9956-ffa450edef68
2008-01-24 21:29:12 +00:00
John Dennis Casey 8d42ef1ce3 Fixing error-reporting pointcut that I broke.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614342 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 22:01:57 +00:00
John Dennis Casey 77352f07f7 remove a debugging sysout.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614318 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 20:51:00 +00:00
Vincent Siveton 309fadbdcc o fixed duplicate license header
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614084 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 01:26:47 +00:00
John Dennis Casey b731e783fa Adding new unit test for non-recursive run, where one of the modules that should NOT be read contains an invalid parent reference.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613254 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 20:14:44 +00:00
John Dennis Casey 776a944764 Renaming tests for error-reporting, so they're (hopefully) short enough for windows users.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613227 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 19:06:04 +00:00
John Dennis Casey a0297f1d5b Fix some problems with the CLI reporter when the reactor manager hasn't been created yet (in cases where reading the projects for the reactor failed, for instance).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613039 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 01:56:20 +00:00