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

6457 Commits

Author SHA1 Message Date
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
Britton Isbell 2de60dd07b Rolling back to use modello alpha-13. This is the same fix John did for mng-3748 for 2.1. This also fixes mng-3680. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694721 13f79535-47bb-0310-9956-ffa450edef68
 2008-09-12 16:10:29 +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
John Dennis Casey 5fc59a2bd9 bumping to artifact alpha-2-snapshot and wagon beta-4. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@692194 13f79535-47bb-0310-9956-ffa450edef68
 2008-09-04 19:09:06 +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