Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,915 Commits 84 Branches 94 Tags 109 MiB
Commit Graph

164 Commits

Author SHA1 Message Date
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
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 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 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
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
John Dennis Casey 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
Brett Leslie Porter 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
Brett Leslie Porter 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
Brett Leslie Porter 63ee875b13 improved descriptions 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180238 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-06 06:18:45 +00:00
Brett Leslie Porter 57642d207a forgot CDATA 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179699 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-03 02:24:03 +00:00
Brett Leslie Porter 1a962903da add a link to the better description 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179692 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-03 01:18:35 +00:00
Brett Leslie Porter 83b6e17c2d cut release 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179552 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-02 07:53:09 +00:00
Brett Leslie Porter 347d361a77 generate both so it can be used in maven 1.0 as well 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179541 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-02 07:17:52 +00:00
Brett Leslie Porter 1af2ee3f6d reduce what is in <build> in a profile according to John's previous change 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179496 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-02 03:29:34 +00:00
Brett Leslie Porter 112fccd46e o refactor common elements to a base class 
o fix some typos in versions related to profiles


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179493 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-02 03:01:16 +00:00
John Dennis Casey 9d7e54c042 o Added model and builder support for Profiles specified in settings.xml, profiles.xml, and the POM. 
o Changed MBoot and Verifier accordingly.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179233 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-31 16:24:34 +00:00
Emmanuel Venisse 4e6b33d359 o upgrade plexus-container to alpha-4-SNAPSHOT 
o upgrade plexus-utils to alpha-3 until xpp stuff is fix in 1.0.0

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179122 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-30 18:24:32 +00:00
John Dennis Casey fda1ed95c9 o changed the inheritanceApplied flag to be set by default, and unset if the plugin is merged to the child without <inherit/> being specified...this makes it work with isolated POMs. 
o changed the semantics of when the unsetInheritanceApplied() method is called...it's now only when <inherit/> is NOT set.
o changed the default inheritByDefault attribute on MojoDescriptor to be true
o added inheritByDefault to PluginDescriptor (even though we don't have tools supporting it yet), with semantics identical to MojoDescriptor
o added generator/builder support for the inheritByDefault attribute of PluginDescriptor
o added calculation of inheritanceApplied || inheritByDefault to lifecycle executor before allowing plugins/mojos to bind.
o Everything builds, but we need some sort of IT to test the finer points.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178836 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-27 23:05:09 +00:00
John Dennis Casey 6ca4de295d Added inheritance of Plugins according to the rules we decided upon. This consists of: 
- inheritanceApplied flag on Plugin and Goal (NOT fields, just a code-only flag)
- flushGoalMap/flushPluginMap to clear caching of these calculated attributes
- ModelUtils.mergePluginLists() and ModelUtils.mergePluginDefinitions() for use in both
    * DefaultModelInheritanceAssembler (Plugin/PluginManagement lists)
    * DefaultModelDefaultsInjector (PluginManagement -> Plugin merges)

- Also added a few unit tests for basic Plugin inheritance stuff. This could be more thoroughly tested...

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178825 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-27 21:47:12 +00:00
John Dennis Casey 239439bb04 o Added inherited field to the Plugin and Goal classes in maven.mdo 
o Added annotation inheritedByDefault (looks like: @inheritedByDefault true|false) for java mojos
o Added support for inheritedByDefault to MojoDescriptor, descriptor generator and builder
o Factored the plugin combinatorial logic into ModelUtils in o.a.m.project, for later reuse in a plugin-aware model inheritance builder
o Refactored the DefaultModelDefaultsInjector to use the new ModelUtils for plugin merging (this is factored into a utility for reuse in inheritance assembly)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178733 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-27 03:27:55 +00:00
Brett Leslie Porter fd49b1e857 remove default excludes, the directory scanner has it built in 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178571 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-26 03:08:27 +00:00
Emmanuel Venisse 551ab886d7 Add tag to scm part 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178317 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-24 23:24:30 +00:00
Brett Leslie Porter aae12fa37a add additional contributor fields and default goal 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170711 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-18 05:33:59 +00:00
Brett Leslie Porter 89b475c171 update to match m1 code 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170308 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-16 05:09:11 +00:00
Brett Leslie Porter 7ed8a746d3 update to released versions 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169961 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-13 07:01:57 +00:00
Brett Leslie Porter 9f05a45c66 improve intro page 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169782 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-12 06:52:00 +00:00
Brett Leslie Porter b4bbf3071d extend not present in 4.0.0 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169602 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-11 08:17:06 +00:00
Brett Leslie Porter 8fc3e7a305 PR: MNG-338 
Helpful error message for non-redistributable JARs, eg jdbc

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169577 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-11 04:29:44 +00:00
Brett Leslie Porter acfba80edc consolidate defaults injection 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168152 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-04 17:34:52 +00:00
Brett Leslie Porter 9ba38545ea update to latest modello plugin versions 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168134 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-04 14:41:33 +00:00
Brett Leslie Porter 24c6328ad3 declare the desired "prefix" inside the plugin descriptor instead of pulling apart the artifact ID (though that is how the default is created). 
Currently, the reverse is not handled in anyway, so a non-default prefix may not work, but this makes the code easier to isolate.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168099 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-04 08:17:39 +00:00
Brett Leslie Porter b5670bdcaa start to clean up the plugin vs. goal name handling so the hardcoding can be reduced, and eventually removed 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168040 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-04 01:20:49 +00:00
Brett Leslie Porter 23835350c8 fixes related to changing the path of parent poms, though the actual functionality is not implemented 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164346 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-23 06:24:08 +00:00
Brett Leslie Porter 6055b99a56 documentation enhancements, and added transitive dependencies document 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163955 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-15 11:08:16 +00:00
Brett Leslie Porter 08eaf5c94f PR: MNG-222 
Submitted by:	Dennis Lundberg
Reviewed by:	Brett Porter
correction of typos, spelling and grammar


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163889 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-09 02:07:15 +00:00
Brett Leslie Porter e62f087f24 some POM enhancements 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163862 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-08 07:50:53 +00:00
John Dennis Casey 20620b4e09 o Changed the repository to test.maven.codehaus.org for testing of the new repository and layout. 
o Added <layout/> element to <repository/> elements in the maven.mdo
o Added pluginRepository configuration to the super-POM.
o Tested it all.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163791 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-06 01:28:29 +00:00
Brett Leslie Porter a91be5bc51 use new name 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163789 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-05 16:30:55 +00:00
Brett Leslie Porter 935cda15da clean up dependencies. 
Still need to clean up ~/maven2/lib and some large dependencies from marmalade that
shouldn't be needed in general - but down to about a 3Mb repository.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163775 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-05 04:11:03 +00:00
Brett Leslie Porter eabafcc093 implement snapshot policies: default is to only check once a day (after crossing midnight), or if --update-snapshots (-U) is specified on the command line 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163711 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-30 03:30:08 +00:00
Brett Leslie Porter 14bb2c805a change the maven group ID 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163670 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-23 06:52:55 +00:00
Brett Leslie Porter b84d4bc35e revert <includes> and <excludes> in MDO to old format 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163666 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-22 14:26:28 +00:00
Brett Leslie Porter e0e405fe68 clean up plugin configuration handling 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163652 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-22 10:46:55 +00:00
Brett Leslie Porter b63fd801d2 patch MDO for CI until proper removal is in place 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163650 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-22 09:58:19 +00:00
Trygve Laugstol e54ce35409 o Changing the default notifier type from 'email' to 'mail'. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163640 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-21 14:38:59 +00:00
Brett Leslie Porter a97c024f3b ability to build standalone 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163605 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-18 01:13:31 +00:00
John Dennis Casey 84c5379bd8 o Added back <aspectSourceDirectory/> and <integrationUnitTestSourceDirectory/> 
o Added CDATA notation to some code segments that were causing trouble.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163601 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-17 22:53:12 +00:00
Brett Leslie Porter 1c8e6e19a0 put back modules, removed in previous commit 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163531 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-11 02:23:13 +00:00
Brett Leslie Porter 7b9c465866 fix typos 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163530 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-11 02:15:41 +00:00
John Dennis Casey 2cf60ca093 o updated model documentation 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163529 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-11 01:52:18 +00:00