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

119 Commits

Author SHA1 Message Date
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
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
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
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 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
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
John Dennis Casey 6fb187fa98 [MNG-2006] Fixing url rewriting for child POMs in sibling directories of parent POM (or anything other than subdir). First guess is based on parent POM file, but if parent POM is built from repository, will use the module artifactId as a basis instead. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379572 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 20:10:52 +00:00
Brett Leslie Porter 25762021e7 [MNG-1898] fix line 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379428 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 11:33:22 +00:00
Brett Leslie Porter 89e6008e13 [MNG-1898] improve the diagnostics and switch on it0094 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379426 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 11:25:51 +00:00
Brett Leslie Porter bf4764c73a [MNG-1898] minor clean up on it0094 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379363 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 06:10:06 +00:00
Brett Leslie Porter b39b0a2cce update list 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379357 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-21 05:54:17 +00:00
Brett Leslie Porter d00407471a [MNG-1908] verify that snapshots can be downloaded even without metadata or timestamping 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@375454 13f79535-47bb-0310-9956-ffa450edef68
 2006-02-07 03:16:14 +00:00
John Dennis Casey 636d54c0a8 Adding new IT to try to test MCHECKSTYLE-10. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367788 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-10 20:42:42 +00:00
Jason van Zyl 3304e09389 reactivating it0040 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367635 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-10 15:14:56 +00:00
Jason van Zyl 5c17310148 turn off it0040 until john and i figure out what is wrong with it 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367603 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-10 13:47:47 +00:00
Jason van Zyl ac8b8442b6 just take out the tests john is working on 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367491 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-10 05:28:04 +00:00
Jason van Zyl c3c8fdb17a o [MNG-1927] Correcting an error I made with POMs not in the current working tree 
o turn on it0088
o turn off it0086, and it0087 for now



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367487 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-10 05:16:31 +00:00
John Dennis Casey 38903be78d Adding integration tests for plugin classloading. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367450 13f79535-47bb-0310-9956-ffa450edef68
 2006-01-10 01:14:38 +00:00
John Dennis Casey 223b12ba90 Adding test case for preserving system scope on transitively resolved deps. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330681 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-04 01:39:23 +00:00
Brett Leslie Porter 3ea056c928 PR: MNG-1233 
integration test for scope handling


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326365 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-19 03:55:43 +00:00
Brett Leslie Porter 37f2a94bf2 PR: MNG-1088 
if plugin is not built yet, go to the repository

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@306547 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-06 07:10:49 +00:00
Brett Leslie Porter 51489cd0fd PR: MNG-956 
allow the addition of <dependencies> inside a <plugin> element to introduce plugin specific extensions.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293557 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-04 07:15:36 +00:00
Brett Leslie Porter d8875a4f7d PR: MNG-818 
allow a certain artifact type to designate it includes its dependencies already, disabling transitivity



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293535 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-04 05:25:40 +00:00
John Dennis Casey 53ccb4ffb0 Resolving: MNG-1021 
o Added AttachedArtifact, and changed the DefaultMavenProjectHelper to create and attach artifacts of this type. AttachedArtifact uses a parent artifact (constructor parameter) for versioning and basic identity attributes, but requires the user to specify a type and classifier specific to the new artifact. We may want to add flexibility for artifactId, too...though I have reservations on that score.

