Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,717 Commits 84 Branches 93 Tags 86 MiB
Commit Graph

769 Commits

Author SHA1 Message Date
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 30342818f0 Make sure that all calls to buildFromRepository use a normalized List of remote repositories (a list of ArtifactRepository instances, not of model Repository instances, for example)...this should be less of a concern when we can use Java5 generics (someday). 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@616610 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-30 04:18:41 +00:00
John Dennis Casey b7960dce75 Add a little more safety for people passing in a null activation context. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614923 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-24 16:51:34 +00:00
John Dennis Casey 4a4699c6ad Add a little more information for unparseable POMs during project dependency-tree discovery. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614372 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-22 23:24:53 +00:00
John Dennis Casey 0cee304d37 Restore JDK 1.4 compat, and add a profile to do a strict build that enforces the use of JDK 1.4. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614316 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-22 20:49:07 +00:00
Vincent Siveton d818cc018b o fixed the superpom version to 2.1 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614085 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-22 01:27:35 +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
Milos Kleint 3c61f8a55b 604980 doesn't seem to work when plugin accesses the field by reflection. 
See:
Caused by: java.lang.NoSuchFieldException: processedProjectCache
        at java.lang.Class.getDeclaredField(Class.java:1854)
        at org.apache.maven.shared.repository.DefaultRepositoryAssembler.invalidateProccessedProjectCache(DefaultRepositoryAssembler.java:495)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613673 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-20 20:38:58 +00:00
