Commit Graph

97 Commits

Author SHA1 Message Date
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 748de75a58 Resolving issue: MNG-467 (patch from Kenney Westerhof applied, with minor formatting modifications)
Resolving issue: MNG-503 (another patch from Kenney Westerhof applied)

o Tracked down the potential NPE when using a list of dependencies in the DependencyTask (it needs a Pom in order to create an originating artifact)...creating a dummy Pom instance when the list of dependencies is supplied, since I assume the originatingArtifact is used for tracking/graphing purposes. This new method, called createDummyPom() is in AbstractArtifactTask, so it's available for use in InstallTask and DeployTask if necessary...

Thanks, Kenney!



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191744 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 23:25:26 +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 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 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
John Dennis Casey 60750dede2 Working on issue: MNG-469
o Changed <reports/> in the Model to <reporting/>, to accommodate the <reports/> inside of <reportSet/>.

o Changed the report-plugin class <plugins/> inside of <report[ing]/> to <reporters/>, which means using a new class called Reporter (this is meant to be a Plugin-like model for reports, with reportSets rather than executions...)

o Changed the MavenProject to reflect these two model changes

o Added support to the inheritance assembler to perform deep inheritance of the reporting model (complete with calculations based on the <inherit/> attributes on Reporter and ReportSet).

o Updated DoxiaMojo, Pom, and DefaultPluginVersionManager to reflect the new model classes and MavenProject methods.

This is only round one of the changes for this issue. The next step is to start binding report configuration to the plugin manager via the lifecycle executor (it will traverse the reporting section, and verifyPlugin() to enable direct calls to the report's mojo).



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191239 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 00:43:00 +00:00
Brett Leslie Porter 01e6c8daa6 PR: MNG-257
refactor artifact creation to all go through the factory, and assign the type handler from there.
Attach EJB client to the EJB artifact so that it is installed/deployed along with it.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191096 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 06:49:57 +00:00
Brett Leslie Porter 7fc8dfba9d make the artifact type handlers configurable
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191079 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 03:55:50 +00:00
Brett Leslie Porter e57f2dbb44 fix possible NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190975 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 18:09:17 +00:00
John Dennis Casey 1ed708a97b Fixing for package rename in maven-profile from the other day...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190541 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 01:13:09 +00:00
John Dennis Casey 1fc7419f03 o Added <properties/> for profiles configured in the pom.xml
o Split ModelNormalizationUtils into two utility classes in the maven-profile and maven-settings projects, to be used for converting Profile instances from the settings.xml and profiles.xml into maven-model instances.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190344 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 04:21:27 +00:00
Brett Leslie Porter f51bb22433 correct doc, import
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190072 13f79535-47bb-0310-9956-ffa450edef68
2005-06-11 04:59:15 +00:00
Emmanuel Venisse 7dab9ff71a Add plexus-utils dep for override version found in transitive dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190042 13f79535-47bb-0310-9956-ffa450edef68
2005-06-11 00:02:11 +00:00
Brett Leslie Porter 6bb22f701c switch to '.' so that the expression can look like ${pom.*} when refid is pom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190024 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 22:01:03 +00:00
Brett Leslie Porter 43ff603963 temporary so it will build with alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189883 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 02:45:34 +00:00
Brett Leslie Porter cb291e9fa2 PR: MNG-460
Submitted by: Nicola Ken Barozzi
Reviewed by:  Brett Porter
(applied with modifications)

Replace setProperty by a chained property helper, set up automatically when the POM is first declared.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189873 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 01:43:21 +00:00
Brett Leslie Porter 53942a2d24 PR: MNG-457
add support to select a set of profiles


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189530 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 05:54:25 +00:00
Brett Leslie Porter 1ed5a7ab1a add missing file for the set properties capabilities
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189512 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 03:37:15 +00:00
Brett Leslie Porter a27bf46440 PR: MNG-435
add a <artifact:setProperty property|ref="..." expression="project.*" pomRefId="..." /> tag for exposing the pom as variables



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189505 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 03:08:20 +00:00
Brett Leslie Porter f4c030598a PR: MNG-440
add mirrors support


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189493 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 02:10:26 +00:00
Brett Leslie Porter 818525f8d5 PR: MNG-440
add proxy type



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189491 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 01:56:45 +00:00
Brett Leslie Porter f028275f61 PR: MNG-440
add proxy support, both as a nested element or if not given there, as a settings.xml entry



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189490 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 01:56:01 +00:00
Brett Leslie Porter 223d37a7ad PR: MNG-440
support "servers" element from settings for obtaining authentication info



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189489 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 01:49:48 +00:00
Brett Leslie Porter e2e1a3830c PR: MNG-440
read settings.xml for the local repository


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189484 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 00:59:53 +00:00
Brett Leslie Porter 6a38bf445c add the ability to use a POM for dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189477 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 00:18:53 +00:00
Brett Leslie Porter 656b6f02b0 avoid NPE if either of the ids are not specified
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188807 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 16:09:59 +00:00
Brett Leslie Porter 8772f0f23e PR: MNG-407
allow filtering of transitive dependencies


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188803 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 15:51:25 +00:00
Brett Leslie Porter 77caea316a clean up exclusions list
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188778 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 14:19:06 +00:00
Brett Leslie Porter 6eb9705933 PR: MNG-408
Add filesetId attribute to dependencies task

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170498 13f79535-47bb-0310-9956-ffa450edef68
2005-05-17 01:04:43 +00:00
Brett Leslie Porter 7ed8a746d3 update to released versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169961 13f79535-47bb-0310-9956-ffa450edef68
2005-05-13 07:01:57 +00:00
Brett Leslie Porter d64970af4d propogate more ArtifactResolutionExceptions directly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169557 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 02:13:18 +00:00
Brett Leslie Porter 07a1e529f8 need to construct the repository checkout first
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165285 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 09:31:42 +00:00
Brett Leslie Porter 19d8a27354 playground for the SCM wagon
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165269 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 06:49:53 +00:00
Brett Leslie Porter c6fd5e9e2e final package name changes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164933 13f79535-47bb-0310-9956-ffa450edef68
2005-04-27 01:37:25 +00:00
Brett Leslie Porter 562d1c8cee clean up todo list
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164565 13f79535-47bb-0310-9956-ffa450edef68
2005-04-25 12:50:39 +00:00
Brett Leslie Porter bfd3f284e2 updates to versions, and make sure it is valid not to have a <localRepository/> element
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164550 13f79535-47bb-0310-9956-ffa450edef68
2005-04-25 09:38:53 +00:00
Brett Leslie Porter 0a5e84790c set correct parent
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164396 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 15:37:12 +00:00
Brett Leslie Porter 78e92023d3 enhance sample to show snapshots
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164395 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 15:29:28 +00:00
Brett Leslie Porter 8a53923074 updated API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164392 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 15:20:32 +00:00
Brett Leslie Porter 00d581599b move MavenMetadataSource to maven-project from maven-core
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164391 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 15:02:01 +00:00
Brett Leslie Porter 23b8cd0e46 remove unnecessary maven-core dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164322 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 03:12:07 +00:00
Brett Leslie Porter d23c299e0f correct problem where anything with a modified finalName was not installed/deployed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163980 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 16:44:36 +00:00
Brett Leslie Porter a75e7d2577 improved error handling and other clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163979 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 16:41:36 +00:00
Brett Leslie Porter 4fe1c64276 clean up exception handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163978 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 04:16:11 +00:00
Brett Leslie Porter 72997ebd53 build an assembly that includes dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163968 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 07:09:16 +00:00
Brett Leslie Porter 319c135c45 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163962 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 04:12:34 +00:00