b6d1a5d1ac
current model's remote repositories need to be calculated before the parent/origin is stored in lineage.
...
fixes this scenario (as found in svn:https://www.dev.java.net/svn/grizzly/trunk )
project defines remote custom repository and also has build extension that is only available at that remote repository. it defines RELEASE as the version of the extension artifact.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673664 13f79535-47bb-0310-9956-ffa450edef68
2008-07-03 12:08:42 +00:00
3d6b63bc11
[MNG-3642] Adding internal-only unique id 'mergeId' to build resources, to allow back-propagation of changed resource information from plugin executions to the dynamic version of the POM build section. Also, modified the project-builder's dynamism methods (calculate*, restore*) to use mergeId.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673417 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 15:25:22 +00:00
5c32bc6b28
All tests pass on my localhost...committing to see how it works on hudson.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672782 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 14:35:43 +00:00
cd2602d9e6
Adding -V|--show-version, and cleaning up interpolation to correspond with recent refactoriing in 2.0.x branch. Also, changing super-POM to use basedir/build.directory expressions in build paths, to enable paths to respond to changes in other, more basic paths (like outputDirectory responding to a change in build.directory). This is in preparation for merging over the dynamicBuild behavior.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@671936 13f79535-47bb-0310-9956-ffa450edef68
2008-06-26 16:34:27 +00:00
cec28aabe8
ordering is not important, and can vary
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670347 13f79535-47bb-0310-9956-ffa450edef68
2008-06-22 12:38:03 +00:00
825448f10e
[MARTIFACT-6] The deployer should detect previous deployments of the same version and die
...
This corrects the test case and implementation, utilising the previous changes made to ensure mirrors
and other repository metadata are not consulted for metadata
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669227 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 17:06:57 +00:00
e26974da98
[MNG-2739] Adding validation logic to DefaultMavenTools and ProjectUtils, to make sure repositories have id and url before constructing an ArtifactRepository instance...this code is used ahead of normal model validation, so it needs to be included here. Also, introducing a new exception to handle the errors when these elements are missing.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@659680 13f79535-47bb-0310-9956-ffa450edef68
2008-05-23 21:52:24 +00:00
e458d85616
Disable the pluginRepository deprecation message until the first release of 2.1 is imminent, to avoid confusion when using IDEs that use 2.1 snapshots (where the CLI still uses 2.0.x).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@659236 13f79535-47bb-0310-9956-ffa450edef68
2008-05-22 20:15:52 +00:00
07a035b146
Profiles should be activated if any of the activators return true.
...
Issue id: MNG-3106
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@656827 13f79535-47bb-0310-9956-ffa450edef68
2008-05-15 20:42:27 +00:00
e4602cb85a
Fix for profile deactivation.
...
Submitted By: David Bernhard
Issue id: MNG-3545
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@656405 13f79535-47bb-0310-9956-ffa450edef68
2008-05-14 20:22:22 +00:00
1c50dc0d0d
clean up the poms and move versions to dependencyManagement
...
Issue id: c
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@653481 13f79535-47bb-0310-9956-ffa450edef68
2008-05-05 13:46:40 +00:00
706890fd2b
Remove component that no longer exists
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@652730 13f79535-47bb-0310-9956-ffa450edef68
2008-05-02 02:02:39 +00:00
6d897f9312
Cleaning up artifact ordering for extensions and plugins in teh realm manager by switching to List for artifact collections, instead of allowing unordered Collection instances.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@651081 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 21:50:49 +00:00
007fe63a03
added site descriptors to provide modules/parent links (merged from 2.0.x branch r649903)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649913 13f79535-47bb-0310-9956-ffa450edef68
2008-04-20 11:37:31 +00:00
36092a009d
Adding ProjectBuilderConfiguration method for buildProjectWithDependencies, then switch the embedder.readProject* to use the ProjectBuilderConfiguration-enabled methods.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649629 13f79535-47bb-0310-9956-ffa450edef68
2008-04-18 18:00:27 +00:00
ec3ec0567e
Fixing interpolation for project.basedir and pom.basedir, by internalizing the basedir handling into the interpolator (now that we're passing in projectDir, it's easier to handle there).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@647287 13f79535-47bb-0310-9956-ffa450edef68
2008-04-11 19:53:04 +00:00
32a9c73445
Fixing MNG-2277 integration test.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@646517 13f79535-47bb-0310-9956-ffa450edef68
2008-04-09 20:21:39 +00:00
21d8a411f6
Fixing MNG-2861.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@646142 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 23:49:47 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Milos Kleint
John Dennis Casey
Brett Leslie Porter
Paul Gier
Brian E Fox
Carlos Sanchez Gonzalez
Herve Boutemy
Jason van Zyl
Ralph Goers