8a257be6fc
Fixed problems with merging profile-defined properties into the project, and fixed the ITs testing profile definitions in the process.
...
This should finally resolve MNG-421
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189768 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 15:53:31 +00:00
2ab04f7c84
don't use cachedModel - it's null first time round, and we want to modify the current model.
...
Note that this modifies the cached version anyway.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189732 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 08:13:29 +00:00
8e5a462035
some clean up
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189727 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 07:55:33 +00:00
b0bdf5a54e
use newer modello
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189725 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 07:38:15 +00:00
4a7778d69b
ignore target, logs
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189724 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 07:37:39 +00:00
78078577a0
adding snippet markers so i can reference with a macro inside doxia doco
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189684 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 02:05:37 +00:00
eba2327c66
commenting out ITs 22 and 23 until I get the chance to fix them.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189680 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 01:29:30 +00:00
f8205e72f7
PR: MNG-276
...
Submitted by: Rahul Thakur
Reviewed by: Brett Porter
improve output during archetype creation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189679 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 01:09:32 +00:00
dd24bf77d5
Follow-on to finish the fix for MNG-421.
...
This adds external profile repositories to the artifactRepository construction used in resolving parent POMs.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189670 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 23:56:12 +00:00
30b1434723
Resolving: MNG-421
...
o External profiles (from settings.xml, profiles.xml) are now available before the main MavenProject is constructed, which allows repositories defined in external profiles to be used to resolve project parents and dependencies.
NOTE: I need to double-check whether the profile-defined repos are actually used to resolve the parent project(s)...there may be another commit following on the heels of this one.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189667 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 23:34:35 +00:00
0db2b646d2
JIRA issues fixed:
...
MRM-1
MRM-7
MRM-3
MRM-5
o Pipelining all logging through a single Reporter now, to repository.report.txt
o Disabled WARNING reports by default, add 'reportWarnings=true' to config file to enable them.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189629 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 20:19:41 +00:00
921d4ced59
o Started maven-projecthelp-plugin to help with build analysis (this helped me to visualize profile stuff)
...
current goals:
projecthelp:active-profiles
projecthelp:effective-pom
o Added source attribute to the Profile model class in maven-model, along with code in the normalization utilities (converters from profiles.xml and settings.xml models to maven-model instances) to identify the source of a particular profile.
o Added a activeProfiles cache of the Profiles in effect for the current project, on the MavenProject class
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189612 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 17:54:11 +00:00
53942a2d24
PR: MNG-457
...
add support to select a set of profiles
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189530 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 05:54:25 +00:00
b1ed3d90a6
update modello plugin
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189526 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 05:22:30 +00:00
7c69d89b08
add wagons to the exclusion list as long as they are in core (needed for site:deploy)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189525 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 05:18:36 +00:00
fc01edf237
ability to lookup mirror by repository id that it is a mirror of
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189513 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 03:37:31 +00:00
1ed5a7ab1a
add missing file for the set properties capabilities
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189512 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 03:37:15 +00:00
a58b76e2e4
Adding profiles.xml and settings.xml support for profiles, along with integration tests for each.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189510 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 03:27:43 +00:00
a27bf46440
PR: MNG-435
...
add a <artifact:setProperty property|ref="..." expression="project.*" pomRefId="..." /> tag for exposing the pom as variables
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189505 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 03:08:20 +00:00
f4c030598a
PR: MNG-440
...
add mirrors support
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189493 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 02:10:26 +00:00
818525f8d5
PR: MNG-440
...
add proxy type
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189491 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 01:56:45 +00:00
f028275f61
PR: MNG-440
...
add proxy support, both as a nested element or if not given there, as a settings.xml entry
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189490 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 01:56:01 +00:00
223d37a7ad
PR: MNG-440
...
support "servers" element from settings for obtaining authentication info
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189489 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 01:49:48 +00:00
e2e1a3830c
PR: MNG-440
...
read settings.xml for the local repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189484 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 00:59:53 +00:00
6a38bf445c
add the ability to use a POM for dependencies
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189477 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 00:18:53 +00:00
29878afcc6
o pom-level profiles are working now
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189464 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 22:36:44 +00:00
db347aab21
o Adding handler for Plexus applications.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188848 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 19:14:34 +00:00
656b6f02b0
avoid NPE if either of the ids are not specified
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188807 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 16:09:59 +00:00
7523cdb03a
PR: MNG-453
...
Submitted by: Andreas Hoheneder
Reviewed by: Brett Porter
Add support for generic artifact types, mapping the type to an extension
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188806 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 16:06:14 +00:00
8772f0f23e
PR: MNG-407
...
allow filtering of transitive dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188803 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 15:51:25 +00:00
d6d65fc75a
add quick support for exclusions
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188779 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 14:22:38 +00:00
77caea316a
clean up exclusions list
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188778 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 14:19:06 +00:00
9f09b879a4
add link to confluence docs
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188770 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 13:34:50 +00:00
12cf74a46a
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188733 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 08:39:24 +00:00
92a347519c
Don't run surefire for pom project
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188732 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 08:36:15 +00:00
b33c9d140f
Generate eclipse project only for projects with packaging != pom
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188731 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 08:35:04 +00:00
420d9a5fca
remove old cvs ignore files
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188697 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 05:24:51 +00:00
1bc6a1c44b
change message when it is skipped due to already running
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188696 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 05:18:41 +00:00
619871e7bd
remove commented out sections from last commit
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188691 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 04:46:18 +00:00
9d31796e99
PR: MNG-366
...
reverse the reference. DoxiaMojo depends on maven-core instead of maven-core depending on the reporting api + doxia
This is not a great solution, but it gets us closer. It is currently not possible, as before, to get the correct set of reports as they are all loaded into the one container and then everything found is returned.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188690 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 04:41:54 +00:00
5442089b82
no need for beanshell in the core
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188679 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 03:29:38 +00:00
3623775987
only test the expressions if the field is required
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188656 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:33:41 +00:00
e1bcc79d16
more parameter consistency. MAVEN_OPTS goes to java, $@ goes to the args.
...
This will mean implementing -D -> sys property handling in mboot and verifier to allow passing of sys props on the command line if that is needed again
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188655 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:32:11 +00:00
adf0b523c9
add default value to the output
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188651 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:22:08 +00:00
8e007306d2
use defaults
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188650 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:21:52 +00:00
89da261562
put back deprecation message
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188649 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:16:17 +00:00
a48cfef4eb
PR: MNG-423
...
move default value into configuration, rather than relying on Java. More convenient for other languages, and allows us to validate/document it. Cleaned up the plugin manager handling. More should be pushed into plexus proper.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188647 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:13:52 +00:00
4d43a4d43c
only copy directory if it exists
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188644 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:12:02 +00:00
a96a03d0a0
o Removed dependency on plexus-container-artifact, using nested DefaultPlexusContainer instances instead for plugin isolation.
...
o Moved marmalade support dependencies out of maven-core, since they can be supported on demand now
o changed the ordering of the ant and assembly plugins, to show that the classloader (plugin param) bug is fixed.
o added a method in PluginDescriptor which is similar to o.a.m.model.Plugin.getId() (I think that's the method; it's the one that results in a key of 'g:a')
o moved wagon-ssh dependency into maven-core, since there is a new issue related to nested containers and wagons which are introduced as plugin dependencies. This should be solved using a mechanism similar to plugin-manager for wagon-manager impl in future anyway
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@187639 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 00:37:01 +00:00
81aa1b6b90
update snapshots in CI
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@185101 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 00:07:49 +00:00
John Dennis Casey
Brett Leslie Porter
Jason van Zyl
Trygve Laugstol
Emmanuel Venisse