Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,503 Commits 84 Branches 96 Tags 107 MiB
Commit Graph

372 Commits

Author SHA1 Message Date
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
Brett Leslie Porter 9ae0914694 flip trunk to 2.1-SNAPSHOT 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356316 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-12 18:22:06 +00:00
John Dennis Casey 8a5fa61b17 [maven-release-plugin] prepare for next development iteration 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356099 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-12 01:41:09 +00:00
John Dennis Casey 9cf94e34f2 [maven-release-plugin] prepare release maven-2.0.1 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356093 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-12 01:34:03 +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
John Dennis Casey 350076bdb9 Changing the location of the Artifact-cloning method from org.apache.maven.artifact.factory.ArtifactFactory.cloneArtifact(..) to org.apache.maven.artifact.ArtifactUtils.copyArtifact(..), which is now a static method. This separates the copy method from a specific artifact implementation, while at the same time avoiding embedding of this method in a component instance. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330342 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-02 20:10:40 +00:00
Brett Leslie Porter 259a63ba90 PR: MNG-1286 
Submitted by: Lester Ecarma
Check exclusions against relocated artifacts

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330201 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-02 07:07:13 +00:00
Brett Leslie Porter cbc583333c PR: MNG-1372 
Submitted by: Allan Ramirez
update command to mvn

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330200 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-02 06:49:09 +00:00
John Dennis Casey 777d747d1a PR: MNG-1335 
Added ArtifactFactory.cloneArtifact(..) +implementation, and made MavenProject(MavenProject) use that to create a copy of the project's artifact.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330080 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-01 15:55:45 +00:00
Brett Leslie Porter deed9e4cbe PR: MNG-1287 
Submitted by: Edwin Punzalan
Bring back dependency path tree in "Failed to resolve artifact." error


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330029 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-01 11:26:36 +00:00
Kenney Westerhof 61d5fc6cf4 Fixed ordering of g🅰️t:v in 'Unable to download artifact' message 
and similar messages (was g🅰️v:t, and the rest of m2 uses g🅰️t:v).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@329256 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-28 17:25:18 +00:00
Brett Leslie Porter 31f17512f5 PR: MNG-1233 
corrected handling of scope based exclusions

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326363 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-19 03:53:10 +00:00
Brett Leslie Porter fe72f031d7 merge from tag maven-2.0, r326226 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326232 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-18 20:47:35 +00:00
Jason van Zyl b874063d65 o applying patch provided by Garret Conaty in issue 
MNG-1207
  
  ---
  
  ResolutionNode.getDependencyTrail calls artifact.selectVersion(artifact.getSelectedVersion()) 
  even w/o checking artifact.isSelectedVersionKnown().
  
  ---
  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326225 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-18 20:39:53 +00:00
Brett Leslie Porter 41b3e9c256 version comparison fixes 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326201 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-18 18:39:34 +00:00
Brett Leslie Porter b4c041a567 [maven-release-plugin] prepare for next development iteration 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321042 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-14 07:26:39 +00:00
Brett Leslie Porter d783c5fc41 [maven-release-plugin] prepare release maven-2.0 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321040 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-14 07:15:39 +00:00
Brett Leslie Porter ed22c950e8 add new methods to type handler: 
- isAddedToClassPath (default false)
- language (default "none")

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320986 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-14 03:32:41 +00:00
Brett Leslie Porter 1c7c34f027 more error diagnostics improvements 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320869 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-13 18:49:19 +00:00
Brett Leslie Porter 04e02209b1 PR: MNG-122 
use real exceptions for repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320683 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-13 08:04:27 +00:00
Brett Leslie Porter 7129bb1b9e PR: MNG-122 
remove transitive artifact resolution exception

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320678 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-13 06:57:16 +00:00
Brett Leslie Porter 5de6418c69 PR: MNG-122 
exception clean up phase 1

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320668 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-13 05:30:22 +00:00