Commit Graph

5562 Commits

Author SHA1 Message Date
John Dennis Casey 2d5711c8f0 Adding SettingsBuilderAdvice, to enable skipping default locations for settings files. Also, removing the settings cache, to enable call-by-call synchronization of settings between Maven embedder instances that share the same settings files. Next step is to refresh settings per-call to the embedder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@511172 13f79535-47bb-0310-9956-ffa450edef68
2007-02-24 00:44:29 +00:00
John Dennis Casey b8289153a1 Adding read/writeSettings() api to the maven-tools and the embedder along with unit tests in each place, and adding a cache object for the settings that is based on the build-context.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@510335 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 01:01:54 +00:00
John Dennis Casey 086c589776 Adding default profile-id's.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@509744 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 20:51:15 +00:00
John Dennis Casey d508d7181c Prevent scanning of modules that are not in the current reactor, and simplify the API usage for scanning in a reactor scenario.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@509715 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 19:22:05 +00:00
John Dennis Casey 2b95701a5c Rearranging project-builder caching so it's done externally and available for use in the model-lineage builder and during artifact resolution as well.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@509692 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 18:09:53 +00:00
John Dennis Casey 6b36d026da Fixing problem with unresolved sub-expressions being converted to 'null'.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@508151 13f79535-47bb-0310-9956-ffa450edef68
2007-02-15 21:15:36 +00:00
Joakim Erdfelt 36eced2a73 Adding back the extension manager support for injected containers into the WagonManager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@507294 13f79535-47bb-0310-9956-ffa450edef68
2007-02-13 23:14:14 +00:00
Milos Kleint fa2051759e have basic validation on settings files, to prevent failures downstream, see MEVENIDE-488 for details
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@507077 13f79535-47bb-0310-9956-ffa450edef68
2007-02-13 16:26:24 +00:00
John Dennis Casey b994579133 Bumping plexus-utils dep to 1.4.1-snapshot, and commenting out some of the debug statements from the default model lineage builder, to limit the debug output on a build back to some sane[r] level.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@506742 13f79535-47bb-0310-9956-ffa450edef68
2007-02-12 23:33:43 +00:00
Jason van Zyl 971b2dee8a moved to its own tree
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@506345 13f79535-47bb-0310-9956-ffa450edef68
2007-02-12 07:29:48 +00:00
Jason van Zyl 2cc41c5e6c o long since used ...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@506253 13f79535-47bb-0310-9956-ffa450edef68
2007-02-12 03:41:48 +00:00
Jason van Zyl fae3cb98c8 MNG-2820 Leave the POM intact which means no interpolating and no license header whacking
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@506108 13f79535-47bb-0310-9956-ffa450edef68
2007-02-11 19:52:44 +00:00
Jason van Zyl 1ff7c5a235 o renaming the embedder request to embedder configuration which is more appropropriate
o move toward using one constructor which takes a configuration for session wide configuration, the execution still 
  takes an execution request as per usual



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505664 13f79535-47bb-0310-9956-ffa450edef68
2007-02-10 09:20:11 +00:00
Jason van Zyl 17817ccc00 MNG-2819 Prevent extension scanner from looping infinitely when projects are in a flattened structure
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505663 13f79535-47bb-0310-9956-ffa450edef68
2007-02-10 09:18:46 +00:00
Jason van Zyl 5288374ef1 o fixes to the embedder for finding settings and cleaning up embedder initialization
Submitted by: Eugene Kuleshov


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505612 13f79535-47bb-0310-9956-ffa450edef68
2007-02-10 02:01:42 +00:00
Jason van Zyl f151b661dd o fixing finding of settings file
Submitted by: Eugene Kuleshove


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505611 13f79535-47bb-0310-9956-ffa450edef68
2007-02-10 02:01:00 +00:00
Joakim Erdfelt 755f9683e1 * Updating bootstrap for new wagon deps.
* Removing unused wagon-provider-api dep in top level pom.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505537 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 22:46:35 +00:00
Jason van Zyl b323b45158 adding wagonVersion
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505525 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 22:01:38 +00:00
Joakim Erdfelt 33f23db7de * Migrating to wagon-manager 1.0-beta-3-SNAPSHOT
* Created org.apache.maven.artifact.manager.ArtifactManager
* Deprecated org.apache.maven.artifact.manager.WagonManager in favor of new ArtifactManager
* Updated the rest of maven to utilize this new ArtifactManager.
* The default wagon providers list is now managed from within wagon-manager's dependency list.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505520 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 21:53:27 +00:00
John Dennis Casey 9e03384f41 Adding ability to reorient the build context manager to a new container context.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@504418 13f79535-47bb-0310-9956-ffa450edef68
2007-02-07 02:40:48 +00:00
John Dennis Casey ad35b458bf Fixing project-loading to process inheritance in the correct direction, and finishing support for custom profile activators...also moving /project/build/extensions handling out to a separate extension scanner component, for later reuse elsewhere.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@501186 13f79535-47bb-0310-9956-ffa450edef68
2007-01-29 21:26:30 +00:00
John Dennis Casey 3b44ad3ac3 Adding constructor to the default build context manager, to allow simpler unit testing with it.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@500078 13f79535-47bb-0310-9956-ffa450edef68
2007-01-26 01:09:36 +00:00
John Dennis Casey 08825262be Adding custom profile activator support, using the <custom/> tag in the <activation/> section of a profile.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@499911 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 19:02:16 +00:00
Brett Leslie Porter e5644518bd merge r499763 from branch - add methods to repository metadata class
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@499790 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 13:37:44 +00:00
John Dennis Casey 8831e55e78 Fixing project inheritance and profile-injection now that we've moved to the model lineage builder. Iteration was backward.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@499603 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 22:53:00 +00:00
Brett Leslie Porter d9e845eb9c [MNG-2790] lastUpdated timestamp in local repository metadata not updated on install if it already exists
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@499368 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 11:42:36 +00:00
Andrew Williams 0b8770c75a Use released plexus classworlds and container
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@499054 13f79535-47bb-0310-9956-ffa450edef68
2007-01-23 15:33:20 +00:00
Andrew Williams 62706826a1 Move some debug from info() to debug()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@499053 13f79535-47bb-0310-9956-ffa450edef68
2007-01-23 15:32:48 +00:00
Milos Kleint 345e8c3732 MEVENIDE-484 - embedder's project loading didn't take the artifact handlers in plugin extensions into account when loading project dependencies.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498975 13f79535-47bb-0310-9956-ffa450edef68
2007-01-23 10:20:10 +00:00
Jason van Zyl 43112103d6 o updating locations of the mdo files for the bootstrap
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498757 13f79535-47bb-0310-9956-ffa450edef68
2007-01-22 19:24:50 +00:00
Kenney Westerhof dec70bc79b Update to latest HEAD of plexus-containers - getLookupRealm is now a PlexusContainer instance API method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498749 13f79535-47bb-0310-9956-ffa450edef68
2007-01-22 19:05:47 +00:00
Vincent Siveton 14a8e1f5a4 MNG-967: maven.mdo, settings.mdo, and generated-sources
Merged from: r498608 (maven-2.0.x)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498611 13f79535-47bb-0310-9956-ffa450edef68
2007-01-22 13:30:58 +00:00
Vincent Siveton cc64ba7ac1 o ignore target dir
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498609 13f79535-47bb-0310-9956-ffa450edef68
2007-01-22 13:28:07 +00:00
Jason van Zyl 290c6bc18a git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498057 13f79535-47bb-0310-9956-ffa450edef68 2007-01-20 03:31:28 +00:00
John Dennis Casey db225079d5 Fixing plugin-discovery when one plugin depends on another, and the pluginCollector sees a plugin before that plugin is meant to be added with its componentRealm.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498048 13f79535-47bb-0310-9956-ffa450edef68
2007-01-20 02:45:20 +00:00
John Dennis Casey e7412f71cf Adding methods for backward compat, and deprecating them...and adding a few debug log statements.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498044 13f79535-47bb-0310-9956-ffa450edef68
2007-01-20 02:03:27 +00:00
John Dennis Casey cf308da3de Adding ability to undo the log-level change, to some extent...it's not too elegant, but it should work in most cases.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498043 13f79535-47bb-0310-9956-ffa450edef68
2007-01-20 02:02:47 +00:00
John Dennis Casey 4ca4301f1d Adding line to enable log-level control from the MavenExecutionRequest.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498030 13f79535-47bb-0310-9956-ffa450edef68
2007-01-20 01:00:32 +00:00
John Dennis Casey dee7f572c1 Adding support for pre-scanning POMs for build extensions. NOTE: Plugins-as-extensions is not yet supported in this way.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497993 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 22:55:19 +00:00
John Dennis Casey dfc4a10c68 Adding the notion of a build-context, and several build-context classes that can be used: ProjectBuildContext, which contains lineage and current-project info, ExecutionBuildContext, which contains the information in the original MavenExecutionRequest, and SystemBuildContext, which contains things like System properties...these use the BuildContextManager to store and retrieve their info from the core container's Context object.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497911 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 19:15:18 +00:00
Kenney Westerhof 6c2268f0bd Only filter core artifacts from plugins, not extension artifacts, as they may break the plugin by bringing in incompatible API artifacts
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497888 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 17:56:16 +00:00
Kenney Westerhof c98ee0a930 Cleanup and doco
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497881 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 17:21:02 +00:00
Kenney Westerhof 11a88e90f5 remove the 'unused' var for plugin artifact resolution. When they're resolved, all core artifacts are already removed from the resolutiongroups' result. Why add them back again later?
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497838 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 15:08:08 +00:00
Kenney Westerhof 753ccae2af Remove unused import
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497836 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 15:02:21 +00:00
Kenney Westerhof b7ae6feb1c Enable all tests again
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497810 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 13:43:11 +00:00
John Dennis Casey 5bd4c1927c partially fixing problem with plugin-dependency loading...now, we're including maven-plugin-api in the plugin realm somehow, which means the standard artifact filter isn't working.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497696 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 03:12:44 +00:00
John Dennis Casey 5a2439e750 Moving extensions back to the core classrealm, and adding a dynamic artifact filter to keep MNG-2228 from reappearing.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497671 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 01:09:28 +00:00
John Dennis Casey 87226eab2e Stop re-applying profiles to models that have already had profiles applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497556 13f79535-47bb-0310-9956-ffa450edef68
2007-01-18 20:07:23 +00:00
John Dennis Casey 3e3b0fd239 Fixing caching of Model files, in case it's brought in via reactor and the current relativePath of a parent is wrong...it can still be found, as required by IT0103.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497554 13f79535-47bb-0310-9956-ffa450edef68
2007-01-18 19:58:42 +00:00
Kenney Westerhof 2faffb229f Fix resolving <plugin><dependencies>: it0081
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497533 13f79535-47bb-0310-9956-ffa450edef68
2007-01-18 18:49:58 +00:00