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
Brian E Fox
8ff17e2654
MNG-3484: patch from James William Dumay to quote MAVEN_OPTS
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@641699 13f79535-47bb-0310-9956-ffa450edef68
2008-03-27 03:07:26 +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
Benjamin Bentmann
b56e146d2d
o Added svn:keywords
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640556 13f79535-47bb-0310-9956-ffa450edef68
2008-03-24 20:23:25 +00:00
Benjamin Bentmann
2bf41e24b2
o Added svn:eol-style=native
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640555 13f79535-47bb-0310-9956-ffa450edef68
2008-03-24 20:20:41 +00:00
Benjamin Bentmann
1c3af9f908
o Fixed svn:keywords
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640236 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 18:20:22 +00:00
Benjamin Bentmann
898e4afab6
o Added svn:eol-style=native
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640234 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 18:04:33 +00:00
Benjamin Bentmann
4efc9b5de9
o Removed svn:executable
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640229 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 17:57:41 +00:00
Benjamin Bentmann
ca83db4b5b
o Beautified project name
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640228 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 17:49:56 +00:00
Benjamin Bentmann
0ec14e6ff4
o Added Eclipse files to svn:ignore
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640222 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 17:10:35 +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
Brian E Fox
56178abd95
pass on the local repo to the its
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@638008 13f79535-47bb-0310-9956-ffa450edef68
2008-03-17 18:30:17 +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
Brian E Fox
7c3fc6b47e
making the verifier use the target folder. This makes it easier to browse a CI workspace, lets you actually clean everything, and makes the tests work better on windows. who knew?
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@637248 13f79535-47bb-0310-9956-ffa450edef68
2008-03-14 20:25:20 +00:00
Brian E Fox
02b1ff0f76
use new parent
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@637236 13f79535-47bb-0310-9956-ffa450edef68
2008-03-14 20:04:09 +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
Milos Kleint
b8042967e0
MAVEN-3430 make sure getType never returns null.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@635690 13f79535-47bb-0310-9956-ffa450edef68
2008-03-10 21:07:54 +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
Vincent Siveton
c9888e169a
o merged from r634311 (MNG-3442: Add explicit resource bundle for English)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634313 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 15:45:08 +00:00
Vincent Siveton
39a85be0d3
o merged r634304 (MNG-428: Japanese message resource)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634305 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 15:32:01 +00:00
John Dennis Casey
fdf69050f1
Reinstate mojo execution logging to the console using the default event monitor. Also, have the error-reporting unit test cleanup after itself.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634134 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 02:48:44 +00:00
Jason van Zyl
9bf54d4984
o rolling back r631468, we will use the container to dynamically pull in wagons in 2.1
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634081 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 23:34:06 +00:00
Milos Kleint
696823a995
include toolchain in the final build
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633982 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 19:14:49 +00:00
Brett Leslie Porter
97e9f53ac3
[MNG-2234] activate profiles that are not present in the settings so that they can be defined in the POM
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633766 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 04:56:46 +00:00
Brett Leslie Porter
28e658a172
remove empty dir
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633764 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 04:25:31 +00:00
John Dennis Casey
d9b17ffbb3
Fixing injection of plexus-utils imports for XPP3 stuff.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633750 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 02:28:59 +00:00
Brett Leslie Porter
832c5d09a6
ignore target
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633665 13f79535-47bb-0310-9956-ffa450edef68
2008-03-04 22:01:55 +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
Vincent Siveton
80a6818f01
o merged from r633053 (fixed potential NPE)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633054 13f79535-47bb-0310-9956-ffa450edef68
2008-03-03 12:09:01 +00:00
Carlos Sanchez Gonzalez
b19a751704
[MNG-3410] Managed versions in plugins are not considered when using them
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632683 13f79535-47bb-0310-9956-ffa450edef68
2008-03-02 00:55:14 +00:00
Milos Kleint
667d800240
integrate maven-toolchain, make buildable
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632594 13f79535-47bb-0310-9956-ffa450edef68
2008-03-01 14:07:09 +00:00
Milos Kleint
5377165201
copy maven-toolchains project into components trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632585 13f79535-47bb-0310-9956-ffa450edef68
2008-03-01 12:59:47 +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
Vincent Siveton
df783cfaef
o merged from r631837 (added more javadoc)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@631838 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 04:05:50 +00:00
Brett Leslie Porter
c2bc33050c
[MNG-2664] add wagon-webdav to the built in providers
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@631468 13f79535-47bb-0310-9956-ffa450edef68
2008-02-27 02:46:17 +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
Herve Boutemy
db4820c72b
[MNG-3316] use plexus-utils 1.5+ which fixes problem when an XML attribute is named *encoding
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@630415 13f79535-47bb-0310-9956-ffa450edef68
2008-02-23 09:00:09 +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
22817a2444
Fixing site-generation and other plugins that require reports.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@630048 13f79535-47bb-0310-9956-ffa450edef68
2008-02-21 23:31:38 +00:00
John Dennis Casey
f88f9df9ff
Fixing bad logic in unit tests where a test plugin must build first.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@630047 13f79535-47bb-0310-9956-ffa450edef68
2008-02-21 23:30:48 +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
d54cf5b9bb
Ignore missing modules during extension-scanning when MavenEmbedder.readProject(..) is called. At other times, as in the case of normal builds, don't suppress missing module exceptions.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629571 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 18:53:09 +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
9a2d2f9e4d
Rolling this back until version 8 is released...
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629277 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 23:38:45 +00:00