Commit Graph

204 Commits

Author SHA1 Message Date
Brett Leslie Porter db945f1dd0 fix metadata parsing in mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280374 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 17:26:41 +00:00
Brett Leslie Porter 057268bd56 fix metadata parsing in mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280372 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 17:06:59 +00:00
Brett Leslie Porter 997774aa7b make sure local snapshot is used in mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280362 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 16:21:52 +00:00
Brett Leslie Porter d4df5302fb use local copy in bootstrap
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280239 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 02:16:58 +00:00
Brett Leslie Porter ba88f96118 handle flag in mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280235 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 01:54:55 +00:00
Brett Leslie Porter 3c4effa04b remote metadata file was incorrect
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280063 13f79535-47bb-0310-9956-ffa450edef68
2005-09-11 03:43:23 +00:00
Brett Leslie Porter f11def89c1 write metadata to correct file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279582 13f79535-47bb-0310-9956-ffa450edef68
2005-09-08 17:00:09 +00:00
Brett Leslie Porter ba35fd5965 PR: MNG-613
use new metadata in bootstrap

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279535 13f79535-47bb-0310-9956-ffa450edef68
2005-09-08 08:28:06 +00:00
Brett Leslie Porter 8f3c207194 PR: MNG-613
changes versioning to use repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278881 13f79535-47bb-0310-9956-ffa450edef68
2005-09-05 23:12:55 +00:00
Brett Leslie Porter 31e79ea14f minor clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278662 13f79535-47bb-0310-9956-ffa450edef68
2005-09-05 02:12:44 +00:00
Trygve Laugstol ba64a79e28 o maven-repository-metadata has to be built before maven-artifact-manager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267216 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 14:52:30 +00:00
Brett Leslie Porter 94ab6a4076 act a bit smarter when the remote repo is timing out/offline
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264956 13f79535-47bb-0310-9956-ffa450edef68
2005-08-31 07:12:52 +00:00
Brett Leslie Porter e0457b0204 PR: MNG-613
reorganise in preparation for generalised repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264091 13f79535-47bb-0310-9956-ffa450edef68
2005-08-29 06:37:33 +00:00
Brett Leslie Porter fcd86eff85 update inline with surefire plugin - *TestCase are included, Abstract*TestCase are not
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240178 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 07:31:18 +00:00
John Dennis Casey fe5a91b0d6 Working on: MNG-483
Fixing profile application to separate profiles discovered in and around POM from those in settings.xml, and apply them separately in the order: 

for-each-project-in-inheritance:{POM, profiles.xml}, settings.xml

Added common interface for accumulating, explicitly activating and deactivating, and retrieving profiles to be applied to a given project. This manager interface (ProfileManager) is general enough to be applicable to both the project-level and settings-level profiles.

Added 'performRelease'-keyed profile to super-POM which will be used by the release plugin and anyone using a parallel process, and which will enable '-DupdateReleaseInfo=true' for the deploy mojo, along with enabling the source attachment for the project.

Added 'attach' parameter to JarSourceMojo to allow local POM to turn off source attachments, overriding release profile in super-pom.

Updated the release:perform mojo to use '-DperformRelease=true' for switching on the new release profile, rather than just using '-DupdateReleaseInfo=true'...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233013 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 16:31:02 +00:00
Emmanuel Venisse 8400eeeefe oopps, bad test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227331 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 09:42:09 +00:00
Emmanuel Venisse 98066ab241 Allowed user to defined maven.repo.local if settings.xml file exist
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227310 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 06:30:13 +00:00
Kenney Westerhof d396f24642 o Put all m2 core dependencies (plexus-container-default and plexus-utils)
under dependencyManagement of m2 and maven-plugins, and removed
  versions in all poms having either as a parent.
  Used version 1.0.2-SNAPSHOT for plexus-utils as that was used in maven-core
  and is not overridable.

o Bumped maven-archiver version to 2.0-beta-1-SNAPSHOT for maven-ear-plugin


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227084 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 21:34:54 +00:00
Kenney Westerhof 6da771ab70 Fix MNG-508: make mboot use dependencyManagement.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227079 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 20:36:02 +00:00
Brett Leslie Porter 905befa4c8 snapshot repo separation for mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226763 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 08:28:32 +00:00
Brett Leslie Porter 2b93fb8cc7 snapshot repo separation for mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226761 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 08:23:33 +00:00
Brett Leslie Porter 5aacdad52f snapshot repo separation for mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226760 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 08:17:12 +00:00
Brett Leslie Porter a2f651bbbf this is supposed to be preloaded to the remote repository for integration testing purposes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220218 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:08:46 +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 5a0904e9fd PR: MNG-366
separate api from implementation keeping most of doxia, reporting and other libraries out of the core



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220009 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 06:54:21 +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 473d99609c use new surefire
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219874 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 09:53:29 +00:00
John Dennis Casey 11082da5f4 Fixing bootstrap.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219807 13f79535-47bb-0310-9956-ffa450edef68
2005-07-19 23:27:24 +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 ca59227be1 Working on: MNG-377
o Added maven-plugin-mapping project to handle repository metadata that contains prefix-to-artifactId mappings for groups of plugins

