Commit Graph

2643 Commits

Author SHA1 Message Date
Kenney Westerhof a98961eeed o Fix MNG-410 (and MNG-769, MNG-738). Added testcase project-3 to demonstrate this.
o Added testcase to check generation of eclipse files in
  different location; modified the testcase to support this,
  and deal with the absolute paths.

o Neatified the addSourceLinks/addResourceLinks: using
  a map to keep track of duplicate source folders has the side
  effect of only needing one of those methods; it should
  also be faster :)

o Tried to add support for includes/excludes, but eclipse only
  supports unique source directories; this is typically not the
  case in maven, filters are used to split one resourcedir
  up. Left the code in for future reference.
  TODO: find a way to merge includes/excludes. If only
  the dir where in/excludes are specified is unique, they
  could be written without problem. This requires a preprocessing
  pass.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240143 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 21:28:30 +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
Brett Leslie Porter 224af053c7 no distributions to exclude in maven2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239980 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 02:42:25 +00:00
Brett Leslie Porter ea20af3cab updates from the server
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239979 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 02:41:01 +00:00
Brett Leslie Porter 10d7c8b96f preserve permissions so that changes only need to be made on the source side. Don't want to preserve owner, group though.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239978 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 02:37:55 +00:00
Brett Leslie Porter 1c57342cb6 fix bad link
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239975 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 01:49:19 +00:00
Kenney Westerhof ca3882cde6 o Fix MNG-781 (skip null configurations).
That issue is now renamed to the more general problem.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239964 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 23:26:32 +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
Brett Leslie Porter 22748d4e0d PR: MNG-634
add a "useScope" attribute to the dependencies task so that you can determine what dependency set you want

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239682 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 15:06:54 +00:00
John Dennis Casey b935ee1b58 Fixing String.replace(..) problems in AbstractCompilerMojo.java
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239674 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 14:54:33 +00:00
Brett Leslie Porter a78c1c02d6 fix typo in href
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239670 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 14:37:11 +00:00
Brett Leslie Porter 3576f334b6 add optional logging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239663 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 13:50:09 +00:00
Brett Leslie Porter 4935502fdf PR: MNG-586
o update ant tasks to latest artifact library changes
o allow addition of extra wagons
o remove wagon-ssh and wagon-scm from depoloyed jar

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239660 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 13:34:50 +00:00
Trygve Laugstol 7f9ca76326 o Cleaning up the code style a bit:
- removing usage of this. as a prefix for referencing local variables
 - renaming public_, private_ and protected_ to showPublic, etc.
 - removing usage of final.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239601 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 11:12:26 +00:00
Vincent Siveton c29e4dbabc MNG-754: Added artifact information in the exception
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239599 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 10:56:50 +00:00
Trygve Laugstol 7c55d5cfb2 o Adding a missing part of Rod's last patch.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239596 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 10:27:28 +00:00
John Dennis Casey df6414525d Beginnings of document explaining how repository lists are constructed during inheritance and transitive dependency resolution.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239509 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 02:25:15 +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
Vincent Massol 0ef80f1227 Bump version to 3.0.1-SNAPSHOT for fixing MAVEN-1669 (support for new ejb-client type)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239416 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 14:36:52 +00:00
Vincent Massol 59cfb344a6 MAVEN-1669: Added support for the ejb-client type.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239415 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 14:36:09 +00:00
Brett Leslie Porter bc77a5ba07 PR: MNG-758
add @component tag for requirements

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239397 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 12:28:54 +00:00
Kenney Westerhof d6bd62e537 o Fixed MNG-772: applied Jesse McConnell's patch with minor style adjustments,
and did some more code cleanup.

o Tracking with projects have been referenced in order to stop adding the same
  project twice if there's a dep on more than one artifact attachment from a
  project.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239392 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 11:31:46 +00:00
Brett Leslie Porter 0bb64a478b PR: MNG-742
Submitted by: Timothy Bennett
Reviewed by: Brett Porter
allow addition of custom entries to the manifest

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239374 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 07:31:04 +00:00
Brett Leslie Porter a4d46f76c1 print summary at the end
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239350 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 05:22:30 +00:00
Brett Leslie Porter 86069508dc ignore target/logs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239349 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 05:22:10 +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 5d0298a942 Resolving: MNG-757 according to the comments in the issue.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239243 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 20:31:24 +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
John Dennis Casey 146e022327 Resolving: MNG-251
o Added transformation manager
o snapshot timestamp/buildnumber is now managed from the transformation rather than the metadata
o maven-archiver now clones the MavenProject and resolves snapshot versions for introduction into manifest and exported pom.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239219 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 19:00:51 +00:00
Trygve Laugstol b88302c209 Fixing MNG-710: "Add ability to fork the maven-compiler-plugin"
Patch created by Rod Coffin.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234499 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 14:43:26 +00:00
Stephane Nicoll 30804e163a Now allowing custom manifest file to be set in the generated EAR file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234462 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 10:08:55 +00:00
Stephane Nicoll a20c98aa76 Removed excludedDependencySet as it has been implemented another way
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234200 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 13:29:05 +00:00
Brett Leslie Porter 5d3ebf4434 avoid NPE if there are no parameters in the mojo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234155 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 07:27:29 +00:00
Brett Leslie Porter 3715ac2a6c default to group ID for package
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234150 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 05:41:30 +00:00
Brett Leslie Porter 34e167076d make sure to load extensions from all projects, not just the root in a reactor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234149 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 05:16:28 +00:00
Brett Leslie Porter d89c2f1356 ignores
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234144 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 04:12:40 +00:00
Brett Leslie Porter df64719ff7 use correct parent
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233574 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 23:11:08 +00:00
Brett Leslie Porter dbfa3f51db allow no policy (usually used in tests)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233573 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 23:10:56 +00:00
Brett Leslie Porter e888e3c1af rename an old test case that is abstract, remove unused one
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233571 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 23:05:46 +00:00
Brett Leslie Porter 932caa362a PR: MNG-729
fix artifact handler instantiation when the plugin extension is declared in a project that uses that packaging itself

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233480 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 13:15:07 +00:00
Brett Leslie Porter 4e79a1aa80 forgot why they were wrapped in an array list...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233443 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 07:11:44 +00:00
Brett Leslie Porter cc276e2e2a forgot the import
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233441 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 06:45:34 +00:00
Brett Leslie Porter 3c460805af PR: MNG-746
allow naming of TestCase as well as Test


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233437 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 06:22:20 +00:00
Brett Leslie Porter 441219f137 remove plexus definitions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233436 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 06:13:28 +00:00
Brett Leslie Porter 28813de005 PR: MNG-479
workaround for failed unzipping of site. proper fix will require WAGONSSH-5 to be fixed.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233435 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 06:04:54 +00:00
Brett Leslie Porter 1afa38d91e add todir on batchtest to save reports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233431 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 04:27:34 +00:00