415 Commits

Author SHA1 Message Date
Brett Leslie Porter
418f58e393 fix typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220253 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 07:05:14 +00:00
Brett Leslie Porter
70f2351610 PR: MNG-461
warn, but don't fail, when a POM is not in the repository

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220250 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 06:32:06 +00:00
Brett Leslie Porter
b82151f013 PR: MNG-479
Submitted by: Rahul Thakur
Reviewed by:  Brett Porter
if you define a repository it should override anything in the parent with the same ID
Also, cleaned up logic in assembler based on intentions

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220240 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 05:24:19 +00:00
Brett Leslie Porter
a4343cf767 PR: MNG-625
allow a plugin to specify the minimum Maven version (will apply for both building and its execution - this should be separated later).

If you are running an older version then it will not prompt to update when found, and will fail if it is encountered with a hardcoded version.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220239 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 05:07:47 +00:00
Brett Leslie Porter
a7bae20ee8 add a little more space
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220225 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 01:02:15 +00:00
Brett Leslie Porter
bc2211c160 actually output the warning message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220221 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:37:22 +00:00
Brett Leslie Porter
aa59559efb PR: MNG-507
implement repository relocation of an artifact


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220220 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:31:44 +00:00
Brett Leslie Porter
6aa208414f PR: MNG-229
- always use super POM's repository for parent resolution
- use correct repository set for plugin dependency resolution

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220102 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 15:15:54 +00:00
Brett Leslie Porter
511af3d3e2 PR: MNG-596
add XSD definition to m2 poms and archetypes



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220079 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 13:58:42 +00:00
Brett Leslie Porter
edbc07c3fb copy constructor needs to copy artifact reference
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220068 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 13:40:20 +00:00
John Dennis Casey
99bdd48d92 Bumping plexus-utils version to 1.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219984 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 02:17:16 +00:00
Brett Leslie Porter
cbf519695c PR: MNG-558
use modello alpha-4: corrected parsing


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219950 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 17:11:13 +00:00
Brett Leslie Porter
6e87ae8941 must copy the repository list as it may be modified
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219861 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 08:44:39 +00:00
Brett Leslie Porter
685bfbcb12 apply some inspections
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219826 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 01:24:35 +00:00
Brett Leslie Porter
ee31f9650f apply some inspections
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219824 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 01:03:25 +00:00
Brett Leslie Porter
27cdfc3cd1 PR: MNG-505
use comparable versions in ranges

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219630 13f79535-47bb-0310-9956-ffa450edef68
2005-07-19 08:23:01 +00:00
Brett Leslie Porter
810d4a3276 PR: MNG-505
artifact refactoring to facilitate version ranges



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219616 13f79535-47bb-0310-9956-ffa450edef68
2005-07-19 05:04:39 +00:00
Brett Leslie Porter
4c45989dcb PR: MNG-404
add ability to have a minimum Maven version for a project build

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219473 13f79535-47bb-0310-9956-ffa450edef68
2005-07-18 11:57:29 +00:00
John Dennis Casey
7bc8cf9fb1 Modified to check for duplicate repository entries in the aggregated remote repository list as the lineage of projects is built.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219278 13f79535-47bb-0310-9956-ffa450edef68
2005-07-16 02:05:03 +00:00
John Dennis Casey
c7d5e83520 Resolving: MNG-397
o Added ResolutionGroup class which contains a set of artifacts and a list of repositories to resolve them.
o Made the ResolutionNode a standalone class, and added the remote repositories to it
o Changed ArtifactMetadataSource.retrieve(..) to return ResolutionGroup rather than Set, in order to help keep track of the repositories which should be used to resolve the retrieved artifacts.

