Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,555 Commits 84 Branches 94 Tags 109 MiB
Commit Graph

4555 Commits

Author SHA1 Message Date
Jason van Zyl b06a698bb1 put maven-tools in the modules 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@392329 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-07 16:13:56 +00:00
Jason van Zyl 94e440000d o merge of the maven-embedder-refactor branch into the trunk 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@392327 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-07 15:57:09 +00:00
John Dennis Casey ea8e24b1fb Merging 391974 from branch to fix IT errors introduced when attempting to fix the case where a resolved POM expression contains a substring referencing that POM element. Two-expression cycles are still possible. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@391988 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-06 14:04:08 +00:00
John Dennis Casey 39132c3e37 Merging from 391857 on branch. Fixes infinite recursion when expressions self-reference as part of a larger value. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@391858 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-05 23:57:52 +00:00
John Dennis Casey f810fd2ef2 Merging from 2.0.x branch, revIds: 
- 391163:391165 
- 391167
- 391176
- 391202
- 391326
- 391328:391329
- 391398
- 391402
- 391404

These are the changes for the 2.0.4 RC's.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@391687 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-05 17:43:35 +00:00
Carlos Sanchez Gonzalez df10b7e556 Removed --ignore-existing to allow maven-metadata changes to be copied 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@391385 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-04 18:56:25 +00:00
Brett Leslie Porter bc048ca9cc [MNG-1908] rollback the change on trunk since it degrades performance significantly at present 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390765 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-02 00:32:42 +00:00
Jason van Zyl 7f3012c19f o don't need the clean plugin declaration anymore 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390303 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-31 02:10:02 +00:00
Jason van Zyl fb414365e4 o adding directory removal to the verifier 
o adding a prebuild-hook to it0098 to nuke the created directory

  ideally this IT should not use the archetype plugin for testing quoted system properties but this
  works and the directory removal might come in handy later.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390300 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-31 02:08:06 +00:00
Jason van Zyl 8bd35d3a43 o generated project shouldn't be checked in 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390285 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-30 23:39:00 +00:00
Brett Leslie Porter 1c14a4d6b4 add missing pom 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390278 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-30 23:20:23 +00:00
Brett Leslie Porter 1c23ee16a4 [MNG-2054] make it0096 test the problem properly by going to enough depth. Rollback the "fix" for MNG-2130 as it didn't appear to be correct - it caused it0096, and it0099 passes anyway. I suspect there were other circumstances in the codebase causing 99 to fail at the time. You should not use a cached project for inheritence - it will accumulate inherited elements as was the case with MNG-2054. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390133 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-30 13:54:30 +00:00
Brett Leslie Porter 32d8679253 [MNG-2186] correct the regression of MNG-1927 from the solution of MNG-2124 
The interpolator was only working based on an incorrect assumption for a limited set of expressions. This assumption is
guaranteed by the solution in the interim, until it can be properly reconsidered. The proper solution would be to not
cache an interpolated model, and to apply path translation and then interpolation after retrieving the cached model. However,
this will require some other related changes and should be planned for 2.1.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390098 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-30 11:48:12 +00:00
Brett Leslie Porter d04fee6bb1 ignore 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@389987 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-30 04:23:19 +00:00
Emmanuel Venisse e8acd18ed1 Re-add previous version 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@389803 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-29 14:34:19 +00:00
Emmanuel Venisse 72cd2e7260 Update released version 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@389788 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-29 13:02:57 +00:00
Brett Leslie Porter df349e8121 [MNG-2167] plugin has been renamed 
Submitted by: Thomas Klaeger


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@389650 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-29 01:17:15 +00:00
Emmanuel Venisse 43aa823661 Merge from rev.389262 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@389263 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-27 20:42:34 +00:00
John Dennis Casey cedf9e04bc (Merging 389199:389201 from branch.) 
o Cleaned up example in the comment-header of the plugin-metadata.mdo
o Added code to initialize a dummy Model instance in MavenProject, to avoid NPEs in things like getId().



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@389203 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-27 17:26:27 +00:00
Brett Leslie Porter 02fd611c54 merge r389106 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@389110 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-27 11:51:15 +00:00
Emmanuel Venisse 08c7d50184 Fix name 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@388474 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-24 09:38:25 +00:00
John Dennis Casey 43e640244e (Merged from 386445.) 
From the original revision log:
--------------------------------------

o Fixed formatting of lines in DefaultMaven to ensure that the output:

[INFO] ----------------------------------------------------------------------

doesn't exceed 80 columns, for readability.

o Fixed error reporting when building a POM's parent, in cases where:

  - relativePath refers to a directory, but there is no pom.xml in that directory...in
    this case, simply set the parentDescriptor == null, and allow repository resolution
    to proceed.

  - attempt to resolve parent POM from repository fails...in this case, we need to tell
    the user which project specified the missing parent.

