Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Jason van Zyl
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
Jason van Zyl
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
Benjamin Bentmann
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Jason van Zyl
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
Jason van Zyl
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
Jason van Zyl
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Jason van Zyl
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Jason van Zyl
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
Jason van Zyl
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
Jason van Zyl
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
Jason van Zyl
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
Britton Isbell
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
Jason van Zyl
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Britton Isbell
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
Jason van Zyl
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
Britton Isbell
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
John Dennis Casey
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
Britton Isbell
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
Brett Leslie Porter
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
Brett Leslie Porter
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
Olivier Lamy
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
Milos Kleint
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
John Dennis Casey
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
John Dennis Casey
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