We need some tests for this...


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219276 13f79535-47bb-0310-9956-ffa450edef68
2005-07-16 01:24:13 +00:00
John Dennis Casey
21e050e5fa Attempting to fix problem with resolution of parent-poms for plugins, but continuing the use of the plugin repository when assembling the plugin-pom's lineage.
NOTE: I have not bootstrapped with this fix in place (I'm in the middle of something else right now), so BEWARE!



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219252 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 22:13:10 +00:00
John Dennis Casey
2c80da6ba4 Resolving: MNG-482
To use the new artifact map for either the project or the current plugin from your mojo, simply use one of the following expressions:

  ${plugin.artifactMap}
  ${project.artifactMap}

The artifacts in these maps are keyed using org.apache.maven.artifact.ArtifactUtils.versionlessKey( String groupId, String artifactId ) (found in the maven-artifact project).



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219234 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 19:04:20 +00:00
John Dennis Casey
beff5623f2 Resolved: MNG-502
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@216279 13f79535-47bb-0310-9956-ffa450edef68
2005-07-13 22:34:40 +00:00
John Dennis Casey
cb257db78e Resolving:
MNG-511
MNG-513

Working on:

MNG-449

o Added code to stop the version manager from prompting the user for unregistered plugins; it will simply register them with the resolved version.

o Added failover fourth plugin-version resolution option, which is a plugin-specific artifact metadata called LATEST.version.txt, and will be published with each install/deployment

o Added MavenProject.get/setArtifact(..) to handle a single artifact instance for a project (allows injection of artifact metadata without having to handle it all within the install/deploy mojos).

o Changed plugin-version resolution to only use MavenMetadataSource rather than resolving the whole plugin artifact.

o Changed the install and deploy mojos to only use ${project.artifact} rather than constructing their own, so they can take advantage of metadata added elsewhere in the build.

o Factored the "RELEASE".equals(..) check in the DefaultRepositoryLayout to use new metadata method storedInArtifactDirectory() instead, since RELEASE and LATEST both share this characteristic.


NOTE: I'm not going to resolve MNG-449 yet, because I'm not sure what else Brett had in mind related to the plugin-development-without-release use case...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@215919 13f79535-47bb-0310-9956-ffa450edef68
2005-07-12 04:13:40 +00:00
John Dennis Casey
91dfd62176 Working on: MNG-377
o Normalized all references to plugins to use either o.a.m.model.Plugin or o.a.m.plugin.PluginDescriptor instances

o Changed DefaultLifecycleExecutor, PluginManager, DefaultPluginManager, MavenPluginCollector, and DoxiaMojo to reflect the above

o Added mapped-plugin resolution of goal prefixes to the DefaultLifecycleExecutor

o Added caching of PluginMappingManager instance inside of MavenSession

o Modified SettingsUtils to be more resistant to null String-Lists for pluginGroups and activeProfiles during merge.

o Added checks to MavenProject.addPlugin(..) to only add if the plugin doesn't already exist in the model.

Next step is to modify installation and deployment process for plugins to publish plugins.xml repository metadata.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209677 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 23:50:25 +00:00
Emmanuel Venisse
a029d766ce Update all versions to beta-1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202001 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 15:29:14 +00:00
Emmanuel Venisse
89d5337816 [MNG-520]. copy artifactId when we clone a model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201990 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 13:50:07 +00:00
Emmanuel Venisse
ad7daa5d18 [MNG-520]. copy artifactId when we clone a model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201989 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 13:49:24 +00:00
John Dennis Casey
3a0bdc3c4b Fixing version...again.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201756 13f79535-47bb-0310-9956-ffa450edef68
2005-06-25 15:37:43 +00:00
John Dennis Casey
59e7f83588 bumping version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201711 13f79535-47bb-0310-9956-ffa450edef68
2005-06-25 02:49:26 +00:00
John Dennis Casey
e4083dcdea Resolving issue: MNG-522
o Added check for null child pluginManagement section, and setting to parent value if null.
o Added integration test for parent->child pluginManagement inheritance and injection, to prevent regressions.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201693 13f79535-47bb-0310-9956-ffa450edef68
2005-06-25 00:00:05 +00:00
John Dennis Casey
af50188487 Upating repository id for super-pom pluginRepository.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193085 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:08:23 +00:00
John Dennis Casey
fcbc5e7d6f Resolving: MNG-495
o Pressing [ENTER] at a plugin update prompt should result in the plugin being registered, as indicated by the prompt.
o Use CLI switch '--no-plugin-updates' to suppress usage of the plugin registry
o Use CLI switch '--update-plugins' to force updated/resolved plugin versions to be registered
o Neither of these has a short CLI option, since we're starting to run out of sensible char options for these types of things.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193082 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:03:10 +00:00
John Dennis Casey
78be40776c Changing DefaultPluginManager to lookup a plugin's artifact from pluginRepositories, and changing the location of the super-pom's pluginRepository.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193081 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:00:33 +00:00
John Dennis Casey
6100b37321 Updating non-maven, non-modello deps to get rid of snapshots. Also removed marmalade stuff from mboot.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193052 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 02:31:28 +00:00
Brett Leslie Porter
777cbc968c ensure failed artifact path is passed through to all resolution exceptions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191953 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 14:27:35 +00:00
Brett Leslie Porter
5c1fb112b9 avoid circular dependency in test cases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191833 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 13:25:06 +00:00
Brett Leslie Porter
677a0dd7d5 fix NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191800 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 11:24:31 +00:00
Brett Leslie Porter
c3d0ba0846 use managed versions for project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191783 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 08:25:34 +00:00
Brett Leslie Porter
3f2f0d50a3 simplify the resolveTransitively API, and implement the new collector up to the level of functionality of the original.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191773 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 06:46:26 +00:00
Brett Leslie Porter
3bee4a55c1 change artifact resolution result to have a set of artifacts instead of a map, as everything dealt with them as a collection anyway.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191748 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 00:31:33 +00:00
John Dennis Casey
fd3e9fe9e2 Fixing artifact handling to only process the runtime artifacts, and select out the tld's from that. This is for the war mojo, BTW. :)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191688 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 17:13:24 +00:00
John Dennis Casey
05892c489f Dressing up the execution collision error some more for non -X output.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191670 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 15:45:51 +00:00
John Dennis Casey
9dfc1f9962 Improving error reporting when execution id's collide.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191669 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 15:36:00 +00:00
Brett Leslie Porter
6cd2e31078 refactoring of the resolveTransitiveDependencies call.
simplified by removing a bunch of duplicated code in addArtifacts - no need to merge, you have the full list. 
separated the original artifacts (dependency artifacts) from the resolved artifacts (getArtifacts)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191667 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 15:32:02 +00:00
Brett Leslie Porter
f017c2ed9c add missing '.' (thanks Kenney!)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191638 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 08:00:00 +00:00
Brett Leslie Porter
26d36d8959 PR: MNG-140
split artifact impl from api so that dep resolution can be used independently of wagon
only the first step in making maven-artifact more useful as a public api - more changes to be made


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191634 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 06:49:49 +00:00
John Dennis Casey
7acd75ed8a Forcing collision of plugin-execution id's in non-inherited, direct-goal invocation scenarios.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191621 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 04:20:18 +00:00
John Dennis Casey
07dda3c3ae Resolving issue: MNG-271
o Added method to MavenProject called writeModel( Writer ) 
o Added code in MavenArchiver to export the full effective POM to ${project.build.directory}/exported-pom.xml and then embed that in the archive, rather than simply embedding ${project.file}.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191588 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 23:34:34 +00:00
John Dennis Casey
fda77afb12 Resolving issue: MNG-339
o Added checksumPolicy to artifact repository construction, which meant changing all the places where the factory was called.

o Added two command-line switches (-C=strict-checksum-checking, -c=lax-checksum-checking, or warning)

o Added checksum policy to all repository definitions (profiles.mdo, settings.mdo, maven.mdo)

o Changed the maven-artifact-ant stuff to use a Repository definition with checksumPolicy added to it

NOTE: I just realized that I haven't touched the inheritance/conversion of repository stuff from profiles/settings.xml to the model. I'll do this, and commit the additional changes.

Currently, the default checksum policy is to warn, since there are still bad checksums out there that prevent bootstrapping. Once we chase these down, we can change to default-strict checking. When verifying checksums, SHA-1 is attempted first, with MD5 acting as a backup verification method. If the checksum verification fails legitimately (not related to the process of retrieving/reading the checksum file), then the verification process is repeated ONCE ONLY.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191536 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 18:53:53 +00:00