Commit Graph

2251 Commits

Author SHA1 Message Date
Benjamin Bentmann 6b82e83024 [MNG-4776] NPE during build from parent but not from child
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989222 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 17:00:20 +00:00
Benjamin Bentmann 6c37a89744 [MNG-4756] Aether integration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@988749 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 22:46:07 +00:00
Benjamin Bentmann 44c35b0510 [MNG-4749] Move from Plexus to Guice as IoC container
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@988484 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 11:18:30 +00:00
Benjamin Bentmann 4b04709828 [MNG-4773] Stack trace printed from MavenProject.getParent
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@987610 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 19:28:22 +00:00
Benjamin Bentmann f022e66b2a [MNG-4772] [regression] Plugin version resolution ignores enabled flags on repository
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@987572 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 16:55:04 +00:00
Benjamin Bentmann 54be625048 [MNG-4771] [regression] Plugin prefix resolution ignores enabled flags on repository
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@987570 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 16:53:39 +00:00
Benjamin Bentmann 2225bc7bbe [MNG-4765] Failing to determine java version for profile....
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@987335 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 22:26:55 +00:00
Herve Boutemy 62a4bb86ce renamed *Impl classes to Default* to match usual convention
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@986913 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 20:23:21 +00:00
Herve Boutemy 618bbf4f0e added @since information
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@986532 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 00:20:20 +00:00
John Dennis Casey 8cdb461fdf [MNG-4761] Fixing unit tests. system scope has to be preserved in plugin-level deps.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@984543 13f79535-47bb-0310-9956-ffa450edef68
2010-08-11 19:22:46 +00:00
John Dennis Casey b2fd85fa8a [MNG-4761] Force plugin-level dependencies to use runtime scope, so conflict resolution doesn't make a determination based on dependency scoping.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@984534 13f79535-47bb-0310-9956-ffa450edef68
2010-08-11 18:55:44 +00:00
Benjamin Bentmann ab39d82dd1 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@983204 13f79535-47bb-0310-9956-ffa450edef68
2010-08-07 10:53:09 +00:00
Benjamin Bentmann 99823b034e [maven-release-plugin] prepare release maven-3.0-beta-2
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@983202 13f79535-47bb-0310-9956-ffa450edef68
2010-08-07 10:51:26 +00:00
Benjamin Bentmann a9a19a7a62 [MNG-4615] [regression] @required plugin parameters are not validated
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@983050 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 16:47:58 +00:00
Benjamin Bentmann e96c8dab7e [MNG-4750] [regression] MavenProject.getDependencyArtifacts() aren't resolved
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@982696 13f79535-47bb-0310-9956-ffa450edef68
2010-08-05 17:02:24 +00:00
Benjamin Bentmann 46de558b61 [MNG-4747] Javaagent not usable since 3.0-alpha
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@982405 13f79535-47bb-0310-9956-ffa450edef68
2010-08-04 21:11:43 +00:00
Benjamin Bentmann 09117ae465 o Improved backward-compat
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@980888 13f79535-47bb-0310-9956-ffa450edef68
2010-07-30 16:55:57 +00:00
Benjamin Bentmann f179e38933 o Avoided creation of broken ThreadLockedArtifact (i.e. don't wrap null artifacts)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@980522 13f79535-47bb-0310-9956-ffa450edef68
2010-07-29 17:49:54 +00:00
Benjamin Bentmann 7c5b95fa26 o Fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@980426 13f79535-47bb-0310-9956-ffa450edef68
2010-07-29 12:37:41 +00:00
Benjamin Bentmann 2e71421fe7 [MNG-4740] Maven hangs with big aggregators with lots of inter-modules dependencies
Submitted by: Vincent Latombe

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@979808 13f79535-47bb-0310-9956-ffa450edef68
2010-07-27 19:08:20 +00:00
Kristian Rosenvold f19befcf70 o Reduced access level of class, updated some docs
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@978818 13f79535-47bb-0310-9956-ffa450edef68
2010-07-24 07:29:15 +00:00
Kristian Rosenvold a49f986e86 [MNG-4633] Added ThreadLockedArtifact, Implemented locking algorithm
Fix affects weave mode only.
    
    Solves 3 different known problematic cases where downstream reactor
    modules access the file of the upstream module's artifact before it
    is ready (seem in ant-plugin, ear plugin and reported on issue).
    
    The basic premise of this fix is that only a few selected phases
    actually need access to the classes variant of artifact.getFile()
    which is set by the compiler plugin.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@967190 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 18:25:04 +00:00
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