Commit Graph

355 Commits

Author SHA1 Message Date
Kenney Westerhof 93801e2888 Remove duplicate component declaration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@542315 13f79535-47bb-0310-9956-ffa450edef68
2007-05-28 20:27:24 +00:00
Carlos Sanchez Gonzalez c8f8fef6a6 [MNG-2985] DefaultWagonManager does not safely remove TransferListeners from the wagon
Submitted By: Abel Muiño

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@538041 13f79535-47bb-0310-9956-ffa450edef68
2007-05-15 02:14:25 +00:00
Kenney Westerhof eb8b61cc38 Add some useful debug info, like what went wrong
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532023 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 17:37:33 +00:00
Jason van Zyl f40e0bf52c o unifying anythign to do with artifact resolution into one module
o maven-artifact-test not used                                                                                                                   
o maven-artifact-manager is not consumed separate anywhere as the ant tasks are now an uber jar                                                  
o i'm fine with having a proper maven-artifact-api jar but it's leaking all over the place and the api is out of control                      


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@531291 13f79535-47bb-0310-9956-ffa450edef68
2007-04-22 22:19:23 +00:00
Jason van Zyl ff02698e3a o missed a commit when fixing stuff on the branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@531241 13f79535-47bb-0310-9956-ffa450edef68
2007-04-22 18:00:06 +00:00
Carlos Sanchez Gonzalez 2013f8967a Add some javadocs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@527391 13f79535-47bb-0310-9956-ffa450edef68
2007-04-11 05:26:50 +00:00
Brian E Fox 67c7ec50e6 MNG-2880 added classifier to install-file instructions when an artifact can't be found that needs a classifier
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@526583 13f79535-47bb-0310-9956-ffa450edef68
2007-04-08 17:40:33 +00:00
Carlos Sanchez Gonzalez d74222128d [MNG-2931] DefaultArtifactCollector changes the version of the originatingArtifact if it's in the dependencyManagement with another version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@526004 13f79535-47bb-0310-9956-ffa450edef68
2007-04-05 23:54:49 +00:00
Jason van Zyl e14eb2fc75 o dupe license
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@524443 13f79535-47bb-0310-9956-ffa450edef68
2007-03-31 16:22:33 +00:00
Jason van Zyl 05162de0d0 o bits for mng-1577
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@521543 13f79535-47bb-0310-9956-ffa450edef68
2007-03-23 00:11:31 +00:00
Jason van Zyl 17a7a726c5 MNG-2868 The behavior in MNG-1577 is now available on the trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@520923 13f79535-47bb-0310-9956-ffa450edef68
2007-03-21 16:00:17 +00:00
Jason van Zyl badcd2287f o roll back to wagon beta-2 to fix the rash of problems with m2eclipse plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@516654 13f79535-47bb-0310-9956-ffa450edef68
2007-03-10 05:38:50 +00:00
Andrew Williams a0c01c0223 A sprinkling of default
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514503 13f79535-47bb-0310-9956-ffa450edef68
2007-03-05 00:16:06 +00:00
Jason van Zyl 0bb2457086 updating license headers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513022 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 22:46:48 +00:00
Jason van Zyl fb03e03672 o optimizing imports, trying to clean up settings use so i can track them down and purge them
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512775 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 14:47:51 +00:00
John Dennis Casey f4b3eedc8a Fixing some lingering dependency ordering problems from artifact resolution, and adding settings-builder advice to the CLI.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512339 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 17:47:30 +00:00
Carlos Sanchez Gonzalez 268563a07b Add javadocs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@426599 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 16:21:35 +00:00
Carlos Sanchez Gonzalez df2b72bb6c Set svn properties
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@420152 13f79535-47bb-0310-9956-ffa450edef68
2006-07-08 15:49:37 +00:00
Carlos Sanchez Gonzalez 066f4abf3f Renamed MockArtifactHandler to follow naming conventions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@415837 13f79535-47bb-0310-9956-ffa450edef68
2006-06-20 23:08:31 +00:00
Kenney Westerhof 7ba2f9fe2e Add some more unit tests for version comparisons:
x.y.z-alphanumeric < x.y.z < x.y.z-numeric

