Commit Graph

416 Commits

Author SHA1 Message Date
Britton Isbell bc3660ec47 Detangled profile activitation dependency on realm manager. Move org.apache.maven.realm package to maven-core project.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695332 13f79535-47bb-0310-9956-ffa450edef68
2008-09-15 02:54:31 +00:00
Britton Isbell 9fff4c0612 Moved PathTranslator to maven-core. maven-project no longer uses it.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694912 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 10:07:23 +00:00
Britton Isbell 7dc42ed958 Replaced interpolator code.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694907 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 09:28:23 +00:00
Britton Isbell 50a1d13a08 Removed a unit test related to aspect eventing. Added back in direct setting of compile/script directories.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694118 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 04:55:50 +00:00
Britton Isbell cacc78b1d0 Removed dynamic injection of pom build during project construction. Deleted aspects.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694109 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 04:16:40 +00:00
Britton Isbell 6b96692a93 Merge of sisbell-maven-2.1-profile branch. Removes use of project lineage from builder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@693332 13f79535-47bb-0310-9956-ffa450edef68
2008-09-09 01:04:17 +00:00
Jason van Zyl b07c8d2e36 reverting that commit, meant for my branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@688584 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 23:38:39 +00:00
Jason van Zyl 2a94051f54 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@688581 13f79535-47bb-0310-9956-ffa450edef68 2008-08-24 23:24:41 +00:00
Britton Isbell 4cb42c34a7 Merged back changes from sisbell-maven-2.1-profile
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@685575 13f79535-47bb-0310-9956-ffa450edef68
2008-08-13 14:47:51 +00:00
Britton Isbell 398b62158e Merge of branch: sisbell-maven-2.1-profile.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@685443 13f79535-47bb-0310-9956-ffa450edef68
2008-08-13 05:09:00 +00:00
Jason van Zyl c82352832a o updating to 3.0-SNAPSHOT
o aparently when we start from scratch the bootstrap wasn't working, so the maven ant tasks will now igore trying to download the projects we
  are actually trying to build.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@684975 13f79535-47bb-0310-9956-ffa450edef68
2008-08-11 23:05:20 +00:00
Britton Isbell c8b842c976 Merge of SI_MAVEN_2_1 branch. New builder code.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679609 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 23:06:59 +00:00
Brett Leslie Porter 1cb6db67de [MNG-3652] minor improvement to the user agent for trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679010 13f79535-47bb-0310-9956-ffa450edef68
2008-07-23 07:15:51 +00:00
Benjamin Bentmann a14916cf8c o Considered file extensions in command search to enable tests for Windows
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@677452 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 22:33:58 +00:00
Brett Leslie Porter d046f6039f embedder tests that download artifacts and plugins should use the settings file for now to honour mirrors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@677239 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 11:18:50 +00:00
Jason van Zyl 5e2d60366b o adding some code to detect system executables so that tests which wrap those executables are only run when they are present. in trying to get people to run the ITs from a Hudson bundle it's apparent that not everyone had SVN installed. we need to be more sensitive to different environments for testing if we want more people to participate.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676103 13f79535-47bb-0310-9956-ffa450edef68
2008-07-12 00:07:06 +00:00
Jason van Zyl 667fe087d5 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676082 13f79535-47bb-0310-9956-ffa450edef68 2008-07-11 21:16:59 +00:00
John Dennis Casey a3719ed76c Improving the reliability of these two tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675349 13f79535-47bb-0310-9956-ffa450edef68
2008-07-09 21:42:49 +00:00
Jason van Zyl 668818f6ba MNG-3656: cleanup is complete as far as I can tell. I also got rid of a bunch of deps that said were needed, but the build seems to work fine, and I'm about to try on Mr Hudson.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674319 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 17:21:25 +00:00
Brett Leslie Porter 278b580c8f [MNG-3652] set a user agent for Maven HTTP requests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673901 13f79535-47bb-0310-9956-ffa450edef68
2008-07-04 04:32:09 +00:00
Brett Leslie Porter 4c5f43abf9 We require the newer version of the surefire plugin or it is possible to get old versions of plexus-utils in the tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672727 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 08:34:38 +00:00
John Dennis Casey cd2602d9e6 Adding -V|--show-version, and cleaning up interpolation to correspond with recent refactoriing in 2.0.x branch. Also, changing super-POM to use basedir/build.directory expressions in build paths, to enable paths to respond to changes in other, more basic paths (like outputDirectory responding to a change in build.directory). This is in preparation for merging over the dynamicBuild behavior.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@671936 13f79535-47bb-0310-9956-ffa450edef68
2008-06-26 16:34:27 +00:00
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