Commit Graph

754 Commits

Author SHA1 Message Date
John Dennis Casey 0734c3e60e quiet down some of the project-caching debug output for now...it's getting in the way of debugging other things.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@645971 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 15:25:13 +00:00
John Dennis Casey c32aa5a656 Fixing unit test problems from it0103 fix, and fixing it0042...just 4 more failing ITs before this is back on its feet.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@645015 13f79535-47bb-0310-9956-ffa450edef68
2008-04-05 02:19:29 +00:00
John Dennis Casey 64b93201c3 Fixing it0103, which in this case had to do with when to use the relativePath to lookup the parent model from the project workspace.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644767 13f79535-47bb-0310-9956-ffa450edef68
2008-04-04 16:51:53 +00:00
John Dennis Casey 82787b4ece [MNG-3498] Fixing StringIndexOutOfBoundsException.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644378 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 15:48:36 +00:00
John Dennis Casey 1d9d014cde Fixing MNG-3355 and MNG-2339.
This commit introduces three changes: user-level properties that are separated from the execution properties, where execution properties contain envars, sysprops, and user-level properties...user-level properties are useful for POM interpolation for 2339 and 3355.

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

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

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644354 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 15:18:18 +00:00
John Dennis Casey 7442d682d1 Cleaning up the pluginRepositories warning, and isolating it to a compatibility aspect so we can scan Model and Profile instances as they pass through the system more cleanly and ignore violations from POMs that are resolved in the repository.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@643188 13f79535-47bb-0310-9956-ffa450edef68
2008-03-31 22:27:20 +00:00
John Dennis Casey 3f75133076 [MNG-3482][MNG-3391]
1. Moving the mergeManagedDependencies(..) call INSIDE of processProjectLogic(..), to just AFTER interpolation but BEFORE injection of managed-dependency information into the main dependencies information, and also ahead of model validation. This allows expressions in imported-POM specifications to be interpolated before these are merged to the current project.

2. Restricting the mergeManagedDependencies(..) logic to only happen when type == pom (which was already there) AND scope == import (which is new). 

