Commit Graph

6524 Commits

Author SHA1 Message Date
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 7f70506c55 o prepare the compat module for dynamic component generation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700761 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 13:13:51 +00:00
Jason van Zyl 94ed8048ea o update to the beta-1 of the plexus container, and start instrumenting the projects for the generating of component metadata
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700760 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 13:08:41 +00:00
Jason van Zyl dd8ed6637f o start making additions for the CLI metadata generator tool so that we can start getting rid of the hand-bombed component descriptors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700759 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 13:08:04 +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 534b660b4e Removed extension scanner. It was tied up into the old model lineage code, which is very buggy. Needs to be reimplemented.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700226 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 19:51:10 +00:00
Britton Isbell 90c71d6b73 Remove checked in patch.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699874 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 18:20:33 +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
Britton Isbell a14e0aa39f Removed build history to speed up performance. Should add this back in for debug mode.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699865 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 17:08:23 +00:00
Jason van Zyl d4f897bded o put the maven-compat module into the distribution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699851 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 16:21:08 +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 36e944fbed git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699839 13f79535-47bb-0310-9956-ffa450edef68 2008-09-28 15:33:50 +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 2ce56f8aa4 Fix: XML property values should not have CDATA sections.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@697914 13f79535-47bb-0310-9956-ffa450edef68
2008-09-22 17:34:19 +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
Jason van Zyl 6282ce0b0e o rolling back change, not sure how subclipse commits to two separate repositories in one commit..
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696679 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 15:49:48 +00:00
Jason van Zyl 82beb43aa7 o remove the embedder integration test module`:wq
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696642 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 11:56:38 +00:00
Jason van Zyl 02a0cb7d5a o match shane's changes to remove the workspace
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696637 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 11:39:16 +00:00
Jason van Zyl 5d8d607f85 o this integration test is already in the core ITs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696617 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 09:59:35 +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