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
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
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
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
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
b07c8d2e36
reverting that commit, meant for my branch
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@688584 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 23:38:39 +00:00
2a94051f54
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@688581 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 23:24:41 +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
0a9a933726
[MNG-3585] correct the example value for nonProxyHosts
...
Merged from: r683835 on 2.0.10-RC
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@683839 13f79535-47bb-0310-9956-ffa450edef68
2008-08-08 04:13:19 +00:00
b3b20d857d
Check that maven-parent 9 works with all projects
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@683423 13f79535-47bb-0310-9956-ffa450edef68
2008-08-06 21:53:33 +00:00
273a06c6aa
added target-eclipse to svn:ignore
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@682943 13f79535-47bb-0310-9956-ffa450edef68
2008-08-05 20:52:20 +00:00
4b1b242d78
o updating to maven-artifact 3.0-alpha-1
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@682594 13f79535-47bb-0310-9956-ffa450edef68
2008-08-05 06:15:39 +00:00
b663f0c26c
o merged from r682323
...
Issue id: o merge
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@682324 13f79535-47bb-0310-9956-ffa450edef68
2008-08-04 11:15:23 +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
8e4b27571d
fixed model descriptor for xsd generation (merged from 2.0.x branch r682055)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@682072 13f79535-47bb-0310-9956-ffa450edef68
2008-08-02 22:23:59 +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
Britton Isbell
John Dennis Casey
Jason van Zyl
Brett Leslie Porter
Arnaud Heritier
Herve Boutemy
Vincent Siveton