o Added builder classes for plugin mappings

o Modified maven-artifact and maven-artifact-manager to handle the concept of repository metadata in addition to artifact metadata.

o Added pluginGroups section to settings.xml, new code to merge these lists of plugin groups, and a unit test to ensure that this merge is taking place properly.

o Added maven-plugin-mapping to dependencies of maven-core, along with the list of builds to be performed by mboot.

Should be ready to incorporate plugin mapping consultation into the lifecycle executor and the deploy mojo...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209550 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 00:17:37 +00:00
Emmanuel Venisse 17e3c742ee [MNG-533]. Add pom.properties in generated artifact.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202010 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 17:22:54 +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 5186fba565 rollback, it's download from remote repo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193181 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 16:23:07 +00:00
Emmanuel Venisse 0ad47b7cd1 Add core-it plugin in bootstrap
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193177 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 16:11:07 +00:00
John Dennis Casey 57795c4cc2 Adding back the marmalade projects.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193107 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 08:08:51 +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 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
Emmanuel Venisse 94529a2bd8 format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191646 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 10:13:27 +00:00
Emmanuel Venisse 64185c024a maven-settings must be build before other projects
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191644 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 09:35:03 +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
Brett Leslie Porter 3e26e6ca55 add lifecycle mdo to booty
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191390 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 04:28:52 +00:00
Brett Leslie Porter 75c3b41c01 use latest modello for booty
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191382 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 03:18:55 +00:00
Brett Leslie Porter ac2d8a7e83 PR: MNG-415
implement provided scope


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190930 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 15:02:07 +00:00
John Dennis Casey b813c3d430 Working on issue: MNG-379
Added specified stop-gap patch for issue: MNG-473 (affects settings-builder and registry-builder)

Today I've made the following progress on this so far:

- Added a new project, called maven-plugin-registry, to house the model for this new file.

- Developed/debugged/tested PluginVersionManager/DefaultPluginVersionManager to isolate the plugin-version checks/management code away from the PluginManager

- Added interactiveMode (<interactiveMode>true|false</interactiveMode> directly under the root element of settings.xml, or -B short CLI option or --batch-mode CLI option, where the CLI options turn OFF interactiveMode). This will allow things like the maven-plugins build to register new plugins (and, for now, new versions of plugins) automatically.

- Added user input handler for when interactiveMode = true, to get a yes/no on whether to use the discovered version over the installed version and/or no version at all. If there is no installed version, and the user selects 'n', then the discovered version is used FOR THAT SESSION ONLY, and won't be recorded in the registry.

- Added checks/recording rejected versions against the registry, before attempting to use the discovered version.

Pending:

- Still need to add update-policies, to determine two things:

  1. how often to check for updates
  2. what to do when updates are found (autoUpdate, etc.)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190854 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 01:50:28 +00:00
John Dennis Casey 64ac374aea Reordered builds to allow maven-profile and -settings to have a fresh maven-project when the local repo is erased.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190404 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 14:00:01 +00:00
Brett Leslie Porter a91802d46d PR: MNG-463
safety guard against bootstrapping with a Maven Home that is not empty, and not a previous Maven installation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189892 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 04:10:29 +00:00
Brett Leslie Porter 420d9a5fca remove old cvs ignore files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188697 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 05:24:51 +00:00
John Dennis Casey 9d7e54c042 o Added model and builder support for Profiles specified in settings.xml, profiles.xml, and the POM.
o Changed MBoot and Verifier accordingly.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179233 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 16:24:34 +00:00
Emmanuel Venisse 4e6b33d359 o upgrade plexus-container to alpha-4-SNAPSHOT
o upgrade plexus-utils to alpha-3 until xpp stuff is fix in 1.0.0

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179122 13f79535-47bb-0310-9956-ffa450edef68
2005-05-30 18:24:32 +00:00
Brett Leslie Porter 17518785ac upgrade to container with separated utils
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178995 13f79535-47bb-0310-9956-ffa450edef68
2005-05-29 22:55:12 +00:00