o See it0079 for a test.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293497 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-04 02:54:49 +00:00
John Dennis Casey 6632dfeb0d Adding IT for MNG-1052, to test that compiler plugin configuration from the pluginManagement section is injected with the addition of the implicit plugin instance. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293456 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-03 21:50:35 +00:00
Brett Leslie Porter 3c53b31ce0 move marmalade code out of main bootstrap, into sandbox. 
it should be moved to the marmalade project (either a straight import, or doing an svndump of that area of the repo).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293363 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-03 14:50:34 +00:00
Brett Leslie Porter 8551d41eaa add it0068/it0069 to the list of tests to run 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293228 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-03 03:58:15 +00:00
Brett Leslie Porter 56d55b8f8e PR: MNG-932 
add a goal for creating a jar from the test sources


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293227 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-03 03:53:48 +00:00
John Dennis Casey 03b6c44316 Resolving: MNG-985...simply fixed merging of plugins from PluginManagement to happen on a plugin-by-plugin basis using individual merge logic from ModelUtils, rather than the wholesale merge logic for plugin lists. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292255 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-28 18:57:22 +00:00
John Dennis Casey b975bdad38 Resolving: MNG-786...cannot reproduce, but since this is an old issue, I'll close it as fixed just in case. see it0075 for proof. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292233 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-28 18:18:30 +00:00
Brett Leslie Porter 5c7b9ca408 removed marmalade support from plugin plugin 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292132 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-28 05:52:19 +00:00
John Dennis Casey 6829625d1b Added test case to prove that MNG-781 is fixed. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292047 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-27 21:16:16 +00:00
John Dennis Casey 2e5941be2b Adding it0073. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292027 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-27 20:02:57 +00:00
John Dennis Casey da33bafe84 Resolving: MNG-885 
o Extracting basedir from the project instance when PluginParameterExpressionEvaluator is init'ed if project != null...otherwise, using ${user.dir} from sysprops.

o Extracting values for resolution from POM properties before POM instance during POM interpolation, and adding checks to guard against self-reference of POM elements.

o Added three ITs (one contra) to test these resolutions.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291735 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-26 20:29:20 +00:00
Stephane Nicoll 2ee39543f8 Added rar integration test. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291397 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-25 09:18:03 +00:00
Brett Leslie Porter cbcf2d48e1 PR: MNG-788 
add filtering to the build element


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290877 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-22 02:52:39 +00:00
John Dennis Casey 1cb0b566b9 Fixing this integration test by only introducing the system-scoped dependency on Sun JDKs using java.vendor as the distinguishing point, in order to exclude OS X. 
Working toward: MNG-869



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290746 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-21 17:14:30 +00:00
John Dennis Casey 75db8085e8 Commenting out it0063 until I can get it to work. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290257 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-19 20:26:01 +00:00
Brett Leslie Porter 8eae3413e8 remove duplicate integration test (same as it0043) 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289232 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-15 13:46:44 +00:00
John Dennis Casey 37d3fd3fdd Resolving: MNG-814. Enabled import of explicit activation and deactivation of profileIds from the external profile manager to the project-level profile manager. See it0067. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280629 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-13 19:27:34 +00:00
John Dennis Casey 459737fa5f Resolving MNG-851. Using MavenProject.getFile() rather than constructing new. Also fixed maven-deploy-plugin with similar bug. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280405 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-12 20:08:01 +00:00
Brett Leslie Porter 400a15c700 add integration test for parent.getBasedir() 
could be used for other such tests in future


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280305 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-12 09:27:57 +00:00
Jason van Zyl 09cd696f4d o adding an IT that tests the execution of a mojo with setters 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279992 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-10 11:54:43 +00:00
John Dennis Casey 8201bb9d18 Adding system scope...uses scope == 'system' and systemPath in dependency. SystemPath was chosen over mappings inside the setings.xml for scalability, heritability, and injectability (via managed deps). 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264960 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-31 07:39:01 +00:00
Brett Leslie Porter 294199b388 PR: MNG-761 
fallback to deployment repository for snapshots when there is no snapshot repository


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240175 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-26 07:26:03 +00:00
John Dennis Casey 4e6c969942 Resolving (Cannot Reproduce): MNG-731 
o Added it0061 to verify deployment using legacy layout for the distribution repository.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240154 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-25 22:53:43 +00:00
John Dennis Casey 39a6096086 Resolving: MNG-732 
o new version of plexus-utils with Xpp3Dom.mergeXpp3Dom(..) modification allows appending of list elements.
o added it0060 to test new functionality.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240129 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-25 20:19:40 +00:00
John Dennis Casey da3aa1090f Resolving: MNG-666 
If a v3 POM is encountered (or any POM where modelVersion is != '4.0.0'), an InvalidModelException is thrown.
This exception extends ProjectBuildingException, to enable piggybacking on the same catch() clause.
When the MavenMetadataSource catches InvalidModelException, it returns a ResolutionGroup with the pomArtifact and empty collections for the pom dependency artifacts and the repository list with which to resolve the empty artifacts set.

Also, added it0059 to test builds where a dependency POM is a v3 pom (missing <modelVersion/>).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239981 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-25 03:08:10 +00:00