Commit Graph

97 Commits

Author SHA1 Message Date
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
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
John Dennis Casey 78bd69c44c Resolving: MNG-643
o Added includes/excludes for compile and testCompile
o added integration tests for single execution of compile and testCompile with excludes
o Added integration test for multiple execution of compile in different phases per Dan Tran's request

The bulk of this commit is KrisBravo's work (I think that's who Corridor Software Developer is??). Thanks for the help.




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239272 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 23:14:34 +00:00
John Dennis Casey 5bebfb8ad0 Adding integration itest it0054 to verify that MNG-479 is fixed.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239251 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 21:02:07 +00:00
Kenney Westerhof 02dd765d93 it0050: fixed expected results and adding it to integration-tests (again).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233263 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 21:33:02 +00:00
John Dennis Casey 9bd6219732 Adding inverse test of it0051.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233251 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 19:36:05 +00:00
John Dennis Casey 659a1f4736 Fixing some things:
o Artifact attachment via MavenProjectHelper was using string literals of the variables I was trying to use to fill in type and classifier (dumb, I know!)

o Source plugin didn't have an @phase for the JarSourceMojo...added, then added the goal configuration in the release profile in the super-pom

o Removed the source plugin bindings for the lifecycle mappings in maven-core

o Re-added [deprecated] method MavenProjectBuilder.build( File, ArtifactRepository, List )...you should use MavenProjectBuilder.build( File, ArtifactRepository, ProfileManager ) instead.

o Added profile handling/injection for the super-pom in two places: in buildStandaloneSuperPom() and in private build(..). This enables injection of the release profile which is provided in the super-pom.

o Added integration test to verify that using -DperformRelease=true results in the sources being attached...to override this behavior, another profile keyed on -DperformRelease could turn the 'attach' param for the source plugin off.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233245 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 19:23:45 +00:00
John Dennis Casey 26de9f77d0 Fixing problem with mojo configuration merges between parameter configuration keyed by alias and by name within the POM, along with configuration within the MojoDescriptor.
Also adding an IT that will indirectly test that default parameter values are not being disturbed during the merge process.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232185 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 02:25:26 +00:00
John Dennis Casey 3408c163dc o Removed it0048, and replaced it with a unit test for the DefaultProfileInjector.
o Reverted the logic of the DefaultProfileInjector to merge-and-override the model, with the profile being dominant
o Added merging for distributionManagement and modules (conditionally, based on flag) in the modelBase merge
o Refactored the override logic into a couple of methods in ModelUtils to make it easier to understand what's going on here.
o Verified that both the build and the model itself are being merged correctly during profile injection, with profile dominance, but persistence of changes to the model.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231481 13f79535-47bb-0310-9956-ffa450edef68
2005-08-11 16:46:19 +00:00
John Dennis Casey 3c53a1305d Resolving: MNG-674
o Added it0049 to prevent further regressions. ;)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231393 13f79535-47bb-0310-9956-ffa450edef68
2005-08-11 04:38:46 +00:00
Brett Leslie Porter d401ffe655 add a test case to illustrate why we have to make compile time dependencies transitive as compile, not runtime as we'd like.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231142 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 23:31:14 +00:00
John Dennis Casey b69490b828 Resolving: MNG-95
o Added --fail-fast --fail-at-end --fail-never CLI options, with appropriate summary and exclusion of dependent projects from the build when --fail-at-end is specified. Also, implemented it0046 and it1011 to test it.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227490 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 21:14:51 +00:00
John Dennis Casey 71cb5dc399 Resolving: MNG-282
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227259 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 20:43:58 +00:00
John Dennis Casey 395fe63613 Resolving: MNG-557
o Added new CLI switch {--settings,-s} for alternate user settings path.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227250 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 19:26:20 +00:00
Brett Leslie Porter 5354706f05 cleanup it0043
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226711 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 01:05:38 +00:00
Brett Leslie Porter 9a86709abd PR: MNG-249
make compile and package reactor aware



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225731 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 09:32:32 +00:00
Brett Leslie Porter 826413b74a PR: MNG-598
allow type handlers to be specified by plugin extensions



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225477 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 08:03:33 +00:00
Brett Leslie Porter e78bef0429 PR: MNG-598
implement ability to retrieve packaging handlers (lifecycle mappings) from extension plugins. Remove plugin mapping
metadata for the same
integration tests are in place for type handlers but commented out until implemented (41)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225263 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 09:04:32 +00:00
John Dennis Casey 4b1038de53 Working on: MNG-607
o Added '-f' CLI option, to allow use of non-standard pom files, or spawning of a build from outside of the project dir.
o Added preferential processing of release-pom.xml over pom.xml if it exists (assumes that the current checkout is a release of the software)
o Moved all file discovery from MavenCli to DefaultMaven, to allow embedders to have access to this logic.
o Modified MavenExecutionRequest to add a flag for reactor-activation and the name of a non-standard pom to use, if appropriate.
o Removed getFiles() and getProjectFiles() from MavenExecutionRequest, since file discovery is now done in the DefaultMaven.
o Added integration tests to check preference of release-pom.xml in standalone and '-r' mode
o Added integration tests to check usage of '-f' option within and outside of the project directory
o Added processing for cli-options.txt to maven-core-it-verifier (Verifier.java) to allow specification of '-f' and '-r' in tests


NOTE: the release plugin still doesn't correctly remove the release-pom.xml from HEAD/trunk, since I don't have access to the SCM remove command from maven-scm. I'm waiting for Emmanuel to finish some API changes before moving to the new maven-scm version, and implementing this final step.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225226 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 03:55:37 +00:00
Brett Leslie Porter 67a2c243fb reenable tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220346 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 15:37:46 +00:00
Brett Leslie Porter aa59559efb PR: MNG-507
implement repository relocation of an artifact


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220220 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:31:44 +00:00
Brett Leslie Porter b2d349adbc PR: MNG-505
add integration tests for version ranges



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219847 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 06:53:47 +00:00