Commit Graph

2213 Commits

Author SHA1 Message Date
Benjamin Bentmann c031581c62 o Formatted code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@944868 13f79535-47bb-0310-9956-ffa450edef68
2010-05-16 15:47:09 +00:00
Benjamin Bentmann 1cadde7468 o Used component annotations where possible
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@944865 13f79535-47bb-0310-9956-ffa450edef68
2010-05-16 15:43:21 +00:00
Benjamin Bentmann dca7e1fffe o Updated default version of maven-clean-plugin to 2.4.1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@944796 13f79535-47bb-0310-9956-ffa450edef68
2010-05-16 11:12:11 +00:00
Benjamin Bentmann 0a6b3d8510 [MNG-4666] [regression] Plugins depending on plexus:plexus-container-default get broken runtime classpath
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@944710 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 20:14:00 +00:00
Benjamin Bentmann 58b0987b90 o Cleaned up core artifact filter and removed exclusions pf non-existing artifacts
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@944685 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 17:26:43 +00:00
Olivier Lamy 2e4a9ecf26 restore more backward comp.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@944477 13f79535-47bb-0310-9956-ffa450edef68
2010-05-14 21:17:31 +00:00
Kristian Rosenvold acd6b3c1c0 [MNG-4633] Re-added configurable phase synchronization wrt upstream phase
Made execution plan calculation parallel in weave mode

Existing weave mode would only phase-lock to the same phase upstream.
Execution plan calculation made parallel at high-level, still looking
into reducing blocking in DefaultMavenPluginManager to cash in on this.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@941474 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 20:38:28 +00:00
Benjamin Bentmann d126a29bc7 [MNG-4664] Minor patches needed to run Maven3 with the replacement Guice-Plexus container
Submitted by: Stuart McCulloch

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@941224 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 09:49:08 +00:00
Benjamin Bentmann f9002b1821 o Fixed error message
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@940810 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 11:41:32 +00:00
Benjamin Bentmann 90027ef75a [MNG-4658] Relax validation of repository ids and only warn upon conflict with "local"
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@940790 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 09:57:46 +00:00
Kristian Rosenvold ab495d4a39 [MNG-4633] Changed to use nice clean countdownlatch instead of synchronized booleans
Also updated phase locking to only lock when project being built changes phase

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@939220 13f79535-47bb-0310-9956-ffa450edef68
2010-04-29 07:22:39 +00:00
Benjamin Bentmann 0d7a05f8b2 o Formatted code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@939034 13f79535-47bb-0310-9956-ffa450edef68
2010-04-28 18:04:12 +00:00
Kristian Rosenvold 1248bd1c1f [MNG-4651] Re-added missing methods for 3.x site plugin
Also clarified role of LifecylceExecutor as a 'facade providing lifecycle services'

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@939028 13f79535-47bb-0310-9956-ffa450edef68
2010-04-28 17:51:31 +00:00
Kristian Rosenvold 1a7361596b [MNG-4642] Extended MojoDescriptor with threadSafe attribute
Added support for detecting @threadSafe annotation and a nice noisy, warning message.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@938443 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 13:07:17 +00:00
Benjamin Bentmann 1da75bb7ef o Polished log output
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@938411 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 11:11:49 +00:00
Benjamin Bentmann 809969a06b o Made programming errors show up as internal errors to the user
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@938393 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 10:15:27 +00:00
Kristian Rosenvold ef776a9a17 [MNG-4633] Adjusted upstream reactor artifact resolution to resolve on every phase change
Changed build summary time to show effective mojo time in weave mode, it's the only thing that made sense.
Removed uneccessary synchronized block in DefaultMavenPluginManager because now everything JustWorks(TM)

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@938149 13f79535-47bb-0310-9956-ffa450edef68
2010-04-26 17:43:51 +00:00
Benjamin Bentmann 5881bc7474 o Cleaned up license headers
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@935748 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 21:14:33 +00:00
Kristian Rosenvold 2339e16750 o Refactoring: Moved one incorrectly placed method from BuildListCalculator to TaskSegmentCalculator
This method was creating a lot of strange internal dependencies since it was mis-placed

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@935741 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 20:57:44 +00:00
Benjamin Bentmann b329fdb4e5 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@935667 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 16:55:28 +00:00
Benjamin Bentmann 958b6eced1 [maven-release-plugin] prepare release maven-3.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@935664 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 16:54:05 +00:00
Kristian Rosenvold 954acd1a12 o Refactoring: Extracted schedules out of DefaultLifecycles
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@935341 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 13:52:20 +00:00
Kristian Rosenvold 69c68d06c5 [MNG-4633] Reactor artifact resolution in weave mode
Resolves artifacts from within reactor build.
No longer requires artifacts to be present in local repository before building weave mode ;)

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@935334 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 11:36:37 +00:00
Benjamin Bentmann e3c7c2633d o Fixed format of project id
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934867 13f79535-47bb-0310-9956-ffa450edef68
2010-04-16 13:37:25 +00:00
Benjamin Bentmann 419a1d4627 o Refactored code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934861 13f79535-47bb-0310-9956-ffa450edef68
2010-04-16 13:18:48 +00:00
Benjamin Bentmann 41eb59fdd1 o Fixed handling of missing project artifact id
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934440 13f79535-47bb-0310-9956-ffa450edef68
2010-04-15 15:09:40 +00:00
Kristian Rosenvold 7e5e5eb1da [MNG-4633] Weave mode operational.
Replaced approximation-based algorithm for detecting upstream-mojo dependencies with
a proper phase based solution. Revised re-resolution strategy of reactor artifacts