Jason van Zyl 291d6a9199 o patch from Oleg for metadata processing required by a maven-artifact provider 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613467 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-19 22:05:01 +00:00
John Dennis Casey 89f482ac37 last of the error-reporting unit tests, and an additional error type to handle modules that are referenced but don't exist, which should stop the build. All tests pass. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613032 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-18 01:27:23 +00:00
John Dennis Casey e5c11f67c1 make things more friendly to non-standard settings and local-repo locations. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@612658 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-17 00:37:19 +00:00
John Dennis Casey c1b1ff061e Trying to make the FileProfileActivator unit test more resilient to alternative local repository locations. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@612645 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-16 23:50:50 +00:00
John Dennis Casey 372207fe19 Adding more logging for FileProfileActivator, to debug the build on ci. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@612638 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-16 23:45:00 +00:00
John Dennis Casey 4e84caabf2 Adding more logging for FileProfileActivator, to debug the build on ci. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@612634 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-16 23:41:00 +00:00
John Dennis Casey a0827ce0b6 Adding logging for FileProfileActivator, to debug the build. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@612629 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-16 23:37:38 +00:00
John Dennis Casey 1c235317d7 Adding more unit tests for error reporting. Almost done with project-based errors now. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@612333 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-16 02:20:08 +00:00
John Dennis Casey ca169d0262 Refactor management of activated, deactivated, and default-activated profile ids, so the context tracks all of that stuff. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@612186 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-15 18:34:58 +00:00
John Dennis Casey c3983894ab Adding more error-reporting fixes and unit tests. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@611945 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-14 21:44:59 +00:00
John Dennis Casey 25460922d5 More unit tests for error-reporting pointcuts, and some minor adjustments for duplicated handler methods. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@611014 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-11 01:57:27 +00:00
John Dennis Casey dc770e321b Adding some unit tests (mostly stubbed out at the moment) to start testing the pointcuts used to shunt build errors off to the appropriate error-reporter method. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@610618 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-10 00:07:48 +00:00
John Dennis Casey a4a9ae668e Add a constructor with only a container parameter for backwards compat, to allow plugins to continue to function. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@610151 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-08 21:01:59 +00:00
Vincent Siveton a0e3d00278 o merged from r609976 (MNG-2809: Can't activate a profile by checking for the presence of a file in ${user.home}) 
o added new test class

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@609980 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-08 13:42:18 +00:00
Brian E Fox 3040f3e412 MNG-3201: added toString() merged 587355-56 from 2.0.x 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@609083 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-05 02:29:16 +00:00
Vincent Siveton 36c86d19c7 o merged from r608815 and r608817 (MNG-3318 and javadoc) 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@608818 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-04 12:41:53 +00:00
John Dennis Casey fe4363a4c5 Removing the build overlay, as it was causing problems with path translation, and doesn't serve any real purpose. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@605095 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-18 05:36:03 +00:00
John Dennis Casey b7785ba822 Moving field restored for backward compat out into a maven-project specific out into a compat aspect, like the one used in core itself for the plugin manager and lifecycle executor. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@604980 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-17 20:04:45 +00:00
Milos Kleint cdf7254203 a backward compatible solution to reflection usage in current (2.1-beta-1) version of assembly plugin. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@604977 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-17 19:44:01 +00:00
John Dennis Casey 10a192dfc2 fixing error reporting for when pom file is missing, and adding deprecated-mojo and deprecated-mojo-param warnings. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@604538 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-16 01:28:17 +00:00
John Dennis Casey 5159c0b4b6 Error reporting works properly now. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@604401 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-15 08:17:21 +00:00
John Dennis Casey fe523d1151 Basic error reporting (tips aren't available for everything yet) is complete for everything the CLI typically handles directly. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@603779 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-12 23:40:49 +00:00
John Dennis Casey ca069de6eb Adding two unit tests to check the reporter, and fixing a pointcut for artifact-related project errors. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@601589 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-06 00:34:49 +00:00
Ralph Goers 39159e458e <scope>import</scope> is not needed in 2.1. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@601579 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-05 23:51:33 +00:00
Ralph Goers 25a654be7c Add support for importing managed dependencies. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@601578 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-05 23:48:25 +00:00
John Dennis Casey c8f441f03c Tightening down the pointcuts binding error reporting methods to the code...still needs a bit more work, and I'm working on a testbed for the error reporting stuff, but it needs to be automated still. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@601471 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-05 19:06:27 +00:00
John Dennis Casey 589db485fd Make sure external profiles are applied to the superPom before it's used as a basis for inheritance in the project builder. Also, adding some debug statements to the lineage-building process. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@601159 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-05 00:03:55 +00:00
Herve Boutemy 3488401f83 [MNG-1412] keep dependencies order when injecting profile 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@601096 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-04 21:45:00 +00:00
John Dennis Casey 1db3b755ab Fixing problem with new extensions manager code where custom lifecycle definitions are not used in build planning. Unit tests included. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@600792 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-04 04:32:13 +00:00
John Dennis Casey 2ec256bab6 Removing pluginRepository use (finally), and fixing pluginGroups usage with profiles from the settings and super-POM without an accompanying pom.xml in the project directory...I know, something of a convoluted case. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@599692 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-30 04:26:58 +00:00
John Dennis Casey b310a40d6b Fixing super-pom building to allow injection of external profiles (again). Also, removing use of pluginRepositories and improving error reporting just a tad. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@599658 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-30 00:24:10 +00:00
John Dennis Casey 0d6bdba6d5 Applying patch from Oleg Gusakov to add dependency information to the metadata returned. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@599652 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-30 00:15:05 +00:00
John Dennis Casey b61bb393a8 Cleaning up error reporting some for project building, and attempting to make the error reporter instances propagate to the aspects binding them to the error sources. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@599503 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-29 16:33:57 +00:00
John Dennis Casey 941a11381c Adding aspect-bound error reporting for BuildFailureException descendants. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@598900 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-28 08:11:49 +00:00
John Dennis Casey afe12e42e6 Adding the rest of the project errors to the aspect-bound ProjectErrorReporter. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@598864 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-28 04:28:28 +00:00
John Dennis Casey d1f7e63e51 Move back to jdk 1.4 compliance in these projects. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@598761 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-27 20:36:01 +00:00
Jason van Zyl 92f4fe42e9 o get rid of 1.5 annos 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@598755 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-27 20:19:20 +00:00
John Dennis Casey a3b489d71e Adding error reporting for most project errors via aspects that collect the context information and format a nice message (the aspect just binds to the errors API in org.apache.maven.project.error.*). 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@598748 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-27 19:55:04 +00:00
Jason van Zyl 40326eef36 o adding backward compat method in the project builder 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@597162 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-21 17:51:56 +00:00
John Dennis Casey 5fc3d35ce0 Removing maven-build-context, and replacing it with caching aspects for model-lineage stuff and project instances. Still needs caching for artifact resolution, and I have an aspect for this too, but it's not enabled yet, since it's still buggy. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@595215 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-15 05:37:55 +00:00
John Dennis Casey 775ee6c5bb Remove UnsupportedOperationExceptions, ignore invalid mutator methods so we will continue to derive information from the parent artifact where necessary and still work in the changing maven-artifact framework. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@594363 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-13 00:30:39 +00:00
John Dennis Casey fc28a41097 Moving a comment to a place where it will be more useful. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@594300 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-12 21:17:00 +00:00
Jason van Zyl 1a286e2325 o adding PomMetadataSource for the changes to maven-artifact 
o adding in all the artifact handlers here as they are Maven specific and don't belong in maven-artifact


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@593857 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-11 08:10:35 +00:00
John Dennis Casey 7946e31f40 reinstate the project cache, until we can find a better method of caching. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@593698 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-10 00:17:44 +00:00
John Dennis Casey cc47645398 Fixing a unit test. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@593694 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-09 23:35:24 +00:00
John Dennis Casey f1973980a5 Clean up the caching to use weak hashmaps, to conserve some memory in large builds. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@593287 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-08 20:15:20 +00:00
John Dennis Casey febce07c90 Adding more context information to existing exceptions, cleaning up construction in exceptions, and adjusting the inheritance hierarchy for exceptions to make them make a little more sense for error reporting. Also, adding improved (but not complete, yet) reporting for BuildFailureExceptions and ProjectBuildingExceptions, with some tests to make sure pertinent information is in the output. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@592859 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-07 19:24:30 +00:00
Jason van Zyl c141200c39 MNG-3274: Adding a flag to the metadata source so that at some point soon we can start turning on a strict mode that is just not going to allow a system without POMs. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@592260 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-06 03:59:37 +00:00
John Dennis Casey d206986023 [MNG-3272] Fixing URI construction for reading the super-POM in cases where maven is in a directory structure where there are spaces in the path. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@592157 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-05 21:40:11 +00:00
Brian E Fox 083a7dd4f0 fixed NPE in exception msg 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@591938 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-05 09:49:13 +00:00
John Dennis Casey fe8c4071a6 Switching back to selectively import extensions into a project-specific ClassRealm, except this time extension realms will be shared (the origin of the aforementioned imports) to conserve memory tied up by classloading. Similarly, plugin realms are managed using a key produced from g🅰️v of the plugin, plus the hashcode of all g🅰️v of the plugin-level dependencies aggregated into one string, to distinguish the deploy plugin 2.0 with no deps from the deploy plugin 2.0 with a plugin-level dep on wagon-webdav. Plugin realms have their parent realms managed by the pluginManager now prior to lookup or execution of the mojo instance, and PluginDescriptor.(classRealm|artifacts) attributes are set for each execution. Likewise, the MavenPluginCollector now tracks plugin descriptors with their version information included, instead of just using g:a. 
Had to bump the plexus-container-default version up to alpha-36 to fix a problem in ClassicSingletonComponentManager. All realms for extensions, plugins, and projects (which contain only imports from extensions) are now managed by the MavenRealmManager.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@591391 13f79535-47bb-0310-9956-ffa450edef68
 2007-11-02 16:44:00 +00:00
John Dennis Casey bcb1ebe0e0 use managed versions when resolving project dependencies from the plugin manager before executing a mojo, and include system path in system-scoped artifacts within the managed version map. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@588326 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-25 19:58:14 +00:00
Carlos Sanchez Gonzalez 324c1fcd1c Add an artifact field to ArtifactMetadataRetrievalException to store the artifact causing the problem 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587996 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-24 20:06:08 +00:00
Carlos Sanchez Gonzalez f4207feee2 Port to JDK 1.4 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587777 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-24 04:26:36 +00:00
Carlos Sanchez Gonzalez 880785ac04 Kept John's constructors but still use File/URL instead of String 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587693 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-23 23:26:30 +00:00
Carlos Sanchez Gonzalez f3398365f1 Kept John's constructors but still use File/URL instead of String 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587691 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-23 23:23:19 +00:00
Carlos Sanchez Gonzalez bfd273cb0f Keep backwards compatibility by deprecating old methods 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587678 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-23 22:20:33 +00:00
John Dennis Casey e3dee74168 restoring these changes for backward compat. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587663 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-23 21:32:24 +00:00
John Dennis Casey 90e62086d1 Forgot one. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587647 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-23 20:25:50 +00:00
John Dennis Casey 936b87590b Rollback changes generalizing exception ctors; this destroys traceability in the code for which combinations of exceptions are used in the system to produce an error. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587638 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-23 20:07:03 +00:00
Carlos Sanchez Gonzalez a44c4c99c0 Simplify ProjectBuildingException constructors and store the original File/URI instead of a String 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587596 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-23 18:36:50 +00:00
Carlos Sanchez Gonzalez 487bf01ca2 Keep backwards compatibility by deprecating old methods 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587569 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-23 17:39:10 +00:00
Carlos Sanchez Gonzalez 2207068fe3 Keep backwards compatibility by deprecating old methods 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587567 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-23 17:38:12 +00:00
John Dennis Casey 4aeb99b92b Plugins now load per-project, which means they can have different plugin-level dependencies and configurations per-project, even if they're running in the same reactor. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586515 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-19 16:02:31 +00:00
John Dennis Casey 2ba9bbfd23 Fixing it0112 and it0115, and cleaning up extension isolation further. Also, adding a flag to tell whether an accompanying profiles.xml file is valid for any given POM file...when loaded from a repository (or stubbed), this flag should always be false. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586061 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-18 18:38:06 +00:00
John Dennis Casey b3c99db34a Fixing it0022 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585699 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-17 21:01:50 +00:00
Brian E Fox 64fdbabf5b rolling back broken tests 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585548 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-17 16:01:23 +00:00
Brian E Fox fe1e81cc25 MNG2025 patch to add encoding unit tests 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585318 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-17 01:35:37 +00:00
Brian E Fox f6186d77c3 MNG2045 applying patch from Paul Gier to fix test jar dependencies from sibling projects. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585316 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-17 01:30:12 +00:00
Herve Boutemy eecea0895e [MNG-2254] support XML file encoding when reading/writing settings and pom files 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585265 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-16 21:26:43 +00:00
John Dennis Casey 0d0f7396b2 Cleaning up exception wrapping to allow better reporting of errors to end users. Also implementing the beginnings of a new error reporter, and bumping the version of plexus-container-default up to 1.0-alpha-33-SNAPSHOT to improve the accessibility to ClassRealm info for ComponentLookupException. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@584343 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-13 00:10:29 +00:00
John Dennis Casey ea31f3e3f7 unit test for parent POMs in repositories brought in by profiles from outside the pom.xml. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@583258 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-09 18:41:42 +00:00
John Dennis Casey 616c6f1c0f Fixed usage of repositories from active profiles in settings.xml for model-lineage building, which is fundamental to the build. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@583248 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-09 18:10:05 +00:00
Jason van Zyl e6a6476ad7 o cleaning up the project builder, deprecating maven 1.x repository support, it will be 3 years by the time this is actually released 
so tough noogies for people still trying to use Maven 1.x repositories with Maven 2.x.

  The next series of refactoring I will be doing with GIT.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@580609 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-29 17:25:19 +00:00
Ralph Goers 0c84fd3f65 Revert 578553 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@579086 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-25 06:27:01 +00:00
Ralph Goers 71aa8e7f51 Allow the managed dependencies of projects to be imported into the managed dependencies of other projects. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@578553 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-23 07:20:24 +00:00
Jason van Zyl a05e9f9884 o we don't need to run processProjectLogic on the super pom but we do need to make sure the plugin repositories are populated 
for plugins like archetype which have no POM to start with but need repositories.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573736 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-07 22:29:34 +00:00
Jason van Zyl d72b8bc88a o put the profile manager back into place as the project build is exposed in a ton of plugin. arrrg. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573718 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-07 21:29:08 +00:00
Jason van Zyl 9c8903441f o profiles are now decoupled from settings. so that i don't do this is one huge commit i need to move settings stuff into the core 
while i transform the settings components to take a MavenSession. Any component executing within Maven should be able to use
  a session. the session will contain everything required and any new component added to the system should only take the 
  session as a parameter. same pattern for all components. that's the goal. it will take a few hops.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573462 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-07 05:25:49 +00:00
Jason van Zyl c417b0c490 o dead import 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573455 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-07 04:44:46 +00:00
Jason van Zyl d5f5abeb57 o dead import 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573453 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-07 04:42:55 +00:00
Jason van Zyl d61face8fd o removing dead class 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573452 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-07 04:42:43 +00:00
Jason van Zyl c8ab5fb076 o decoupled Settings from the profile manager 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573436 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-07 03:47:53 +00:00
Brett Leslie Porter f785811d57 [MNG-2061] DistributionManagement properties don't get copied in cloned executionProject while lifecycle fork 
Submitted by: jan ancajas
Merged from: r573424 on maven-2.0.x branch


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573426 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-07 01:42:39 +00:00
Jason van Zyl 99bd5ac68f o trying to get a grasp of the entire profile mechanism, especially in relation to how they deal with repositories. 
here i am just collecting all the profile code into one place as it's scattered over several packages and is
  hard to determine what the profile system as a whole is doing. the first task i would like to do is decouple
  the profile system from the Settings. this can be done at the front-end i.e the profile information from Settings
  can be fed into the profile manager up front.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573325 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-06 17:09:36 +00:00
Jason van Zyl cfa367dff1 MNG-2871: improve handling for EJB artifacts so that the build will work correctly without having to install the attached client JAR. This should be handled generally but we have no way of know what plugins product attached artifacts that should be handled this way. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572207 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-03 00:54:19 +00:00
Jason van Zyl 0a36e611f2 o turn on envar support in 2.1, we just can't turn it off now at this point. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572190 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-02 23:21:23 +00:00
Jason van Zyl 4005482797 MNG-2935: make sure build tanks if the settings are bad (user and global) 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572180 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-02 22:48:43 +00:00
Jason van Zyl f196fefba4 o as the profile has been removed from the super pom, we do not need to inject or process any profiles 
related to it. this great simplifies a lot of code
o caching the super project in the default project builder as it's never going to change now as no profiles
  are inject so it will only have to be constructed once an instance.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571910 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-02 00:56:30 +00:00
Jason van Zyl e0dbac1e24 o removing the release profile from the Super POM, this is for our particular flavor of releasing and the Super POM should stand as defaults for everyone using Maven. We should never again put profiles into the Super POM, it's just a bad idea. It forces us to inject the profile manager into the reading of the SuperPOM which is also bad. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571907 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-02 00:11:37 +00:00
Jason van Zyl 884f70085e o integrate changes made in maven-artifact for non fail-fast and request/result usage in the embedder for 
use in IDE integration to provide as much feedback as possible.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571862 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-01 19:23:17 +00:00
Carlos Sanchez Gonzalez 07c6e661f9 buildWithDependencies in the embedder shouldn't check for distribution status by default. Add test. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@570550 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-28 19:53:59 +00:00
Jason van Zyl 1bb845492e o now that i can get online, i can adjust for the movement of m-a 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@566927 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-17 06:01:00 +00:00
Vincent Siveton eb6f1b00dd o merged r566641 from branch (added more warn stuff) 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@566642 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-16 10:15:45 +00:00
John Dennis Casey b1517c1421 [MNG-3134] Use childPathAdjustment when calculating distributionManagement/site/url just like we do for url and scm/*Url. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@565777 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-14 14:41:16 +00:00
John Dennis Casey c08d1fa49b Fixing some extraneous debug output. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@565775 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-14 14:38:16 +00:00
John Dennis Casey c5a74a8242 Fixing a few problems with the model-lineage builder, where it was stubbing models inappropriately and other minor logical problems. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@564761 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-10 20:49:14 +00:00
John Dennis Casey db3f9be45e Fixing a problem where parent POMs that are not found during model-lineage discovery were not previously stubbed out, and caused the build to fail where it didn't in 2.0.7 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@564299 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-09 17:45:37 +00:00
Kenney Westerhof 5ec1f2d3cc Fix it0088 / MNG-2124 etc.. (regression) 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561173 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-30 22:49:24 +00:00
Kenney Westerhof e87621fa6c PR: MNG-3118 
Description: test classes dir comes before classes dir
Submitted by: Paul Gier
Reviewed by: /me




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559042 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-24 13:14:50 +00:00
Kenney Westerhof a7a3f55f18 fix the super-pom - this caused all the warnings about deprecated expressions. Should be pretty quiet now ;) 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@553283 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-04 17:56:49 +00:00
Kenney Westerhof ef22e43b64 reduced warning-noise: only print warnings for SNAPSHOT models, and removed deprecation for project.* expressions, see comment in code 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@553144 13f79535-47bb-0310-9956-ffa450edef68
 2007-07-04 09:48:06 +00:00
Patrick Schneider 5da9d28906 [MNG-2919] Add fix for depMan scope overwriting to the trunk. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@552182 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-30 17:31:45 +00:00
Kenney Westerhof 99ba1e7e85 PR: MNG-2339 - ${project.*} evaluated badly 
This commit makes sure that pom.* and project.* are resolved using the model reflector,
but if the prefix isn't pom or project, context and model properties are consulted.
If the value still isn't found, the model reflector is used as a legacy fallback,
and a warning is printed.

Also, project.* is deprecated in favour of pom.*.

TODO: env.*.

N.B.: there's loads of warnings about ${artifactId}. I can turn these off,
but if you specify -DartifactId on the commandline, all hell breaks loose.

See http://docs.codehaus.org/display/MAVEN/Refactoring+Interpolation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549786 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-22 11:34:53 +00:00
Carlos Sanchez Gonzalez aa9368044a Fix test that fails on windows 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547488 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-15 02:17:38 +00:00
John Dennis Casey 182220d00c Fixing per Mark Hobson's suggestion. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545519 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-08 14:26:57 +00:00
John Dennis Casey 8ec3ac8a97 OPEN - issue MNG-2591: Plugins are merged incorrectly 
http://jira.codehaus.org/browse/MNG-2591

Added tests to verify the XML attribute that switches merge-mode from replace/merge to append for children...then, fixed append semantics to force the dominant children (those given by the child POM, in this case) to be appended to those of the recessive/parent-POM configuration.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545315 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-07 21:11:29 +00:00
John Dennis Casey bfce771633 Replacing JDK 1.5 api call. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545241 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-07 16:54:58 +00:00
Jason van Zyl cc5f2f954b Reverting the package changes 
Issue id: MNG-2943


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543753 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-02 15:35:57 +00:00
John Dennis Casey 6d3984551c OPEN - issue MNG-2671: Parent/modules relative file path compression 
http://jira.codehaus.org/browse/MNG-2671

Applied, with small changes so it will not swallow exceptions. If this causes a problem with broken symlinks, we can address that later.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543682 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-02 00:43:15 +00:00
Carlos Sanchez Gonzalez 53acf2858f [MNG-2943] Avoid using package names used in other artifacts: org.apache.maven 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543670 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-02 00:05:35 +00:00
John Dennis Casey f136fa7ace OPEN - issue MNG-2619: building from the middle pom of a (parent,child,grandchild) heirarchy fails 
http://jira.codehaus.org/browse/MNG-2619

Added tests from the included patch. Main code didn't apply any longer, but this shows that the new ModelLineageBuilder code solves the problem. Will apply the original patch to the 2.0.x branch...

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543637 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-01 22:10:03 +00:00
Jason van Zyl 1a0b546e7f MNG-2690 Some maven-project tests fail under maven-surefire-plugin 2.3 
Submitted by: Mark Hobson


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543614 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-01 21:01:48 +00:00
Jason van Zyl b4f380dd3c MNG-2683 Better exception messages 
Submitted by: Mark Lundquist


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543604 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-01 20:46:48 +00:00
John Dennis Casey 5401fb4c64 OPEN - issue MNG-2784: Multiple executions of the same plugin at the same life cycle phase in a multi-module profile mixed up 
http://jira.codehaus.org/browse/MNG-2784

NOT applying this patch, as there is a much simpler solution. The processing is currently in the correct order, so all we need to do is make sure the Map.values() method retains this order. Therefore, I changed the Map implementation for plugin executions to LinkedHashMap.

I've also added a test for this issue...

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543599 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-01 20:35:44 +00:00
John Dennis Casey 09553c6ff3 REOPENED - issue MNG-1910: Allow jdk 1.4+ as profile requirement 
http://jira.codehaus.org/browse/MNG-1910

Applied.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543579 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-01 19:12:58 +00:00
Jason van Zyl e12fbd08e9 o fix typo 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543382 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-01 04:19:59 +00:00
Jason van Zyl 6cb79190cd MNG-2813: Fix OutOfMemoryError when using profiles and pom inheritance 
Submitted by: Jochen Kuhnle


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543373 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-01 03:11:29 +00:00
Jason van Zyl 82146b83f0 MNG-2921 Fixing the ejb-client dependency problem introduced by MNG-1577 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543349 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-01 01:31:29 +00:00
John Dennis Casey a55e9c24fe Making resolution of artifacts from the reactor work with classifiers (hopefully). 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541942 13f79535-47bb-0310-9956-ffa450edef68
 2007-05-26 21:22:10 +00:00
Jason van Zyl 3481d0f425 o need mr wagon 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532025 13f79535-47bb-0310-9956-ffa450edef68
 2007-04-24 17:42:59 +00:00
Andrew Williams 40e2c95113 artifact-manager is no longer used 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532008 13f79535-47bb-0310-9956-ffa450edef68
 2007-04-24 16:59:28 +00:00
Jason van Zyl 05986fc6f2 o remove maven-artifact-test, not used anywhere 
o fix shade plugin so the new uber is produced
o allow plexus-utils back into the mix
o take out the dep.xml assembly descriptor as shade is making the uber jar now



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@531259 13f79535-47bb-0310-9956-ffa450edef68
 2007-04-22 19:58:09 +00:00
Carlos Sanchez Gonzalez 04d3f322fe Add javadocs for getArtifacts and getDependencyArtifacts 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@521825 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-23 17:47:47 +00:00
Jason van Zyl 05162de0d0 o bits for mng-1577 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@521543 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-23 00:11:31 +00:00
Jason van Zyl 17a7a726c5 MNG-2868 The behavior in MNG-1577 is now available on the trunk 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@520923 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-21 16:00:17 +00:00
John Dennis Casey 34bf67ecf1 Merging revIds: 515814:520600 from 2.1-lifecycle-refactor branch to trunk. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@520609 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-20 21:40:59 +00:00
Jason van Zyl 7d17a9c108 MNG-2877 resolve attached artifacts from reactor that are not in repo 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@519740 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-18 23:40:05 +00:00
Jason van Zyl f03d8d662f o testing repeatedly with an empty repository 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@516820 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-11 00:48:53 +00:00
Jason van Zyl badcd2287f o roll back to wagon beta-2 to fix the rash of problems with m2eclipse plugin 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@516654 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-10 05:38:50 +00:00
Andrew Williams 94ba392461 Copy the ArtifactMetadataSource to use the 'default' hint as well as the, deprecated, 'maven' one. This will mean that with the new plexus components don't have to hint to get the default impl 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514652 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-05 11:48:15 +00:00
Andrew Williams 1f9709694d More role-hint fixes 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514019 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-02 23:43:49 +00:00
Andrew Williams cf8cb43998 use the correct role hint 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513881 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-02 18:41:39 +00:00
Kenney Westerhof cd8c1d61a2 Fix unit tests. 
The order of the tests is important since the same groupId/artifactId/version
combinations are used in different local repositories in the tests, containing
different poms. The DefaultMavenProjectBuilder caches models with g🅰️v,
so it can serve a model from another local repo.

Solved this by changing groupId's in the poms and repositories so they don't
conflict.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513720 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-02 12:05:15 +00:00
Kenney Westerhof 7ddabf5a2d Remove svn:executable from pom and java files 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513701 13f79535-47bb-0310-9956-ffa450edef68
 2007-03-02 10:55:05 +00:00
Jason van Zyl 3dcf943dfc updating license headers 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513038 13f79535-47bb-0310-9956-ffa450edef68
 2007-02-28 22:54:19 +00:00
Jason van Zyl fb03e03672 o optimizing imports, trying to clean up settings use so i can track them down and purge them 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512775 13f79535-47bb-0310-9956-ffa450edef68
 2007-02-28 14:47:51 +00:00
Jason van Zyl d3deb61421 o remove maven-tools and put the utility code in the only module that now depends on it, maven-project 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512763 13f79535-47bb-0310-9956-ffa450edef68
 2007-02-28 14:20:13 +00:00
Jason van Zyl f37ff7ef4d o use FileUtils for copying the POM. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512749 13f79535-47bb-0310-9956-ffa450edef68
 2007-02-28 13:17:02 +00:00
Jason van Zyl 7d69da0eea o unrequired cast 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512552 13f79535-47bb-0310-9956-ffa450edef68
 2007-02-28 01:30:44 +00:00
John Dennis Casey f4b3eedc8a Fixing some lingering dependency ordering problems from artifact resolution, and adding settings-builder advice to the CLI. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512339 13f79535-47bb-0310-9956-ffa450edef68
 2007-02-27 17:47:30 +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 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 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 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
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 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 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
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
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
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
John Dennis Casey c7738df560 Splitting model-lineage loading and profile-application out into separate components...profile-application, so the model-lineage builder can run properly, and the model-lineage builder, so we can pre-scan for models with extensions that may contain things like profile activators, which would be used during project-loading. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@496910 13f79535-47bb-0310-9956-ffa450edef68
 2007-01-17 01:36:07 +00:00
Brett Leslie Porter c416a33a4c [MNG-2745,MNG-2753] more completely remove env vars - no point in populating them if they are never used 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494710 13f79535-47bb-0310-9956-ffa450edef68
 2007-01-10 04:40:39 +00:00
Brett Leslie Porter bd608ed4cf remove env var tests since the handling was removed. Note that the functionality needs to be re-enabled via the CLI: see MNG-2753 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494704 13f79535-47bb-0310-9956-ffa450edef68
 2007-01-10 04:32:43 +00:00
Fabrizio Giustina bf7d7a01a0 MNG-2746 fixing an obvious NPE when parent path is a directory and pom is not found. Also reported in MNGECLIPSE-184 and CONTINUUM-1000 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494085 13f79535-47bb-0310-9956-ffa450edef68
 2007-01-08 15:01:21 +00:00
Jason van Zyl a966656f38 o Code from netbeans integration that will write out changes to a model and preserve the existing structure for the most part. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@493824 13f79535-47bb-0310-9956-ffa450edef68
 2007-01-07 19:53:06 +00:00
Kenney Westerhof 2327f170e6 Added a note on project sorting and cycles. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@489114 13f79535-47bb-0310-9956-ffa450edef68
 2006-12-20 15:30:10 +00:00
Jason van Zyl cc5a658907 o update the deps to the new releases of wagon wheels and plexus 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@486535 13f79535-47bb-0310-9956-ffa450edef68
 2006-12-13 07:42:00 +00:00
Brett Leslie Porter 8b0f212ffa fix a crappy error message. It said that a POM referenced itself, when the problem was that the expression referenced itself. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@475132 13f79535-47bb-0310-9956-ffa450edef68
 2006-11-15 06:08:40 +00:00
Kenney Westerhof edde7a1b58 PR: MNG-2603 
Revert accidental commit on ProjectSorter.java in revision r462868.

I locally modified the ProjectSorter to exclude the build plugins from the DAG
to fix some cycles in the reactor when importing the entire trunk (components,
shared, scm, plugins etc..) in Eclipse. This was never meant to be committed.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@463922 13f79535-47bb-0310-9956-ffa450edef68
 2006-10-14 12:50:36 +00:00
Kenney Westerhof f286c9fbc6 Create artifact directory as the Get task doesn't create them 
NOTE: accidently commited other files too. Only build.xml was 
  supposed to be committed.
  - it0074/pom.xml: leave as is; it fixes a <depedencies> section;
  - maven-plugin-tools-java/pom.xml was fixed by jason at revision 462919;
  - ProjectSorter.java is fixed in revision 463922;


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@462868 13f79535-47bb-0310-9956-ffa450edef68
 2006-10-11 17:20:57 +00:00
Milos Kleint 7286e853ae put a resolved parent artifact in the final mavenproject instance 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@448095 13f79535-47bb-0310-9956-ffa450edef68
 2006-09-20 06:37:40 +00:00
John Dennis Casey 5d99b35cfe [MNG-1797][MNG-2420] Fixing exclusions that bleed over into other dependencies, and modifying DefaultProfileManager to (a) deprecate constructor that takes Settings but no properties, and (b) add a constructor that takes Settings and properties. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@438189 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-29 20:17:14 +00:00
John Dennis Casey 136739b708 Changing constructor with Settings back to public. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@438132 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-29 17:57:46 +00:00
John Dennis Casey 7c43aa27d7 Merging fix for loss of dependency ordering from branch. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@430573 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-10 22:43:48 +00:00
John Dennis Casey d70e316446 Removing incorrect FIXME comment and returning import ordering to normal. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@426114 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-27 16:08:51 +00:00
John Dennis Casey 75c7380801 [MNG-2302] Added code to nullify parent's descriptor location in cases where the parent MavenProject instance was loaded from the repository. In these cases, the descriptor location value is incorrect anyway, and it was causing an incorrect null return value for MavenProject.getModulePathAlignment(..), which in turn produces an incorrect URL path calculation for multi-tiered inheritance where the top tiers are resolved from the repository. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@426112 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-27 16:02:26 +00:00
John Dennis Casey 3e8d1f934c [MNG-2314] Added unit tests to verify that this issue cannot be reproduced. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@425924 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-27 01:00:03 +00:00
John Dennis Casey 5d50ceac1f [MNG-1891] Fixed plugin ordering in profile injection AND model inheritance, to be consistent and to preserve as much ordering information as possible, to make plugin ordering more predictable. Also added several unit tests to express the problem(s) and verify the solutions. Ordering is in javadoc comments, and should be added to the plugin-configuration documentation on the site. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@425919 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-27 00:36:31 +00:00
John Dennis Casey bf2a316d91 [MNG-1562] Added unit test confirming the necessity of groupId:artifactId:type for non-jar dependency references. Will update site documentation as well. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@425863 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 21:56:35 +00:00
John Dennis Casey 4028c67c5a [MNG-1697] Added a new null check and unit test to addEdgeWithParentCheck(..), just to make sure this is fixed. (I think it was already fixed, but this is just to be extra sure.) 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@425843 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 21:23:51 +00:00
Carlos Sanchez Gonzalez 23f64db797 Removed code duplication 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@421968 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-14 17:55:57 +00:00
John Dennis Casey 0712f84f81 Adding tests to verify that super-POM is injected with active profiles when used in standalone fasion. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@421390 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-12 19:43:54 +00:00
John Dennis Casey cc859f5cfb [MNG-2221] Fixing caching of merged plugins to prevent them from appearing/executing twice in the resulting child POM. See two new unit tests in ModelUtilsTest for proof. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@421309 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-12 16:32:39 +00:00
Carlos Sanchez Gonzalez f7a33ca068 POM cleanup, remove inherited fields, added license and xsd 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@419880 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-07 12:23:28 +00:00
Kenney Westerhof 724e4f39f4 PR: MNG-1245 
Version not taken into account for reactor projects. 

Artifacts for reactor projects get replaced by a wrong version local repo artifact.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@419624 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-06 17:28:00 +00:00
Milos Kleint c9be3d3c40 added comment about System.getProperties 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@418629 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-02 17:53:27 +00:00
Brett Leslie Porter 48bfb8d85b fix formatting 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@417678 13f79535-47bb-0310-9956-ffa450edef68
 2006-06-28 06:07:32 +00:00
Milos Kleint d7a1ba698d MNG-2364 make sure the system properties are passed from the execution/embed requests, to make the on-property profile activation work in embedded environment 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@415000 13f79535-47bb-0310-9956-ffa450edef68
 2006-06-17 06:46:58 +00:00
Carlos Sanchez Gonzalez f925bdc3a6 [MNG-2357] Refactor code 
Submitted by: Jerome Lacoste

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@413091 13f79535-47bb-0310-9956-ffa450edef68
 2006-06-09 17:00:43 +00:00
Kenney Westerhof 45748e167d PR: MNG-2293 
Submitted by: Jerome Lacoste
Reviewed by: Kenney Westerhof
Modifications: minor cosmetic changes.

Add an 'implementation' parameter to @parameter annotation, so
a default implementation can be specified in Mojo's in case the Mojo parameter
is an interface.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@413054 13f79535-47bb-0310-9956-ffa450edef68
 2006-06-09 14:30:57 +00:00
Kenney Westerhof c2296be700 PR: MNG-2309 
Profiles are activated in random order so overriding settings doesn't produce
the same results on all environments.

Use a LinkedHashMap for the profilesById to preserve profile ordering.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@408021 13f79535-47bb-0310-9956-ffa450edef68
 2006-05-20 16:26:42 +00:00
Kenney Westerhof 315ddee9da added a comment on strange code 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@399728 13f79535-47bb-0310-9956-ffa450edef68
 2006-05-04 15:22:10 +00:00
Jason van Zyl b8ec74d65d update version of maven-settings 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@394317 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-15 15:55:06 +00:00
John Dennis Casey b22b0cc9e2 Merging 393053 from maven-2.0.x branch, to fix some jdk5 method calls that crept in. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@393059 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-10 20:48:10 +00:00
John Dennis Casey 8937fd353d Merging 393029 from branch, to fix the case where -DperformRelease=true injects additional plugins into the test POMs. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@393031 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-10 19:32:35 +00:00
Jason van Zyl 94e440000d o merge of the maven-embedder-refactor branch into the trunk 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@392327 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-07 15:57:09 +00:00
John Dennis Casey ea8e24b1fb Merging 391974 from branch to fix IT errors introduced when attempting to fix the case where a resolved POM expression contains a substring referencing that POM element. Two-expression cycles are still possible. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@391988 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-06 14:04:08 +00:00
John Dennis Casey 39132c3e37 Merging from 391857 on branch. Fixes infinite recursion when expressions self-reference as part of a larger value. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@391858 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-05 23:57:52 +00:00
John Dennis Casey f810fd2ef2 Merging from 2.0.x branch, revIds: 
- 391163:391165 
- 391167
- 391176
- 391202
- 391326
- 391328:391329
- 391398
- 391402
- 391404

These are the changes for the 2.0.4 RC's.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@391687 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-05 17:43:35 +00:00
Brett Leslie Porter 1c23ee16a4 [MNG-2054] make it0096 test the problem properly by going to enough depth. Rollback the "fix" for MNG-2130 as it didn't appear to be correct - it caused it0096, and it0099 passes anyway. I suspect there were other circumstances in the codebase causing 99 to fail at the time. You should not use a cached project for inheritence - it will accumulate inherited elements as was the case with MNG-2054. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390133 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-30 13:54:30 +00:00
Brett Leslie Porter 32d8679253 [MNG-2186] correct the regression of MNG-1927 from the solution of MNG-2124 
The interpolator was only working based on an incorrect assumption for a limited set of expressions. This assumption is
guaranteed by the solution in the interim, until it can be properly reconsidered. The proper solution would be to not
cache an interpolated model, and to apply path translation and then interpolation after retrieving the cached model. However,
this will require some other related changes and should be planned for 2.1.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390098 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-30 11:48:12 +00:00
John Dennis Casey cedf9e04bc (Merging 389199:389201 from branch.) 
o Cleaned up example in the comment-header of the plugin-metadata.mdo
o Added code to initialize a dummy Model instance in MavenProject, to avoid NPEs in things like getId().



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@389203 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-27 17:26:27 +00:00
John Dennis Casey 43e640244e (Merged from 386445.) 
From the original revision log:
--------------------------------------

o Fixed formatting of lines in DefaultMaven to ensure that the output:

[INFO] ----------------------------------------------------------------------

doesn't exceed 80 columns, for readability.

o Fixed error reporting when building a POM's parent, in cases where:

  - relativePath refers to a directory, but there is no pom.xml in that directory...in
    this case, simply set the parentDescriptor == null, and allow repository resolution
    to proceed.

  - attempt to resolve parent POM from repository fails...in this case, we need to tell
    the user which project specified the missing parent.

Neither of these had any impact on existing tests, and should only improve the user
experience. I don't believe they introduce any ambiguous behavior.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@386447 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-16 20:06:21 +00:00
John Dennis Casey bd6aa12253 (Merged from 384847.) [MNG-2136] Modifying <activeByDefault/> processing to only use profiles embedded in the POM as a basis for computing whether or not to activate. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384851 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-10 17:00:30 +00:00
John Dennis Casey fc77014cfe (Merged from 384264.) [MNG-2124] Fixed interpolator to call the ReflectionValueExtractor method that prevents trimming the first expression token, since this is done in the interpolator itself. I'm still investigating whether this is going to break realignment of File instances to basedir during plugin parameter injection, but I've had to adjust it0088, since it is not handling project.build.directory as a File, but as a String. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384270 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 17:04:47 +00:00
John Dennis Casey d69fe06e8d (Merged from 384104.) [MNG-2130] Re-adding the cache check for parent POMs in assembleLineage(..) when building in a multimodule scenario (if they're part of the same build, but not yet in the local repo) before checking the parent's relativePath value or hitting the repository system to look for them. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384108 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 03:29:41 +00:00
John Dennis Casey 55dc9e4ccb (Merged from 384102.) Fixing site URL calculation to disregard child module path adjustment. Second attempt. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384107 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 03:28:38 +00:00
John Dennis Casey 063474e205 rolling back accidental commit. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384106 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 03:26:16 +00:00
John Dennis Casey fcb42e22ba (Merged from 384102.) Fixing site URL calculation to disregard child module path adjustment. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384105 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 03:09:44 +00:00
John Dennis Casey a693217497 (Merged from 383024.) Added unit test for case where parent path is empty and child adjustment contains .. at beginning. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@383027 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-04 04:28:03 +00:00
Kenney Westerhof f3a9e38340 PR: MNG-2006 
Replaced appendPath with a more robust implementation,
after discussing it with jdcasey.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382881 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-03 16:22:44 +00:00
John Dennis Casey 4c85dfc331 Adding defensive code for one more place where cleanedPath length could cause a problem with string manipulation in appendPath(..). 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382861 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-03 15:27:25 +00:00
John Dennis Casey 138d77d3b0 Fixing NPE in appendPath(..) when calculating '..' path adjustments. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382849 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-03 15:08:31 +00:00
John Dennis Casey c5898ee466 Added TODO comment to the getModulePathAdjustment() method. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379575 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 20:25:02 +00:00
John Dennis Casey 6fb187fa98 [MNG-2006] Fixing url rewriting for child POMs in sibling directories of parent POM (or anything other than subdir). First guess is based on parent POM file, but if parent POM is built from repository, will use the module artifactId as a basis instead. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379572 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 20:10:52 +00:00
John Dennis Casey b07d835b9c [MNG-2083] Correcting problem where cached projects result in missing downloadUrl for unresolvable artifacts. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379516 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 16:33:52 +00:00
Emmanuel Venisse eb5bb3d386 fix compilation error 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379501 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 15:51:55 +00:00
Emmanuel Venisse b9b9efbe4a merge from branch rev.379486 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379489 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 15:26:09 +00:00
Emmanuel Venisse 8a630687b7 merge from branch rev.379473 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379481 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 15:08:26 +00:00
Brett Leslie Porter b68c84b86d [MNG-1703] <pluginManagement><dependencies> is not propagated to child POMs 
Submitted by: Edwin Punzalan


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379365 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 06:15:33 +00:00
Brett Leslie Porter faa5cf27cb [MNG-1856] fix inheritance of the distribution management section and add tests 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379324 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 03:57:23 +00:00
Brett Leslie Porter ad38e46b4b [MNG-1999] fix reporting > excludeDefaults inheritance 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379311 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 02:30:32 +00:00
John Dennis Casey 908d6624d4 [MNG-2078] Added <value>true</value> to profile activation for -DperformRelease system property in super-POM. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379288 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-20 23:44:08 +00:00
John Dennis Casey 602899a9f4 [MNG-2006] Changed the model inheritance assembler to allow the project builder to pass in a child path adjustment String, which is the module path of the child in the parent POM. This can be used to realign the URLs of the child POM in addition to simply appending the child path to the parent. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379247 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-20 21:52:03 +00:00
John Dennis Casey 5395710ce0 Merging in fix for MNG-2037. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379181 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-20 17:44:23 +00:00
Jason van Zyl 95189e189e [MNG-1980] Removing the duplicate ID, the reactor will catch duplicate IDs in a single build so it doesn't not need 
to be checked for in the project builder. I have removed the model caching for now while I'm refactoring
           the project builder. The plan is to break the 1000+ lines down into its constituent components and use
           a pipeline to build up the project.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@371079 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-21 16:36:06 +00:00
Jason van Zyl 425a841a8b [MNG-1927] This adds the test mojos required to fix ${pom.build.*} expansion to full paths, the problem was the 
new interpolator so the one from 2.0 was used and some envar handling was back ported. Unit tests
           have been added for envar handling as well as an IT. The maven-core-it script will now set
           an envar which is used in it0090.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@368108 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-11 19:36:37 +00:00
Brett Leslie Porter cc20bf6402 merge from branch maven-2.0.x @ rev 367900 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367902 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-11 03:45:10 +00:00
Jason van Zyl c3c8fdb17a o [MNG-1927] Correcting an error I made with POMs not in the current working tree 
o turn on it0088
o turn off it0086, and it0087 for now



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367487 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-10 05:16:31 +00:00
Jason van Zyl f52a730b74 [MNG-1927] Fixing the ${pom.build.directory} path translation and interpolation so that an absolute path 
is rendered.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367457 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-10 01:45:00 +00:00
Brett Leslie Porter af1a99198f merge from branch maven-2.0.x, up to rev 365776 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@365790 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-04 01:14:17 +00:00
Brett Leslie Porter 9ae0914694 flip trunk to 2.1-SNAPSHOT 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356316 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-12 18:22:06 +00:00
John Dennis Casey 8a5fa61b17 [maven-release-plugin] prepare for next development iteration 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356099 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-12 01:41:09 +00:00
John Dennis Casey 9cf94e34f2 [maven-release-plugin] prepare release maven-2.0.1 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356093 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-12 01:34:03 +00:00
Brett Leslie Porter 65acc94926 implement lax parsing of repository metadata XML files 
PR: MNG-1788


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355404 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-09 07:58:04 +00:00
John Dennis Casey 4e955c058a PR: MNG-1509 
Submitted By: Bernd Bohmann
Reviewed By: John Casey

Applied patches. These patches added the OS activator to the component descriptor, fixed the activation implementation for it, and finally added a unit test for OS activation.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355387 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-09 05:57:05 +00:00
John Dennis Casey c54202821e PR: MNG-1471 
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patch, with small logic fix. This patch will validate that if a systemPath is specified for a dependency, it is absolute. It's possible to use expressions in this path, but by the time it's validated in this step, those expressions will have been resolved.

My change was to add the same validation to managed dependencies.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354635 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-07 00:42:46 +00:00
John Dennis Casey 5b427cf076 PR: MNG-1630 
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patches, with minor changes.

These patches will ensure that the optional flag is passed on and inherited correctly when dealing with managed dependencies.

I changed the patches, in that I added a new createDependencyArtifact(..) method on ArtifactFactory, which will eliminate the need to call an older variant of the method by passing in a null value for the inheritedScope parameter.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354544 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-06 20:50:41 +00:00
John Dennis Casey 8e85652193 PR: MNG-1355 
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patch, with small logical fix (used getArtifactId() where getGroupId() was the intention).

This patch will guard against overwriting cached models in the project builder (check for pre-existing model in cache before adding), and will validate that a POM's parent has a different groupId:artifactId than the current POM.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354473 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-06 16:50:22 +00:00
John Dennis Casey a321da38d6 PR: MNG-1525 
Submitted By: Edwin Punzalan
Reviewed By: John Casey

NOT applying this patch. I found a better solution that will factor the interpolation of the POM into a flexible utility in plexus-utils, and will allow introduction of envar resolution to the POM. It will also make interpolating the settings.xml and profiles.xml using any of a number of expression resolvers (using envar resolution only for now).

BTW, I tried using System.getenv(..) in JDK1.4, and it fails with java.lang.Error and a deprecation message. So, I'm using Edwin's code to extract the envars into a Properties object. We can improve this later.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354462 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-06 16:28:07 +00:00
John Dennis Casey 07c2c719a4 setting the artifact versionRange instead of the version itself for artifacts created as a result of relocation. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348467 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-23 15:49:36 +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 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 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
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
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
John Dennis Casey 56a2d33505 Forgot to open up these two methods via the interface... 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@331872 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-08 19:48:57 +00:00