Commit Graph

2039 Commits

Author SHA1 Message Date
John Dennis Casey 1fc7419f03 o Added <properties/> for profiles configured in the pom.xml
o Split ModelNormalizationUtils into two utility classes in the maven-profile and maven-settings projects, to be used for converting Profile instances from the settings.xml and profiles.xml into maven-model instances.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190344 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 04:21:27 +00:00
John Dennis Casey d2e1f3c975 o Adding support for <executions/>, which means multiple runs of the same goal/set-of-goals with different configs.
o Adding @phase declarations for those mojos that seem to be part of the main build, just for completeness
o Added two ITs, to test that <executions/> doesn't mess up the normal operation, and to test multi-execution for a goal.

Should resolve: MNG-172.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190335 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 02:47:57 +00:00
Brett Leslie Porter 0d8c115acf update FAQ
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190221 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 05:31:31 +00:00
Brett Leslie Porter 73d9813ee6 update default values
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190220 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 05:21:38 +00:00
Brett Leslie Porter cc0099bccd fix broken link
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190219 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 05:19:22 +00:00
Brett Leslie Porter 8918d09b75 remove MAVEN_OPTS - no need for such a high setting, and make it consistent with the shell script
also, the form of MAVEN_OPTS did not work when it was already set due to extra quoting


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190218 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 05:16:59 +00:00
Brett Leslie Porter 1c0f134fa5 add building doc
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190215 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 04:51:48 +00:00
Brett Leslie Porter d2b6e095ab add location of svn repo, and instructions for building Maven 2.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190212 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 04:47:32 +00:00
Brett Leslie Porter f51bb22433 correct doc, import
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190072 13f79535-47bb-0310-9956-ffa450edef68
2005-06-11 04:59:15 +00:00
Emmanuel Venisse 7dab9ff71a Add plexus-utils dep for override version found in transitive dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190042 13f79535-47bb-0310-9956-ffa450edef68
2005-06-11 00:02:11 +00:00
Brett Leslie Porter 6bb22f701c switch to '.' so that the expression can look like ${pom.*} when refid is pom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190024 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 22:01:03 +00:00
Brett Leslie Porter a91802d46d PR: MNG-463
safety guard against bootstrapping with a Maven Home that is not empty, and not a previous Maven installation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189892 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 04:10:29 +00:00
Brett Leslie Porter a86c54a3dd fix scm since it is not located under parent directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189885 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 03:06:36 +00:00
Brett Leslie Porter 43ff603963 temporary so it will build with alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189883 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 02:45:34 +00:00
Brett Leslie Porter 3fff37a88d update parent reference for access to CI settings
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189882 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 02:44:03 +00:00
Brett Leslie Porter 45d95aa6fb update parent references to get access to the ci settings
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189881 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 02:42:40 +00:00
Brett Leslie Porter a787f8dd0e add ci management
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189878 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 02:33:05 +00:00
Brett Leslie Porter fc0ec82e84 allow no repo in settings.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189875 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 01:56:51 +00:00
Brett Leslie Porter cb291e9fa2 PR: MNG-460
Submitted by: Nicola Ken Barozzi
Reviewed by:  Brett Porter
(applied with modifications)

Replace setProperty by a chained property helper, set up automatically when the POM is first declared.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189873 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 01:43:21 +00:00
Brett Leslie Porter 2a8ed2f339 PR: MNG-154
Define the lifecycle according to packaging.
Some more work on the structure of this is required.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189871 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 00:57:19 +00:00
Brett Leslie Porter ed42ac9ad6 ignore target
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189868 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 00:47:32 +00:00
Brett Leslie Porter 9da4eec756 fix the bootstrap for windows sans cygwin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189859 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 23:36:49 +00:00
Brett Leslie Porter 379863a946 PR: MNG-451
Submitted by: Kenney Westerhof
Reviewed by:  Brett Porter

make configurator configurable!


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189856 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 23:22:34 +00:00
John Dennis Casey e84dc8c753 Fixing reporting problem due to inlining the old per-artifact reports into the repository report. Turned a couple of ERROR's to WARNING's.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189788 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 18:47:37 +00:00
John Dennis Casey 8095007690 Fixing nested iterator confusion that was leading to NoSuchElementException
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189787 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 18:41:31 +00:00
John Dennis Casey d1e7f4d5ad Solving MRM-4. If the source pom doesn't exist, it'll check for the existence of the target pom before writing the skeleton.
It'll always try to verify/patch the MD5/SHA1 for the target pom.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189785 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 18:19:21 +00:00
John Dennis Casey 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
Brett Leslie Porter 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
Brett Leslie Porter 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
Brett Leslie Porter 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
Brett Leslie Porter 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
Jason van Zyl 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
John Dennis Casey 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
Brett Leslie Porter 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
Brett Leslie Porter 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
Brett Leslie Porter 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
Brett Leslie Porter 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
Brett Leslie Porter 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
Brett Leslie Porter 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
John Dennis Casey 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
Brett Leslie Porter 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
Brett Leslie Porter 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
Brett Leslie Porter 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
Brett Leslie Porter 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
Brett Leslie Porter 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
Brett Leslie Porter 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