Commit Graph

2229 Commits

Author SHA1 Message Date
Benjamin Bentmann c6aab7be9f o Moved settings building into separate module
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@964730 13f79535-47bb-0310-9956-ffa450edef68
2010-07-16 09:59:13 +00:00
Benjamin Bentmann b66e581ef1 [MNG-4725] Extend core artifact filter to exclude Guice-based Plexus shim
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@963313 13f79535-47bb-0310-9956-ffa450edef68
2010-07-12 15:11:46 +00:00
Benjamin Bentmann d3965e9cbf [MNG-4718] [regression] Missing Class in 3.0-beta-1: org.apache.maven.project.artifact.AttachedArtifact
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@960855 13f79535-47bb-0310-9956-ffa450edef68
2010-07-06 09:34:43 +00:00
Herve Boutemy 23f2095652 fixed errors reported by Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@958295 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 23:16:18 +00:00
Kristian Rosenvold a9fcd5d108 [MNG-4682] Exception upon build failure in parallel builds
Also removed duplicated code line

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@956100 13f79535-47bb-0310-9956-ffa450edef68
2010-06-18 19:09:42 +00:00
Benjamin Bentmann e733004eb1 o Restored backward-compat with Maven 2.x
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@955820 13f79535-47bb-0310-9956-ffa450edef68
2010-06-18 02:48:46 +00:00
Olivier Lamy d6e04a3d49 add comment to prevent accidental delete of those methods :-)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@951862 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 13:55:06 +00:00
Benjamin Bentmann 93536dd82c o Fixed version resolution from reactor to match resolvable artifacts
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@951547 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04 20:05:18 +00:00
Benjamin Bentmann c94f27a8b4 [MNG-4697] Deprecate ununsed CLI options for plugin registry
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@951135 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 19:53:09 +00:00
Benjamin Bentmann 313e5b7761 o Set svn:eol-style=native
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@950626 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 16:35:38 +00:00
Benjamin Bentmann c389e65f2b o Separated maven-metadata.xml model into separate module for easy reuse in standalone repository library
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@950566 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 13:56:15 +00:00
Herve Boutemy cf68e8e091 o removed unused import
o fixed typos
o code simplification
(no code change)

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@950240 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 20:39:34 +00:00
Benjamin Bentmann 1a59d57746 o Removed dead code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@949832 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 18:48:45 +00:00
Benjamin Bentmann 9be1144e4e [MNG-4696] [regression] MavenProject.getDependencyArtifacts() misses elements
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@949801 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 16:34:51 +00:00
Benjamin Bentmann 6e7b4226e7 [MNG-1803] Provide line number information when there are errors processing a pom.xml
o Merged feature branch

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@949708 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 10:24:20 +00:00
Herve Boutemy 38d44c6e57 formatting fixes
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@949544 13f79535-47bb-0310-9956-ffa450edef68
2010-05-30 17:52:23 +00:00
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