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

711 Commits

Author SHA1 Message Date
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