Commit Graph

2764 Commits

Author SHA1 Message Date
Brett Leslie Porter e0457b0204 PR: MNG-613
reorganise in preparation for generalised repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264091 13f79535-47bb-0310-9956-ffa450edef68
2005-08-29 06:37:33 +00:00
Brett Leslie Porter 7a8c848b01 PR: MNG-788
bring back the "filtering" attribute in resources from m1


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@263841 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 07:18:35 +00:00
Vincent Siveton 9ef6cc7f50 Cleaning up the code a bit: replace static array of all reports file name generated by Maven by a list (more dynamic); the first token in the locales variable is the default locale (set in the VM); create createDuplicateExceptionMsg() to handle the exception msg when some files are duplicated; move code to generate reports in a new method called generateReportsPages(); improve logging.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240444 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 18:16:19 +00:00
John Dennis Casey 4ccb9068fb Resolving: MNG-717
o Dependencies don't have a default scope value, to allow DependencyManagement to set the scope if null...then, the metadata source sets the scope to 'compile' when it constructs the artifacts from deps that still have a null scope. Oh, and it will at that point back-propagate the 'compile' scope to these dependency instances, for later reference...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240428 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 15:44:48 +00:00
Brett Leslie Porter 4b01d88bc3 trim metadata file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240415 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 13:00:33 +00:00
Brett Leslie Porter 14f4c980c1 use the correct repository for finding the original snapshot data
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240414 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 12:48:12 +00:00
Brett Leslie Porter 0481c45fc9 repair snapshot build numbering (previous code makes it get stuck at 1).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240405 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 11:42:30 +00:00
Brett Leslie Porter 7572427594 remove unused field
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240396 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 05:47:24 +00:00
Brett Leslie Porter ffb317c27d PR: MNG-790
trace was too verbose for a warning

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240374 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 02:04:14 +00:00
Vincent Siveton cafb004caf Added a test in the banner macro to remove Velocity error (RHS of #set statement is null. Context will not be modified....)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240337 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 20:40:17 +00:00
Brett Leslie Porter c8ad95e05d PR: MNG-490
Submitted by: Rahul Thakur
Reviewed by:  Brett Porter
Creating an archetype with a different folder structure for java and test sources still results in default (src/main/java) folder being generated.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240227 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 12:54:29 +00:00
Brett Leslie Porter cddc9df70e PR: MNG-753
add a missing need for the super repository

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240218 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 12:23:20 +00:00
Brett Leslie Porter 1c1cede3b5 ignores
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240211 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 11:49:24 +00:00
Brett Leslie Porter d466205274 PR: MNG-753
correct ordering of repositories in POM (also fixed problem of not correctly overriding "central" - properly this time!)
took note of a simpler way to ensure this is correct in future

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240204 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 11:24:11 +00:00
Brett Leslie Porter c945c27bff PR: MNG-693
added tests for reporting inheritence to mirror plugin inheritence, cleanup and utilise executions element

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240197 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 09:29:05 +00:00
Brett Leslie Porter b380d0e2d4 make the ordering predictable by sorting the key set.
Switched the key to be the simpler eclipse source root link name.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240187 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 08:05:47 +00:00
Brett Leslie Porter 22365aeefe fix tests:
- ordering of link elements was wrong
- windows path separator was wrong


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240180 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 07:46:12 +00:00
Brett Leslie Porter fcd86eff85 update inline with surefire plugin - *TestCase are included, Abstract*TestCase are not
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240178 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 07:31:18 +00:00
Brett Leslie Porter 1b81c99d57 PR: MNG-789
interpolate ${basedir} in the model


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240177 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 07:30:21 +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
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