ALSO related to [MNG-3483].

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@641662 13f79535-47bb-0310-9956-ffa450edef68
2008-03-27 00:47:51 +00:00
Brian E Fox bc57c4bafb going back to assembly beta-1 as there is an important regression in assembly:attached. MASSEMBLY-301
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@639744 13f79535-47bb-0310-9956-ffa450edef68
2008-03-21 18:18:07 +00:00
Brian E Fox 4ae119a9db MNG-3395: adjust the ear plugin version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@639019 13f79535-47bb-0310-9956-ffa450edef68
2008-03-19 21:08:04 +00:00
John Dennis Casey b1f048aed7 [MNG-3286] Fixing inherited flag for plugin executions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@638213 13f79535-47bb-0310-9956-ffa450edef68
2008-03-18 04:45:05 +00:00
Brian E Fox 63513cb1c7 MNG-3395: adjust the plugin versions (merge from 2.0.x)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@638013 13f79535-47bb-0310-9956-ffa450edef68
2008-03-17 18:38:51 +00:00
John Dennis Casey b8fb4e3471 [MNG-3355] Use translated paths to resolve expressions referencing build directories in the model during interpolation, if the project-descriptor is known (if the project is from the local filesystem, not from the repository system).
Also, merge repositories and pluginRepositories when creating their ArtifactRepository analogs, to restore the pluginRepository functionality. I've added a deprecation warning in these cases, but it may need to be made more prominent.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@637326 13f79535-47bb-0310-9956-ffa450edef68
2008-03-15 01:28:01 +00:00
John Dennis Casey 78f361ecd4 Adding comment on MNG-3391 problems...this is from the other day, and I forgot I had it.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@637277 13f79535-47bb-0310-9956-ffa450edef68
2008-03-14 21:35:41 +00:00
John Dennis Casey e7eefe0b3f Pushing project workspace usage out of ProjectCacheAspect into DefaultMavenProjectBuilder and DefaultModelLineageBuilder, to make it easier to understand how these critical pieces of logic execute relative to other pieces of the project-building process, such as managed-dependency merging.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@636023 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 17:27:29 +00:00
Brian E Fox c3084c97fb use the correct property syntax
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634822 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 21:04:05 +00:00
Brian E Fox 2f09ccf48c MNG-3395: defaulted apache plugin versions in the superpom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634817 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 20:57:51 +00:00
John Dennis Casey 19cfe737aa Restore complete list of plugin artifacts in PluginDescriptor for use in ${plugin.artifacts}.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633239 13f79535-47bb-0310-9956-ffa450edef68
2008-03-03 19:18:37 +00:00
John Dennis Casey a5f49900f2 Adding the beginnings of a workspace to Maven, which is just a shared cache component for project, model, and POM file instances (for now). This allows fine-grained control over when such caches are cleared in environments where embedder instances may be reused multiple times, and will eventually enable new profile activators that require access to project information in the current build along with other advanced caching and cache-querying features.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632482 13f79535-47bb-0310-9956-ffa450edef68
2008-02-29 22:58:00 +00:00
Jason van Zyl 4411b1c425 Changing to name and not email.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632468 13f79535-47bb-0310-9956-ffa450edef68
2008-02-29 22:36:19 +00:00
John Dennis Casey b4e41217c6 Improve phase-tracking, event dispatching, and align build headers as events dispatched to the default event monitor...also, add debug-level enter/exit phase output in the default event monitor. Finally, refactored code that actually renders the build plan and executes the mojos for each task-segment in the lifecycle executor, to eliminate all the duplication.
This lays the ground work for improving cache management, since I also added event types for embedder control (keep in mind that event monitors can be used to control when the project/model cache is flushed, for example).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@631455 13f79535-47bb-0310-9956-ffa450edef68
2008-02-27 01:26:41 +00:00
Ralph Goers c538113326 Search remote repositories for managed dependency pom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@630401 13f79535-47bb-0310-9956-ffa450edef68
2008-02-23 06:55:02 +00:00
John Dennis Casey 0be649b7be Adding resources and [commented out] new test method to apply scm inheritance checks to POMs read from a local repository...this is currently broken, as noted in MavenProject, line 291 or thereabouts, which is why the test is commented out.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629632 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 22:06:14 +00:00
John Dennis Casey 793020c798 Tests to verify that SCM inheritance calculations are correct, using both project builder directly and the embedder's readProject(..) method.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629549 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 18:11:15 +00:00
John Dennis Casey 99ef368866 Add a TODO about the log-level.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629241 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 21:32:58 +00:00
John Dennis Casey ed863374c5 Quiet down all the deprecated-expression stuff to debug log-level until we get serious about fixing this in poms.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629240 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 21:31:56 +00:00
Carlos Sanchez Gonzalez 53e9189566 [MNG-3400] Implement clone properly following Effective Java' book considerations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@627932 13f79535-47bb-0310-9956-ffa450edef68
2008-02-15 02:39:02 +00:00
Carlos Sanchez Gonzalez 17d401df6c [MNG-3400] MavenProject is not extensible
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@627670 13f79535-47bb-0310-9956-ffa450edef68
2008-02-14 06:08:07 +00:00
John Dennis Casey 10da177f1d [MNG-3119] Modifying MavenProject.addAttachment(..) and MavenProjectHelper.attachArtifact(..) implementations to throw an unchecked exception when a project attachment will collide with existing attachments. This includes tests to verify the behavior. The unchecked exception allows Maven to deal with it as a real build failure, while avoiding the need to modify the MavenProjectHelper API, which is part of Maven's core and which would render many existing plugins incompatible with new Maven releases.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@618497 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 00:09:27 +00:00
Jason van Zyl e30510f0c9 o rolling back to r617947
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@618044 13f79535-47bb-0310-9956-ffa450edef68
2008-02-03 17:47:10 +00:00
Jason van Zyl a093415971 o committing my changes and i'll quickly make a branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@618021 13f79535-47bb-0310-9956-ffa450edef68
2008-02-03 17:08:57 +00:00
Jason van Zyl 00206c8dbd o updating for the changes I just made to maven-artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@617948 13f79535-47bb-0310-9956-ffa450edef68
2008-02-03 04:50:45 +00:00
John Dennis Casey ebf314c5a3 [MNG-2145] Adding some more unit tests to protect against these problems in future.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@617330 13f79535-47bb-0310-9956-ffa450edef68
2008-02-01 02:13:36 +00:00
John Dennis Casey 5e8a0a0906 [MNG-2145] Correcting several merge issues between profiles and main build, and also of duplicate plugin declarations within a single build section.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@617325 13f79535-47bb-0310-9956-ffa450edef68
2008-02-01 01:53:21 +00:00
John Dennis Casey f838337b7a Refactor the artifact-scanning logic from the realm manager and the plugin-artifact resolution logic in the plugin manager into two separate classes, one a component and one a static class, to allow the new PluginPrefixLoader to reuse some of both and create a lighter-weight approach to grabbing the PluginDescriptor for build-planning purposes...also avoids some needless error messages during build planning.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@617293 13f79535-47bb-0310-9956-ffa450edef68
2008-01-31 23:29:18 +00:00
John Dennis Casey e670bd3ea3 Adding the concept of recommended stacktrace hints for reported errors, and add the ability to directly access the list of exceptions that actually hit the error reporter (instead of having to use MavenExecutionResult.getExceptions() in conjunction with findReportedException(..) to unwrap them.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@617178 13f79535-47bb-0310-9956-ffa450edef68
2008-01-31 18:17:05 +00:00
John Dennis Casey f2d7a5aa5f Fine-tuning an error reporting pointcut, and also adding a method to the embedder to allow a third party access to the build plan for a specific project, given a set of goals to be invoked.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@616825 13f79535-47bb-0310-9956-ffa450edef68
2008-01-30 18:13:07 +00:00
John Dennis Casey 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