Commit Graph

134 Commits

Author SHA1 Message Date
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
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 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 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
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 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 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 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
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
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
Brett Leslie Porter 0253ccc305 PR: MNG-164
Add Beanshell mojo support

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170608 13f79535-47bb-0310-9956-ffa450edef68
2005-05-17 15:11:41 +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 14b9e9f347 remove default plugin versions from super POM, rely on discovery of releases. Write out the current version during bootstrap to force its usage (unfortunately enforcing it on other installs, however...)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169484 13f79535-47bb-0310-9956-ffa450edef68
2005-05-10 15:04:06 +00:00
Emmanuel Venisse b15610d406 Build maven-reporting-api before maven-core
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169380 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 23:30:07 +00:00
Brett Leslie Porter d4c059226c fix error handling when there is no active profile
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168624 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 15:47:28 +00:00
Brett Leslie Porter 840d963c03 always read settings.xml, even if maven.repo.local is given
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168297 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 07:45:42 +00:00
Brett Leslie Porter 678919ad40 PR: MNG-145
add mirror notation to settings, introduce to bootstrap

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168282 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 06:24:07 +00:00
Brett Leslie Porter 4cc4b13a97 exclude reporting manager for now - should probably be removed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168130 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 14:06:56 +00:00
John Dennis Casey 690bc67fb9 Added marmalade support back in...it's currently still using the libraries-shovelled-into-core method, but it now uses the new mojo mechanism that uses plexus ComponentConfigurators...had to make the lookup for configurators dynamic for the DefaultPluginManager, too.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168064 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 03:28:41 +00:00
Emmanuel Venisse 935e3577e6 Add reporting api and manager
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165244 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 00:36:33 +00:00
John Dennis Casey f5cd6adbe7 Cleaning up errors I introduced with search-and-replace, and with marmalade scripting support. I'm marking marmalade support out for now, until I can get that stuff dragged back into the present.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165242 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 00:29:04 +00:00
Brett Leslie Porter 3f5d831fc6 make debug compiling the default
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164740 13f79535-47bb-0310-9956-ffa450edef68
2005-04-26 04:31:47 +00:00
Brett Leslie Porter 23835350c8 fixes related to changing the path of parent poms, though the actual functionality is not implemented
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164346 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 06:24:08 +00:00
Brett Leslie Porter 0aeab76ac3 fix order
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164235 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 13:06:17 +00:00
Brett Leslie Porter e313416d63 separate maven-project code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164217 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 11:01:33 +00:00
Brett Leslie Porter 05ae5c03e3 split the plugin API and the plugin descriptor code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163927 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 05:11:49 +00:00
Emmanuel Venisse 57e8d48ef2 Update MBoot compiler relative to changes in plexus-compiler.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163914 13f79535-47bb-0310-9956-ffa450edef68
2005-04-12 21:13:24 +00:00
Brett Leslie Porter 935cda15da clean up dependencies.
Still need to clean up ~/maven2/lib and some large dependencies from marmalade that
shouldn't be needed in general - but down to about a 3Mb repository.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163775 13f79535-47bb-0310-9956-ffa450edef68
2005-04-05 04:11:03 +00:00
John Dennis Casey 4862d0cf8f Added waitFor() call so avoid a race condition between chmod'ing the m2 script and trying to use it. Should impose little or no performance penalty on the bootstrap process.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163771 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 21:26:20 +00:00
Brett Leslie Porter 3c6894e59c oops - don't grab those deps!
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163765 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 15:02:03 +00:00
Brett Leslie Porter 2e3e41fddf transitive deps in mboot. Will now proceed to trim up the POMs. Still need to trim ~/maven2/lib also.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163764 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 14:35:06 +00:00
Brett Leslie Porter 1398ab68c4 make m2 use the local repository in the new layout
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163761 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 06:47:21 +00:00
Brett Leslie Porter 15dc3811c8 surefire issues
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163756 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 05:41:57 +00:00
Brett Leslie Porter 54a8cea863 surefire issues
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163755 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 05:31:29 +00:00
Brett Leslie Porter bab8d3fd90 fix issues found with a clean repo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163754 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 05:23:01 +00:00
Brett Leslie Porter 27363f855e isolate path generation in Repository class
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163753 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 05:08:45 +00:00