and x.y.z-A  < x.y.z-B where A is before B in the alphabeth.

This was triggered by a user question on the dev list, and took unit
tests to answer the question - committing as 'documentation'.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@414014 13f79535-47bb-0310-9956-ffa450edef68
2006-06-14 01:05:43 +00:00
Brett Leslie Porter 806eaeb017 [MNG-1895] merge changes from branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379650 13f79535-47bb-0310-9956-ffa450edef68
2006-02-22 02:21:10 +00:00
John Dennis Casey bd540e30b7 [MNG-2083] Adding support for output of installation instructions with a generic download message if downloadUrl is missing.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379548 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 18:04:22 +00:00
John Dennis Casey b07d835b9c [MNG-2083] Correcting problem where cached projects result in missing downloadUrl for unresolvable artifacts.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379516 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 16:33:52 +00:00
John Dennis Casey 1710fdcfa3 [MNG-2083] Added new exception, MultipleArtifactsNotFoundException, to account for cases where multiple artifacts are missing during transitive resolution. This will handle formatting, including downloadUrl and install instructions, for each missing artifact.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379369 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 06:23:57 +00:00
Brett Leslie Porter 51b55e42ff merge r377583 from branch 2.0.x
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@377591 13f79535-47bb-0310-9956-ffa450edef68
2006-02-14 02:55:13 +00:00
Carlos Sanchez Gonzalez 016c8e31b5 Don't print null values in DefaultArtifact.toString
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@373073 13f79535-47bb-0310-9956-ffa450edef68
2006-01-28 02:39:17 +00:00
Carlos Sanchez Gonzalez e46a983a42 Refactor to use StringBuffer in DefaultArtifact getDependencyConflictId and toString
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@373072 13f79535-47bb-0310-9956-ffa450edef68
2006-01-28 02:37:33 +00:00
Carlos Sanchez Gonzalez b6d0cf174f Add tests for DefaultArtifact getDependencyConflictId and toString
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@373071 13f79535-47bb-0310-9956-ffa450edef68
2006-01-28 02:33:47 +00:00
Carlos Sanchez Gonzalez 24db0eb9c0 Dependencies in two paths are not added to resolution when scope needs to be updated in the nearest due to any of nearest parents
PR: MNG-1895

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@372053 13f79535-47bb-0310-9956-ffa450edef68
2006-01-24 23:26:59 +00:00
Carlos Sanchez Gonzalez 6354dad32e Refactor
PR: MNG-1895

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@372027 13f79535-47bb-0310-9956-ffa450edef68
2006-01-24 21:47:10 +00:00
Carlos Sanchez Gonzalez a472469e9d Make test case more high level to catch MNG-1895 bug
PR: MNG-1895

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@372026 13f79535-47bb-0310-9956-ffa450edef68
2006-01-24 21:46:52 +00:00
Carlos Sanchez Gonzalez 4869826ba5 Rolled back 358955, seems that the error was in other place
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@371857 13f79535-47bb-0310-9956-ffa450edef68
2006-01-24 07:45:08 +00:00
Carlos Sanchez Gonzalez 8e3a3cf63d Improve toString methods with scope info and depth
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@371856 13f79535-47bb-0310-9956-ffa450edef68
2006-01-24 07:41:04 +00:00
Carlos Sanchez Gonzalez 5569bed9b8 Added docs and unit tests for DefaultArtifactCollector.checkScopeUpdate()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@371769 13f79535-47bb-0310-9956-ffa450edef68
2006-01-24 01:51:02 +00:00
Jason van Zyl 69aadf79da o make a very simple utility for creating our artifact filter so that it can be shared by the
plugin manager and the extension manger. now used in the extension manager to block out
  deps that are already present in the maven classloading system. so that something like
  the external provider can be listed in an extension and will be dealt with: this was
  causing a loader constraint violation.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@368218 13f79535-47bb-0310-9956-ffa450edef68
2006-01-12 02:00:16 +00:00
Brett Leslie Porter af1a99198f merge from branch maven-2.0.x, up to rev 365776
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@365790 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 01:14:17 +00:00
John Dennis Casey 5b427cf076 PR: MNG-1630
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patches, with minor changes.

