Commit Graph

352 Commits

Author SHA1 Message Date
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
Brett Leslie Porter 10a8e05df6 clean up project exception handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@314994 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 18:49:01 +00:00
John Dennis Casey 28e2b08266 Removing restrictions on adding pluginArtifacts to the test classpath in surefire, since they should go behind the classpath elements from the project...also adding system scope handling to the artifact facotry, so transitive dependencies on system-scoped deps are handled correctly.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@312958 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 21:20:13 +00:00
Brett Leslie Porter f8cbb08498 PR: MNG-616
improve version logging, use artifact.toString for textual logging

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307309 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 16:30:28 +00:00
Brett Leslie Porter 510de4fe54 upgrade plexus utils to 1.0.4-SNAPSHOT.
The group ID has changed, so add a bunch of exclusions to ensure the old is not picked up
fix bugs in mboot that wasn't honoring excludes.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307294 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 14:13:31 +00:00
Brett Leslie Porter b8e50a1369 remove unused constructors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307086 13f79535-47bb-0310-9956-ffa450edef68
2005-10-07 11:21:37 +00:00
Brett Leslie Porter 245d512c4a PR: MNG-1110
differentiate between an artifact that is not found, and failure to obtain an artifact

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307034 13f79535-47bb-0310-9956-ffa450edef68
2005-10-07 06:44:59 +00:00
Brett Leslie Porter 1d42338bb7 PR: MNG-1109
better handling for timeout and other transfer failed exceptions that are recoverable (ie metadata), and then blacklist the repository for performance.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@306560 13f79535-47bb-0310-9956-ffa450edef68
2005-10-06 09:40:13 +00:00
Brett Leslie Porter 192de6841a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293588 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:13:52 +00:00
Brett Leslie Porter b4e4a1f375 [maven-release-plugin] prepare release maven-2.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293584 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:02:48 +00:00
Brett Leslie Porter ba94b208d7 PR: MNG-922
allow the disablement of timestamping snapshots, reusing the same file in the remote repo


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293570 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 08:43:36 +00:00
Brett Leslie Porter d8875a4f7d PR: MNG-818
allow a certain artifact type to designate it includes its dependencies already, disabling transitivity



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293535 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 05:25:40 +00:00
Brett Leslie Porter 71625bbd82 PR: MNG-1048
make sure the scope in the current POM wins over all

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293514 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 04:02:46 +00:00
Brett Leslie Porter 0eb43da1bb PR: MNG-644
remove use of deprecated artifact method (retain signature for backwards compat until next release of install/deploy plugins)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293493 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 02:26:25 +00:00
Brett Leslie Porter 7aa60e32d4 PR: MNG-644
remove unused method

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293348 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:37:12 +00:00
Brett Leslie Porter f328ad0f63 PR: MNG-644
remove unused method

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293347 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:36:30 +00:00
Brett Leslie Porter 21350c840b PR: MNG-644
remove deprecated settings and profile settings

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293326 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 12:49:40 +00:00
Brett Leslie Porter 56d55b8f8e PR: MNG-932
add a goal for creating a jar from the test sources


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293227 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 03:53:48 +00:00
Brett Leslie Porter 4ff4c02fd5 PR: MNG-1041
conflict id should include classifier


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293226 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 03:52:30 +00:00
Brett Leslie Porter c5acaded88 upgrade to plexus 1.0-alpha-7 container, switching to new group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293193 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 00:54:01 +00:00
Brett Leslie Porter 9382b9c8d9 PR: MNG-1060, 1061
corrections to the model used for the release plugin

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293076 13f79535-47bb-0310-9956-ffa450edef68
2005-10-02 06:12:03 +00:00