Commit Graph

263 Commits

Author SHA1 Message Date
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
Brett Leslie Porter 5a5a5c50ec set correct version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291624 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 13:48:55 +00:00
Brett Leslie Porter 77f8246cf8 set native eol-style
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291478 13f79535-47bb-0310-9956-ffa450edef68
2005-09-25 22:07:53 +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 3265010815 remove files first
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291356 13f79535-47bb-0310-9956-ffa450edef68
2005-09-25 01:46:33 +00:00
John Dennis Casey 24a108a674 Resolving: MNG-767, MNG-768
o We should have a viable offline mode now. Plugin sensitivity updates to follow.

o See it0069 and it1014 for offline mode tests.

o Brett, building maven-plugins in offline mode with org/apache/maven/plugin/* removed will now give a nice error message. :)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291124 13f79535-47bb-0310-9956-ffa450edef68
2005-09-23 14:23:08 +00:00
Emmanuel Venisse 74903851c4 Fix junit version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290988 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 17:16:05 +00:00
Emmanuel Venisse b3bf5a5e42 Fix junit version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290977 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 16:41:46 +00:00
Emmanuel Venisse 23611891ee Add the correct junit version (surefire need junit version >=3.8)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290973 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 16:04:49 +00:00
Brett Leslie Porter cebbdaf1ce PR: MNG-870
MAke plugin discovery reactor aware



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290887 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 04:34:41 +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 554dd0b525 Resolving: MNG-842
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290572 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 21:47:10 +00:00
John Dennis Casey a67d232228 Resolving: MNG-930
o Fixed profile properties cloning in ModelUtils
o Added properties to the test profile in it2002
o Moved the checkout dir for it2002 to be under target, to make it easier to clean.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290552 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 20:05:08 +00:00
John Dennis Casey 83d67e6f81 Resolving: MNG-929
o Fixed DefaultMaven to use the release-pom.xml for MavenProjects loaded via <modules/> if the parent project is loaded from release-pom.xml

o Adjusted tests to have dependencyManagement.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290539 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 19:28:54 +00:00
Brett Leslie Porter 5111375f3a make usable on cygwin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290348 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 04:10:38 +00:00
John Dennis Casey 9d37ffdbbd Removing build directory override.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290340 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 03:12:41 +00:00
John Dennis Casey ec8d262f16 Resolving: MNG-878, MNG-921
o Verified that plugins are added to the list in the model when invoked from the command line (878)
o Reformatted ModelUtils after the profiles-cloning addition
o Added cache-flush for the plugin map in MavenProject
o Moved dependencies for subproject/subproject2 into the parent-project POM, inside a profile
o Added activation property for this new profile into the test.sh script
o Added explicit activation inside of release:perform's m2 invocation for all profile-ids active in the release-plugin's execution.
o Added code to remove the dynamic parts of the POM from the release-pom.xml...it's not meant to be a dynamic version of a POM.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290336 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 02:59:44 +00:00
John Dennis Casey 74de0709de Resolving: MNG-920, and setting the version of maven-release-plugin to a rev of -beta-1 instead of -SNAPSHOT, to allow locally installed versions to work without tweaking the version locally.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290276 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 21:24:40 +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
John Dennis Casey 23af50ef4a Resolving: MNG-878, MNG-880 (again)
o Added full resolution of plugins listed in the project hierarchy
o Added better resolution of snapshots within the reactor, and resolution of ${finalName}
o Added usage of fully inherited model for release-pom.xml, to enable convergence of all POM inheritance to a single POM with no parent.
o Improved handling of SCM info in a reactored situation.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290221 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 17:58:46 +00:00
Brett Leslie Porter e24853642c update for consistency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290029 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 00:27:58 +00:00
Brett Leslie Porter ec9133cc10 updated apis
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289635 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 19:09:21 +00:00
Brett Leslie Porter d4db7b3304 fix old api reference
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289634 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 19:03:06 +00:00
Brett Leslie Porter 29cd88daaa fix plugin repository definitions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289623 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 18:00:26 +00:00
John Dennis Casey 66dddfc944 Resolving: MNG-881. This had to do with resource-list merging when the performRelease profile was activated. See MNG-895 for full resolution (this is a stop-gap solution for now).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289599 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 16:27:33 +00:00
John Dennis Casey dca4ae4518 Resolving: MNG-886
o Added complex test case for the release plugin, called it2002.
o Added copying of reportArtifacts and extensionArtifacts sets when one MavenProject is constructed with another.
o Added some logging statements to PrepareReleaseMojo, which I will remove later when I'm done with this rash of bugfixes.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289294 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 19:21:28 +00:00
John Dennis Casey c9de4b6e9a Trying to adjust to work with OSX.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289290 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 19:11:16 +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
Brett Leslie Porter 17110b5248 linking up the IDs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289183 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 09:13:28 +00:00
John Dennis Casey 30ee4ffdcd Cleaning up faulty logic in MavenMetadataSource related to the last commit, and updating the it2001 test to (hopefully) straighten out the repository definitions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280761 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 04:13:38 +00:00
John Dennis Casey 2f2db94232 Re-resolving: MNG-757
o Added it0068 to guard against regressions of the type causing MNG-836

o Added it2001, which must be run manually, to verify the test case laid out in MNG-757

o Reinstated the repository accumulation for successive traversal down the transitivity chain, so that transitively resolved artifacts can be found in repositories declared by POMs up the chain.

o Added a check for 'file:' at the beginning of the Settings.getLocalRepository() result, before prepending 'file://' to allow for relative definition of the local repository in test cases



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280755 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 03:40:17 +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 50c04ac590 clean up repository item too
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280341 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 13:45:31 +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
Brett Leslie Porter e2336ea5a4 test setter is used instead of field population
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280077 13f79535-47bb-0310-9956-ffa450edef68
2005-09-11 05:05:28 +00:00
Jason van Zyl 2ef0039f13 o adding pluginRepositories element to match the other ITs which use the
core-it plugin.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279995 13f79535-47bb-0310-9956-ffa450edef68
2005-09-10 12:03:21 +00:00
Jason van Zyl 44fcb165b4 o adding note about it0064
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279994 13f79535-47bb-0310-9956-ffa450edef68
2005-09-10 11:56:33 +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
Brett Leslie Porter 9c060b192a PR: MNG-613
Completion of the version selection from a range.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279720 13f79535-47bb-0310-9956-ffa450edef68
2005-09-09 06:49:59 +00:00
Brett Leslie Porter a5515efe67 file not created any more
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278894 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 00:27:29 +00:00
Kenney Westerhof 3b56df09be Fixed MNG-805. It's a bit of a workaround but fits nicely with the
workaround style already in place.

Modified it0012 to be useful (it always succeeded!) and added a child
project to demonstrate this commit fixes MNG-805.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278741 13f79535-47bb-0310-9956-ffa450edef68
2005-09-05 14:12:07 +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
John Dennis Casey f437fb5dc2 Resolving: MNG-773
o Separated profile injection logic from the inheritance assembly. While they look similar superficially, the
  merge-out vs. merge-in semantics make it pretty complex to put this logic together in the same methods. It's
  easier to understand what's going on if they remain similar but separate code...

o Added it0058 to test that application of a profile from settings.xml doesn't transport module lists from POM
  to POM inside of a reactor build.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239918 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 20:31:29 +00:00
John Dennis Casey 252b151052 Resolving: MNG-766.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239464 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 22:11:07 +00:00