These patches will ensure that the optional flag is passed on and inherited correctly when dealing with managed dependencies.

I changed the patches, in that I added a new createDependencyArtifact(..) method on ArtifactFactory, which will eliminate the need to call an older variant of the method by passing in a null value for the inheritedScope parameter.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354544 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 20:50:41 +00:00
Brett Leslie Porter b392f199fb prevent NPE in equals()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@349699 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 10:36:47 +00:00
Brett Leslie Porter 1bd7f792fc fix classifier for java sources and javadoc dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@349652 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 05:14:20 +00:00
John Dennis Casey 57e7d0acdb Adding more detailed comment for optional artifact inclusion.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348584 13f79535-47bb-0310-9956-ffa450edef68
2005-11-23 22:27:41 +00:00
John Dennis Casey ffb7f270ab PR: MNG-1417
Submitted By: John Casey

Prevent the artifact collector from firing an inclusion event when the node is disabled. In this case, the node will not be included in any subsequent classpath, so firing an inclusion/selection event is incorrect.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348473 13f79535-47bb-0310-9956-ffa450edef68
2005-11-23 16:11:42 +00:00
Brett Leslie Porter ab24e2805c PR: MNG-1620
Submitted by: Bruno Aranda
add .par and .ejb3 to the classpath.
also set the language to java


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345645 13f79535-47bb-0310-9956-ffa450edef68
2005-11-19 10:15:21 +00:00
John Dennis Casey 52bd946dac Fixing CI process. Children of system scoped deps were not being excluded properly...I had marked it to exclude the system scoped dep as well.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332317 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 16:04:56 +00:00
Brett Leslie Porter 47788f3930 roll back r332220 as it broke it0063
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332234 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 06:35:25 +00:00
John Dennis Casey 9ceeebc868 PR: MNG-1363
o Disabled version-range checking for system-scoped dependencies...will use recommendedVersion where available, if a concrete version is not available.

o Disabled collection of the transitive deps of a system-scoped dep.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332220 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 04:26:14 +00:00
John Dennis Casey 1bdeecccad PR: MNG-1205
o Fixed unit test for resolving direct optional dependencies.
o Added isChildOfRootNode() method in ResolutionNode, to check whether the parent node's parent is null.
o Added check in the artifact collector to include optional artifacts if they are direct dependencies of the root node.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332213 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 03:14:08 +00:00
John Dennis Casey ed7cc01b88 PR: MNG-699
Submitted By: Piotr Bzdyl
Reviewed By: John Casey

Applied portions of the patch that pertained to the lifecycle mappings and artifact handlers for ejb3/par. The implementations of these plugins is in the sandbox (or soon will be).

Thanks for the patch, Piotr!



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332151 13f79535-47bb-0310-9956-ffa450edef68
2005-11-09 21:36:10 +00:00
John Dennis Casey 0578ed6458 Adding unit test to ensure that system-scoped artifacts are always propagated at system scope, ignoring inheritedScope from the transitive parent.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330818 13f79535-47bb-0310-9956-ffa450edef68
2005-11-04 15:00:59 +00:00
John Dennis Casey c63c860065 Fixing problem with system scope being overridden by transitive parent's scope. System scope is always preserved now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330634 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 21:09:08 +00:00
John Dennis Casey 1be64231cf PR: MNG-1251
Submitted By: Jerome Lacoste
Reviewed By: John Casey

I did not apply this patch. A better solution was to initialize the artifact data a little more thoroughly, and only delegate those methods which must track changes to the main artifact (like version info, groupId, and artifactId...essentially, the things that determine how to locate metadata on the repository). For these delegating methods, I've disabled the corresponding setter methods with UnsupportedOperationException to indicate that these attributes must be managed via the main artifact, and why. The MavenProjectHelper will now lookup the proper ArtifactHandler for the given attachment type, and pass that on to the AttachedArtifact constructor also.

Jerome, thanks very much for the effort in exploring this issue. I appreciate the help.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330392 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 00:17:26 +00:00