Neither of these had any impact on existing tests, and should only improve the user
experience. I don't believe they introduce any ambiguous behavior.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@386447 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-16 20:06:21 +00:00
John Dennis Casey a6983a59ab (Merged from 385635.) [MNG-2146] Added code to guard against NPE when maven.home and org.apache.maven.global-plugin-registry are both missing from the sysprops. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@385637 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-13 19:51:44 +00:00
Brett Leslie Porter 0b856d893b fix parent ref 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384960 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-11 00:17:59 +00:00
John Dennis Casey bd6aa12253 (Merged from 384847.) [MNG-2136] Modifying <activeByDefault/> processing to only use profiles embedded in the POM as a basis for computing whether or not to activate. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384851 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-10 17:00:30 +00:00
Brett Leslie Porter 1e1771d550 factory out common elements in parent 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384819 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-10 15:34:04 +00:00
Brett Leslie Porter 692b2c6d5a merge r384693 from branch - fix compilation issue 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384694 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-10 03:48:38 +00:00
Brett Leslie Porter c5d3edfeb9 [MNG-1479, MNG-1177, MNG-1658] update the project descriptor descriptions 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384682 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-10 02:41:32 +00:00
John Dennis Casey e352f2cb8b (Merged from 384319.) [MNG-2052] Verify that fix for MNG-2124 also fixed the availability of profile-injected properties as sources for interpolating systemPath values in dependencies. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384321 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 20:30:14 +00:00
John Dennis Casey fc77014cfe (Merged from 384264.) [MNG-2124] Fixed interpolator to call the ReflectionValueExtractor method that prevents trimming the first expression token, since this is done in the interpolator itself. I'm still investigating whether this is going to break realignment of File instances to basedir during plugin parameter injection, but I've had to adjust it0088, since it is not handling project.build.directory as a File, but as a String. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384270 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 17:04:47 +00:00
Brett Leslie Porter e2be5ffc21 fix location of original setter 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384215 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 13:45:20 +00:00
Brett Leslie Porter d4678003e6 change TO address 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384137 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 07:08:57 +00:00
John Dennis Casey d69fe06e8d (Merged from 384104.) [MNG-2130] Re-adding the cache check for parent POMs in assembleLineage(..) when building in a multimodule scenario (if they're part of the same build, but not yet in the local repo) before checking the parent's relativePath value or hitting the repository system to look for them. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384108 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 03:29:41 +00:00
John Dennis Casey 55dc9e4ccb (Merged from 384102.) Fixing site URL calculation to disregard child module path adjustment. Second attempt. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384107 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 03:28:38 +00:00
John Dennis Casey 063474e205 rolling back accidental commit. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384106 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 03:26:16 +00:00
John Dennis Casey fcb42e22ba (Merged from 384102.) Fixing site URL calculation to disregard child module path adjustment. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384105 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-08 03:09:44 +00:00
Brett Leslie Porter 4cbcd0edd5 remove tests that require junit - no junit in pom 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@383146 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-04 15:52:48 +00:00
John Dennis Casey a693217497 (Merged from 383024.) Added unit test for case where parent path is empty and child adjustment contains .. at beginning. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@383027 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-04 04:28:03 +00:00
Stephane Nicoll c8795b658b Added myself in the developers list 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382904 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-03 18:20:26 +00:00
Kenney Westerhof 7a7c44a409 Added a second structure, testing the other 
way around <module>../../something</module>


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382902 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-03 17:48:26 +00:00
Kenney Westerhof f3a9e38340 PR: MNG-2006 
Replaced appendPath with a more robust implementation,
after discussing it with jdcasey.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382881 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-03 16:22:44 +00:00
John Dennis Casey 4c85dfc331 Adding defensive code for one more place where cleanedPath length could cause a problem with string manipulation in appendPath(..). 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382861 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-03 15:27:25 +00:00
John Dennis Casey 138d77d3b0 Fixing NPE in appendPath(..) when calculating '..' path adjustments. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382849 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-03 15:08:31 +00:00
Kenney Westerhof aaaf6537f6 PR: MNG-1318 
use ~dp0 instead of ~dps0 since that is broken
on Windows 2000 and XP (prior to SP2).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382801 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-03 13:13:06 +00:00
Kenney Westerhof 16f876c2f3 PR: MNG-1317 
Use ~dp0 since ~dps0 is broken, and add double
quotes since the path now can contain spaces.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382797 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-03 13:09:17 +00:00
John Dennis Casey d201131b59 (merged from 382460.) [MNG-1415] Added quoted-argument reconstruction to MavenCLI, and quote preservation to the shell scripts. Both are necessary to fix this issue. Test is it0098. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382461 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-02 18:18:06 +00:00
Emmanuel Venisse 9d515afa31 Add doap file for projects.apache.org 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@381634 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-28 11:14:08 +00:00
John Dennis Casey 448feecb45 Updating the version of wagon-ssh. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@381475 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-27 22:53:58 +00:00
John Dennis Casey d0fd1579a9 [MNG-2068] Adding integration test. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@380862 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-24 23:30:50 +00:00
John Dennis Casey 5bdc77bd16 [MNG-2054] Adding integration test. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@380858 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-24 23:16:20 +00:00