c418d12814
o primarily refactoring in part for the preparation making room for mercury and processing events from maven-shared-model
...
o add plexus component descriptor generation to the bootstrap so we can start removing the hand-written descriptors and start
using annotations everywhere
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720432 13f79535-47bb-0310-9956-ffa450edef68
2008-11-25 07:11:35 +00:00
cca34331f3
Reduced duplicate code between PomTransformer and PomClassicTransformer. The PomTrasnformer is now a concrete base class. The PomClassicTransformer extends it, overriding how interpolation is done, to handle interpolation of values related to project directories.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720292 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 21:08:35 +00:00
0b4c2c9222
PomClassicTransformer now inheriting from PomTransformer. Removed some of the duplicate methods.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720281 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 20:35:39 +00:00
f312012e8a
PomClassicTransformer now using a factory to create domain model.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720277 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 20:25:40 +00:00
39d13c66a6
[MNG-3845] Unintended inheritance of parent elements overriden by children
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719930 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 22:10:36 +00:00
83440b7c01
[MNG-3843] Main/test resources are not properly inherited
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719921 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 21:18:23 +00:00
1c2df46402
Removed reference to listener.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719726 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 21:55:47 +00:00
7368eb1216
Moved out specialized methods from PomClassicTransformer to ProjectBuilder. Did this refactoring to make it easier to merge PomTransformer and PomClassicTransfomer.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719724 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 21:50:31 +00:00
c26b2d69cd
Merge of sisbell-maven-3.0-mercury branch to trunk. Includes maven-project-builder component, which breaks out some of the independent project builder classes, so that Mercury does not need to pull in the entire trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719472 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 04:49:46 +00:00
95929cf502
Some of the hard-coded URIs for profiles were outdated. This would cause improper matching of profile elements. Fixed this to use ProjectUri, which is always in sync.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719411 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 22:34:51 +00:00
6a1f04705c
Moved PathTranslator back to project module to fix class reference issue with the enforcer plugin. Added a preprocess method on the ModelTransformer to allow processing of plugin config elements. Need to add information about which elements are collections so they are not lost during a sort.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719406 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 22:19:34 +00:00
1f5a668726
Simplified nested if-rules for model container action.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719293 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 17:17:23 +00:00
d12af86b03
[MNG-3863] Maven erroneously assumes "org.apache.maven.plugins" for dependencies without groupId
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719253 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 15:25:01 +00:00
e046650597
If DependencyManagement section gave a dependency a scope of provided, then it would not join with a dependency with a scope of compile, causing Nexus build to fail. Fixed this rule for scopes of provided and compile to be treated as same type for purpose of joining.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719151 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 01:31:24 +00:00
9982d6b8c7
A number of URIs were missing the #collection element. Fixed this.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719142 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 00:31:14 +00:00
f88b524249
o using thread local lookup setting the realm to null once it's done its work with the plugin
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718656 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 17:17:26 +00:00
d9a4b136c4
Rule: Don't inherit parent relativePath
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718479 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 03:45:09 +00:00
00a0f513b1
Fix: interpolator - mavenVersion and maven.version are implicitly set.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718472 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 03:04:29 +00:00
ed4083c93f
Problem in merging artifact containers, where one container specified a default type value (jar) and the other did not. They were treated as different types. Fixed this.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718375 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 20:59:05 +00:00
629c12ae80
Configured build extension listener to only fire on poms within the build.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718176 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 06:23:46 +00:00
eec6ed1e2c
o adding new logic to process build extensions
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718165 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 03:23:35 +00:00
56986ca004
o use the class lookup method which will now automatically partition lookups based on the class
...
submitted by: Dain Sundstrom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@717964 13f79535-47bb-0310-9956-ffa450edef68
2008-11-16 02:38:13 +00:00
0d28d1719a
[MNG-3846] Inherited URLs are not automatically extended with the child's artifactId
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@717941 13f79535-47bb-0310-9956-ffa450edef68
2008-11-15 22:35:14 +00:00
7de89c1ee9
Checked in support for plugin extension listener. Not using a configurable plexus component yet. The listener is added directly to the transform.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@714122 13f79535-47bb-0310-9956-ffa450edef68
2008-11-14 20:10:52 +00:00
1a9ef5d0e0
Added in Project Event Listeners. Still need to hook up a plexus component and a model container factory for configuring listeners.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@714109 13f79535-47bb-0310-9956-ffa450edef68
2008-11-14 19:18:09 +00:00
2881df1046
Reversing fix for MNG-3827. This causes regression in MNG-3679.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713525 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 21:51:15 +00:00
c46e4fd97c
Fix for mng-3259.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713483 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 20:01:20 +00:00
bf5d38a186
Fix for IT 3827. On joins between model containers during the applying of plugin management, transform rule was reversing the plugin config element order. Now do a reverse sort prior to join, so elements end up in correct order.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713429 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 17:31:07 +00:00
07fb543422
[MNG-3831] Expressions without project/pom prefix are no longer interpolated with model values
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713052 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 14:44:19 +00:00
cd04c1d85a
o Set svn:eol-style=native
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713049 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 14:35:30 +00:00
1249c89962
Fix for it0141
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@712680 13f79535-47bb-0310-9956-ffa450edef68
2008-11-10 15:44:37 +00:00
6468b08bda
Fix for IT 3821.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@712621 13f79535-47bb-0310-9956-ffa450edef68
2008-11-10 07:23:45 +00:00
9929e8101d
Add collection notation to reportSets.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@712619 13f79535-47bb-0310-9956-ffa450edef68
2008-11-10 07:05:45 +00:00
4256e417b9
If DistributionManagement site url contains a property, build was failing. This is a quick fix and will still not return the correct URL. The problem is that interpolation occurs after inheritance and resolving URLs based on a parent is an inheritance issue.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@711888 13f79535-47bb-0310-9956-ffa450edef68
2008-11-06 16:12:17 +00:00
3d85fa7874
Fix for IT 2695. Two plugins with different executions that had same id were merging. Created a different container for execution ids, so that they can be queried per plugin, rather than globally.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@711743 13f79535-47bb-0310-9956-ffa450edef68
2008-11-05 23:42:32 +00:00
824e2eefe7
Fix for IT 3134.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@711707 13f79535-47bb-0310-9956-ffa450edef68
2008-11-05 21:46:12 +00:00
e96229a165
Reverting back changes. It's building locally but breaking on Hudson.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@706231 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 11:06:03 +00:00
d733885e54
Hooked up maven-project-builder into build. Updated classes.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@706143 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 07:57:44 +00:00
360954e6bc
Fix: IT0141
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@705183 13f79535-47bb-0310-9956-ffa450edef68
2008-10-16 09:16:15 +00:00
bedc1d7a2b
Fix: IT0469 - Rule: join configs of build/plugins/plugin and reporting/plugins/plugin.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@705167 13f79535-47bb-0310-9956-ffa450edef68
2008-10-16 08:06:38 +00:00
655cda05dc
Fix for IT100. During interpolation, something with 'parent.' needs to be aliased: 'project.parent.' I'm not sure that this is good behavior, given that someone may use 'parent. in their own context.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@704423 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 09:56:13 +00:00
779680fe7f
o silence more of the logging
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700873 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 19:10:12 +00:00
50828967ee
o silence more of the logging
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700869 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 19:03:46 +00:00
db4675e4bf
o get rid of warning and make it debug
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700862 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 18:40:50 +00:00
53f0a723c1
Remove println of pom on validation error.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700857 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 18:21:59 +00:00
a20f8ffee8
Fix: MNG-3392
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700837 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 16:55:35 +00:00
2efd58f1cd
Missed these classes when I merged out changes related to repository helper.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700820 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 16:10:39 +00:00
d7ae13be90
Put back in repository helper due to problems of building with clean repo.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700813 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 15:33:08 +00:00
e8bf60f962
o start a little caching component that does nothing special now but we need to build it out after the multiple instance problem is corrected, and we decide on the interactions between the metadata layer, project building, the reactor, and workspaces in IDEs.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700758 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 13:07:26 +00:00
5fb228063a
Much better performance by making the cache static, probably due to multiple instances of ProjectBuilder.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700337 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 05:12:33 +00:00
d25a161f33
Remove repository helper.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700336 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 04:58:51 +00:00
c38db3ada7
Small perf tweak.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700331 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 04:13:08 +00:00
9220e682ec
Remove model cloning.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700325 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 01:58:20 +00:00
3af42c2f05
Removed unneeded class/methods related to extension scanner.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700300 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 23:02:15 +00:00
c208511348
Caching of models. This model is not the one returned in the MavenProject so no danger of other components modifying it.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699873 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 18:20:13 +00:00
f9cb1579bb
o changing the caching slightly to share with shane
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699847 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 16:03:20 +00:00
48224c4073
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699842 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 15:41:27 +00:00
cf62d1c301
o removal of as many deprecated methods from the project builder as possible. so far i've discovered two obsolete methods used by plugins directly
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699838 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 15:31:59 +00:00
b6c2132bc7
o merging from my branch to trunk
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699806 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 12:16:53 +00:00
53cfcc896d
Removed use of workspace from project builder. In the build of trunk, there were about 50K of calls from MavenMetadataSource to the project builder. I put a simple hashmap cache in the metadata source to reduce calls to dozens.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699773 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 04:52:53 +00:00
1260ced4f5
o collapsing all the profile code into maven-project, now it's all in one place
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699659 13f79535-47bb-0310-9956-ffa450edef68
2008-09-27 14:52:28 +00:00
8de236d8ea
${build..., not being properly interpolated. Aliased this as ${project.build....
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699016 13f79535-47bb-0310-9956-ffa450edef68
2008-09-25 16:42:08 +00:00
6612657092
Incorrectly specified collection in ProjectUri. Fixed this.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@698007 13f79535-47bb-0310-9956-ffa450edef68
2008-09-22 21:40:06 +00:00
83c2ba498d
Fixed problem with inheriting versions of artifacts.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@697979 13f79535-47bb-0310-9956-ffa450edef68
2008-09-22 20:36:35 +00:00
e000c61519
Removed unneeded system.out.println messages from unit tests.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696739 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 17:42:40 +00:00
3caaba53ed
Fix: If the child pom found a parent pom within a local build, where the child pom project/parent/groupId[artifactId] did not match the groupId[artifactId] of the parent pom, then it would exclude the parent pom from inheritance. Now it will attempt to locate the parent pom in the local repo. If the parent pom is not found in local repo, build will fail.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696713 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 17:02:55 +00:00
12b7abf394
Improved error message when pom parent ids do not match.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696698 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 16:37:59 +00:00
1d10a62086
Improved error message when pom parent ids do not match.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696696 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 16:32:51 +00:00
3929bd0e45
Reverted back previous checkin, which broke something in the assembly plugin.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696326 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 14:42:57 +00:00
06abbabcd2
Some fixes for adding properties from active profiles to the interpolation list.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696299 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 13:52:46 +00:00
6b19072489
Fix: Added a few cases to match dependency type on inheritance.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695922 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 14:41:11 +00:00
f12437531f
Fix: If a child dependency matches a parent dependency artifactId and groupId AND both parent and child dependency versions are null AND their types are not equal, then it should not join the dependency.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695717 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 03:18:57 +00:00
9e7c8be43c
Fix: Interpolation of standalone super poms.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695615 13f79535-47bb-0310-9956-ffa450edef68
2008-09-15 20:45:04 +00:00
bc3660ec47
Detangled profile activitation dependency on realm manager. Move org.apache.maven.realm package to maven-core project.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695332 13f79535-47bb-0310-9956-ffa450edef68
2008-09-15 02:54:31 +00:00
180bf37d84
Fix: mng2562 - timestamp
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695241 13f79535-47bb-0310-9956-ffa450edef68
2008-09-14 15:36:56 +00:00
6221dfb9e6
Fix: mng3746 - Implemented proper ordering of system, user and model properties used in interpolation. this required creating a tag value, which could be used for comparing and ordering of InterpolatorProperty.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695196 13f79535-47bb-0310-9956-ffa450edef68
2008-09-14 11:34:27 +00:00
5d266e85ba
Fix: MNG2339b - If \$\{version} is not specified as a system or environment variable, then it is aliased as \$\{project.version} so that it will be interpolated.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695114 13f79535-47bb-0310-9956-ffa450edef68
2008-09-14 05:11:21 +00:00
38b9c5c25b
Fix: MNG3747 - Added three phases to interpolation: (1) interpolate properties not using build/directory(s); (2) set absolute paths; (3) interpolate using build/directories.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695110 13f79535-47bb-0310-9956-ffa450edef68
2008-09-14 04:25:49 +00:00
c993fd98d0
Fix: IT0098 - CLI properties now correctly constructed and passed to interpolator.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695022 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 20:20:25 +00:00
c5f52578f5
Some ITs were failing because of the new interpolation code. Certains code paths were failing because they did not add CDATA sections to the pom. Added CDATA support directly to ModelProperty so path doesn't matter.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694999 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 18:21:29 +00:00
9fff4c0612
Moved PathTranslator to maven-core. maven-project no longer uses it.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694912 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 10:07:23 +00:00
7dc42ed958
Replaced interpolator code.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694907 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 09:28:23 +00:00
35cb991844
Fix: IT0074. When I removed Maven20xCompatAspect.aj, I removed code that fixed mng-3012. Added the code directly back into DefaultMavenRealmManager.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694742 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 17:04:32 +00:00
d295ab3a18
Previously removed MavenProject.writeModel, but found a plugin using this method. Added it back in.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694669 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 10:01:06 +00:00
f2e9e6810a
Cleanup of code. Removed last of dynamic/concrete code.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694598 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 03:45:45 +00:00
f0b84be1ac
Removed more clone methods.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694596 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 03:12:06 +00:00
0cf4ca3be5
Removed a number of uneeded clone methods. Moved others out of ModelUtils and made them private.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694573 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 01:14:52 +00:00
727e4e7cb1
Computer a bit laggy, caught svn ci command into component.xml. Removed this.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694365 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 17:14:18 +00:00
45f10e7526
Refactored out restorer class and related MavenProjectBuilder methods.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694360 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 17:11:34 +00:00
465ac54709
Dumped most of project restorer code.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694172 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 08:27:13 +00:00
50a1d13a08
Removed a unit test related to aspect eventing. Added back in direct setting of compile/script directories.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694118 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 04:55:50 +00:00
cacc78b1d0
Removed dynamic injection of pom build during project construction. Deleted aspects.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694109 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 04:16:40 +00:00
38cc075d65
Removed default injection of model.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694022 13f79535-47bb-0310-9956-ffa450edef68
2008-09-10 22:00:19 +00:00
832b7e5853
Setting of report artifacts and plugin artifacts through mutator methods previously ignored. Fixed this.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@693722 13f79535-47bb-0310-9956-ffa450edef68
2008-09-10 07:48:16 +00:00
65b674f15c
Fix: MavenProject.pluginArtifacts now returns empty set, rather than null. This was causing maven-project-info-reports-plugin to fail.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@693707 13f79535-47bb-0310-9956-ffa450edef68
2008-09-10 05:27:39 +00:00
9d4416df7f
Fix: MavenProject.reportArtifacts was always returning null.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@693687 13f79535-47bb-0310-9956-ffa450edef68
2008-09-10 02:34:59 +00:00
6b96692a93
Merge of sisbell-maven-2.1-profile branch. Removes use of project lineage from builder.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@693332 13f79535-47bb-0310-9956-ffa450edef68
2008-09-09 01:04:17 +00:00
673070446e
Merged back previous commit containing junk tests.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@689634 13f79535-47bb-0310-9956-ffa450edef68
2008-08-27 21:47:27 +00:00
4b5ab88824
Disable test
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@689612 13f79535-47bb-0310-9956-ffa450edef68
2008-08-27 20:50:23 +00:00
4cb42c34a7
Merged back changes from sisbell-maven-2.1-profile
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@685575 13f79535-47bb-0310-9956-ffa450edef68
2008-08-13 14:47:51 +00:00
fc56a49aa9
Missed some classes on merge of branch. Checking in.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@685556 13f79535-47bb-0310-9956-ffa450edef68
2008-08-13 14:06:14 +00:00
398b62158e
Merge of branch: sisbell-maven-2.1-profile.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@685443 13f79535-47bb-0310-9956-ffa450edef68
2008-08-13 05:09:00 +00:00
c82352832a
o updating to 3.0-SNAPSHOT
...
o aparently when we start from scratch the bootstrap wasn't working, so the maven ant tasks will now igore trying to download the projects we
are actually trying to build.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@684975 13f79535-47bb-0310-9956-ffa450edef68
2008-08-11 23:05:20 +00:00
9a1ee9ed53
Plugin configuration was including duplicate values. Now using sets.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@682238 13f79535-47bb-0310-9956-ffa450edef68
2008-08-04 01:24:31 +00:00
4eb9671e71
[MNG-3682] set project to null after recovering from ProjectBuildingException to prevent infinite loop after one level of relocation.
...
Submitted by: Tomasz Wysocki
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679844 13f79535-47bb-0310-9956-ffa450edef68
2008-07-25 15:57:31 +00:00
c8b842c976
Merge of SI_MAVEN_2_1 branch. New builder code.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679609 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 23:06:59 +00:00
d52ffdef81
reapplying John's merge of all 2.0.10-RC changes to date by reverting r679244, sans artifact upgrade and user agent parts. Passes all integration tests locally, seeing if Hudson and Continuum agree
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679263 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 01:56:21 +00:00
24176a08a1
Rolling back merge attempt until I have time to fix failing unit tests (most likely tomorrow will do it).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679244 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 00:18:09 +00:00
3c9be4bceb
Merging changes in from 2.0.10-RC2 release candidate on 2.0.10-RC branch. Still have two failing unit tests in maven-core; I'll take care of those in a few minutes.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679229 13f79535-47bb-0310-9956-ffa450edef68
2008-07-23 23:26:00 +00:00
16ba522c66
Switch to using plexus-interpolation directly to avoid hidden imports.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675618 13f79535-47bb-0310-9956-ffa450edef68
2008-07-10 15:52:53 +00:00
3a52d33141
[MNG-3380] Process relocations before attempting to resolve child nodes during artifact collection.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675352 13f79535-47bb-0310-9956-ffa450edef68
2008-07-09 21:44:10 +00:00
cf01846d8d
[MNG-3654] Make sure all plugins are carried over into cloned build instances.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674893 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 17:37:45 +00:00
e227f55c1d
[MARTIFACT-25] cache failed POM downloads in the local repository, obeying the <releases> policy for checking for updates on them
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674333 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 18:43:17 +00:00
e32fd7b10e
merge from branch rev 672402 672407
...
- fix junits on windauze
- add missing license headers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674182 13f79535-47bb-0310-9956-ffa450edef68
2008-07-05 11:45:56 +00:00
b6d1a5d1ac
current model's remote repositories need to be calculated before the parent/origin is stored in lineage.
...
fixes this scenario (as found in svn:https://www.dev.java.net/svn/grizzly/trunk )
project defines remote custom repository and also has build extension that is only available at that remote repository. it defines RELEASE as the version of the extension artifact.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673664 13f79535-47bb-0310-9956-ffa450edef68
2008-07-03 12:08:42 +00:00
3d6b63bc11
[MNG-3642] Adding internal-only unique id 'mergeId' to build resources, to allow back-propagation of changed resource information from plugin executions to the dynamic version of the POM build section. Also, modified the project-builder's dynamism methods (calculate*, restore*) to use mergeId.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673417 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 15:25:22 +00:00
5c32bc6b28
All tests pass on my localhost...committing to see how it works on hudson.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672782 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 14:35:43 +00:00
cd2602d9e6
Adding -V|--show-version, and cleaning up interpolation to correspond with recent refactoriing in 2.0.x branch. Also, changing super-POM to use basedir/build.directory expressions in build paths, to enable paths to respond to changes in other, more basic paths (like outputDirectory responding to a change in build.directory). This is in preparation for merging over the dynamicBuild behavior.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@671936 13f79535-47bb-0310-9956-ffa450edef68
2008-06-26 16:34:27 +00:00
cec28aabe8
ordering is not important, and can vary
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670347 13f79535-47bb-0310-9956-ffa450edef68
2008-06-22 12:38:03 +00:00
825448f10e
[MARTIFACT-6] The deployer should detect previous deployments of the same version and die
...
This corrects the test case and implementation, utilising the previous changes made to ensure mirrors
and other repository metadata are not consulted for metadata
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669227 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 17:06:57 +00:00
e26974da98
[MNG-2739] Adding validation logic to DefaultMavenTools and ProjectUtils, to make sure repositories have id and url before constructing an ArtifactRepository instance...this code is used ahead of normal model validation, so it needs to be included here. Also, introducing a new exception to handle the errors when these elements are missing.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@659680 13f79535-47bb-0310-9956-ffa450edef68
2008-05-23 21:52:24 +00:00
e458d85616
Disable the pluginRepository deprecation message until the first release of 2.1 is imminent, to avoid confusion when using IDEs that use 2.1 snapshots (where the CLI still uses 2.0.x).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@659236 13f79535-47bb-0310-9956-ffa450edef68
2008-05-22 20:15:52 +00:00
07a035b146
Profiles should be activated if any of the activators return true.
...
Issue id: MNG-3106
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@656827 13f79535-47bb-0310-9956-ffa450edef68
2008-05-15 20:42:27 +00:00
e4602cb85a
Fix for profile deactivation.
...
Submitted By: David Bernhard
Issue id: MNG-3545
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@656405 13f79535-47bb-0310-9956-ffa450edef68
2008-05-14 20:22:22 +00:00
1c50dc0d0d
clean up the poms and move versions to dependencyManagement
...
Issue id: c
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@653481 13f79535-47bb-0310-9956-ffa450edef68
2008-05-05 13:46:40 +00:00
706890fd2b
Remove component that no longer exists
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@652730 13f79535-47bb-0310-9956-ffa450edef68
2008-05-02 02:02:39 +00:00
6d897f9312
Cleaning up artifact ordering for extensions and plugins in teh realm manager by switching to List for artifact collections, instead of allowing unordered Collection instances.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@651081 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 21:50:49 +00:00
007fe63a03
added site descriptors to provide modules/parent links (merged from 2.0.x branch r649903)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649913 13f79535-47bb-0310-9956-ffa450edef68
2008-04-20 11:37:31 +00:00
36092a009d
Adding ProjectBuilderConfiguration method for buildProjectWithDependencies, then switch the embedder.readProject* to use the ProjectBuilderConfiguration-enabled methods.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649629 13f79535-47bb-0310-9956-ffa450edef68
2008-04-18 18:00:27 +00:00
ec3ec0567e
Fixing interpolation for project.basedir and pom.basedir, by internalizing the basedir handling into the interpolator (now that we're passing in projectDir, it's easier to handle there).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@647287 13f79535-47bb-0310-9956-ffa450edef68
2008-04-11 19:53:04 +00:00
32a9c73445
Fixing MNG-2277 integration test.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@646517 13f79535-47bb-0310-9956-ffa450edef68
2008-04-09 20:21:39 +00:00
21d8a411f6
Fixing MNG-2861.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@646142 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 23:49:47 +00:00
0734c3e60e
quiet down some of the project-caching debug output for now...it's getting in the way of debugging other things.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@645971 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 15:25:13 +00:00
c32aa5a656
Fixing unit test problems from it0103 fix, and fixing it0042...just 4 more failing ITs before this is back on its feet.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@645015 13f79535-47bb-0310-9956-ffa450edef68
2008-04-05 02:19:29 +00:00
64b93201c3
Fixing it0103, which in this case had to do with when to use the relativePath to lookup the parent model from the project workspace.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644767 13f79535-47bb-0310-9956-ffa450edef68
2008-04-04 16:51:53 +00:00
82787b4ece
[MNG-3498] Fixing StringIndexOutOfBoundsException.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644378 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 15:48:36 +00:00
1d9d014cde
Fixing MNG-3355 and MNG-2339.
...
This commit introduces three changes: user-level properties that are separated from the execution properties, where execution properties contain envars, sysprops, and user-level properties...user-level properties are useful for POM interpolation for 2339 and 3355.
Second, a ProjectBuilderConfiguration interface and default implementation, to stem the proliferation of method parameters to projectBuilder methods. This was a natural place to introduce it, as user-level properties had to be passed in separately from the execution properties, for interpolation.
Finally, interpolation has been switched to use the new plexus-interpolation project, which is based on the classes in plexus-utils.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644354 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 15:18:18 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
Britton Isbell
Benjamin Bentmann
John Dennis Casey
Brett Leslie Porter
Olivier Lamy
Milos Kleint
Paul Gier
Brian E Fox
Carlos Sanchez Gonzalez
Herve Boutemy