There are a few minor performance inefficiencies (only in weave mode), that will be
sorted for beta-2.

Improved logging, and also added initial graphviz-format log output support

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934425 13f79535-47bb-0310-9956-ffa450edef68
2010-04-15 14:34:42 +00:00
Benjamin Bentmann 9fa047dc30 o Removed unused import
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934206 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 21:39:45 +00:00
Kristian Rosenvold 95330133d9 [MNG-4633] Fixed weave mode bug when building m3 itself in weave mode.
Updated testcase for MEP.

Also removed all unused/unecessar code from weave mode.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934201 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 21:23:26 +00:00
Benjamin Bentmann ac455ccc60 o Polished logging
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@933910 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 11:02:23 +00:00
Igor Fedorenko 2115920094 MNG-4634 Allow custom lifecycles
Build extensions plugins can now define new lifecycles. Implementation guarantees 
that standard lifecycles, i.e. default, clean and site, are considered before custom
lifecycles. It assumes that phase names are globally unique and ignores any
duplicate phase names (with a warning).

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@933848 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 03:09:21 +00:00
Kristian Rosenvold 87ff4bf414 [MNG-4633] Changes from review on #maven-dev
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@933799 13f79535-47bb-0310-9956-ffa450edef68
2010-04-13 22:00:53 +00:00
Kristian Rosenvold 12b34781ec [MNG-4633] Removed isWeaveMode from ReactorArtifactRepository
This feature was incorrect, and weave mode requires no special handling here.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@933771 13f79535-47bb-0310-9956-ffa450edef68
2010-04-13 20:09:15 +00:00
Benjamin Bentmann 6917060e56 o Eased migration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@933174 13f79535-47bb-0310-9956-ffa450edef68
2010-04-12 10:19:24 +00:00
Benjamin Bentmann 3d2bebeb19 o Formatted code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@933172 13f79535-47bb-0310-9956-ffa450edef68
2010-04-12 10:18:26 +00:00
Benjamin Bentmann e171aa5e0d o Refactored code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@933001 13f79535-47bb-0310-9956-ffa450edef68
2010-04-11 22:15:17 +00:00
Benjamin Bentmann 91e83d2424 o Refactored execution event firing
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@933000 13f79535-47bb-0310-9956-ffa450edef68
2010-04-11 21:41:33 +00:00
Benjamin Bentmann 21997b5c6b o Improved logging for forked executions
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@932966 13f79535-47bb-0310-9956-ffa450edef68
2010-04-11 18:10:07 +00:00
Jason van Zyl 6ab4736f12 Change the default maven-compiler-plugin version to 2.3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@932701 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 11:48:33 +00:00
Benjamin Bentmann 0c20759680 [MNG-4453] [regression] Plugin versions defined in a lifecycle mapping are not respected
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@932609 13f79535-47bb-0310-9956-ffa450edef68
2010-04-09 20:59:09 +00:00
Benjamin Bentmann 238f8c02fb [MNG-2994] Snapshot repositories are not checked when using ranges
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@932128 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 21:29:56 +00:00
Benjamin Bentmann 51b1094d1e o Used generated clone() methods
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@932100 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 20:47:10 +00:00
Benjamin Bentmann 5f7181d9b8 o Added missing method signature
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@931928 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 13:25:09 +00:00
Kristian Rosenvold 643337864b [MNG-3004] Re-added calculateExecutionPlan to DLE, fixed ASF code standard
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@931921 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 13:06:58 +00:00
Kristian Rosenvold 83237e46af [MNG-3004] Concurrent building of multimodule projects
This commit consists of a modularization of the DefaultLifecycleExecutor into smaller
components. This is primarily done with the intention of extracting execution strategy 
somewhat from the rest of the logic.

It also contains three differenent execution strategies:
A) Linear ("Classic")
B) Parallel (Based on Dan's original implemementation)
C) Weave (Still experimental) 

 
The command line -T option activates parallel running, and the argument
is in the form -T <[nThreads, a float][C][W]|auto>

Notes:
* The output demultiplexer is disabled in this commit, and output will appear intermingled.
* The modello plugin has known problems
* Surefire must be run in forkmode at least once.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@931884 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 11:29:13 +00:00
Igor Fedorenko fba6edc9ae MNG-4628 ReactorArtifactRepository is not setup soon enough for AbstractMavenLifecycleParticipant#afterProjectsRead
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@931641 13f79535-47bb-0310-9956-ffa450edef68
2010-04-07 18:58:53 +00:00
Benjamin Bentmann 1f9e91da55 [MNG-4625] Interpolation of settings.xml fails if an expression's value contains XML markup
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@931545 13f79535-47bb-0310-9956-ffa450edef68
2010-04-07 13:44:18 +00:00
Benjamin Bentmann 37a0e64aa0 [MNG-4618] maven-javadoc-plugin aggregate-jar fails with maven3 and multiple modules
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@931086 13f79535-47bb-0310-9956-ffa450edef68
2010-04-06 11:00:19 +00:00
Benjamin Bentmann aa0b4f4618 [MNG-3133] DefaultModelInheritence::appendPath assumes it is operating on interpolated/literal paths
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@930411 13f79535-47bb-0310-9956-ffa450edef68
2010-04-02 22:07:04 +00:00
Benjamin Bentmann d425e273a1 [MNG-3470] Build does not fail on corrupted POM even with checksumPolicy=fail
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@929985 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 14:16:03 +00:00