Commit Graph

237 Commits

Author SHA1 Message Date
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
John Dennis Casey 54a2023d55 Attempting again to fix the expectations...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239315 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 03:30:23 +00:00
John Dennis Casey 1311c4f7e0 Fixing expectations for new jar name.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239281 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 00:55:03 +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
John Dennis Casey cd48181144 adding integration test for single buildnumber per g:a
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239220 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 19:03:31 +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
Kenney Westerhof ef2ef62898 Added integration test to prove MNG-739 cannot be reproduced.
Btw, FIXME: should we, if just one include is given, take that
as the only include, or add it to the default include of **/*Test.java?


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232852 13f79535-47bb-0310-9956-ffa450edef68
2005-08-15 18:47:28 +00:00
Brett Leslie Porter bda3808ae5 fix the integration test after the default location changed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232798 13f79535-47bb-0310-9956-ffa450edef68
2005-08-15 11:47:18 +00:00
John Dennis Casey 88d49cb04f o Improving toString for Dependency in the 4.0.0 version codeSegment in maven.mdo
o Improving error messages for ResourceDoesNotExistException in the transformations
o Adding specificity to the dependency validation stuff, to output which dependency is offending...
o Added it1013 to show off the new dependency validation stuff.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232399 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 21:55:00 +00:00
John Dennis Casey 9c5979f46b Adding description for it1012
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232191 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 03:04:06 +00:00
John Dennis Casey cb41f94717 Resolving: MNG-652
o Adding it1012 that should express the throwing of LifecycleExecutionException for unknown packaging.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232189 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 03:02:35 +00:00
Brett Leslie Porter ddf74d6ad5 check we get a report out of surefire
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232186 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 02:45:57 +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
Brett Leslie Porter 2c9f839105 add pre build hook to remove the core it plugin so it is always updated
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231401 13f79535-47bb-0310-9956-ffa450edef68
2005-08-11 05:14:58 +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
John Dennis Casey 013d4039fb Resolving: MNG-684
o Split profile injection out into its own component away from the defaults assembler
o Moved code common to the defaults assembler and the profile injector into ModelUtils
o Removed the profile-related method from ModelIntheritanceAssembler
o added it0048 to test that profile values will override POM values.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231294 13f79535-47bb-0310-9956-ffa450edef68
2005-08-10 19:21:34 +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 1e1efffcba Resolving: MNG-592 (again)
o Modified the PluginMappingDeployMojo in maven-plugin-plugin to always deploy the plugins.xml regardless. This may be a bit heavy, but it avoids the snag with the plugins.xml being detected in the local repository after the install phase runs...plugin mappings weren't making it to the repository during deploy.

o Added a new series of IT: it2xxx which will be tests that require more than a single maven invocation, and will be run via shell script, at least for now. This one builds and deploys a plugin, then attempts to use the plugin by referencing the prefix mapping in the (non-central) remote repository.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231058 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 16:11:40 +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
Kenney Westerhof d09c2affad Tests wheter override of the 'central' and 'central-plugins' builtin
repositories work.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226656 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 16:02:31 +00:00