Commit Graph

464 Commits

Author SHA1 Message Date
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
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 f64881f21a use newer wagon
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191402 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 06:45:04 +00:00
Brett Leslie Porter 1a63032af4 PR: MNG-469
configure reports according to spec:
- <reporting> section affects reports run through site and standalone
- <build> section affects reports run standalone and overrides anything already in <reporting>
- command line parameters rule all



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191298 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 16:21:49 +00:00
Brett Leslie Porter a257dca4f9 re-enable reports by correcting tag name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191289 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 13:47:50 +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
Brett Leslie Porter 619871e7bd remove commented out sections from last commit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188691 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 04:46:18 +00:00
Brett Leslie Porter 9d31796e99 PR: MNG-366
reverse the reference. DoxiaMojo depends on maven-core instead of maven-core depending on the reporting api + doxia

This is not a great solution, but it gets us closer. It is currently not possible, as before, to get the correct set of reports as they are all loaded into the one container and then everything found is returned.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188690 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 04:41:54 +00:00
Brett Leslie Porter 5442089b82 no need for beanshell in the core
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188679 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 03:29:38 +00:00
John Dennis Casey a96a03d0a0 o Removed dependency on plexus-container-artifact, using nested DefaultPlexusContainer instances instead for plugin isolation.
o Moved marmalade support dependencies out of maven-core, since they can be supported on demand now
o changed the ordering of the ant and assembly plugins, to show that the classloader (plugin param) bug is fixed.
o added a method in PluginDescriptor which is similar to o.a.m.model.Plugin.getId() (I think that's the method; it's the one that results in a key of 'g:a')
o moved wagon-ssh dependency into maven-core, since there is a new issue related to nested containers and wagons which are introduced as plugin dependencies. This should be solved using a mechanism similar to plugin-manager for wagon-manager impl in future anyway

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@187639 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 00:37:01 +00:00
Emmanuel Venisse 900449d57e Remove plexus-i18n from core for use it in plugins, site and reports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180100 13f79535-47bb-0310-9956-ffa450edef68
2005-06-05 15:21:52 +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 2e3a99cd03 Use a release version of plexus i18n
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179148 13f79535-47bb-0310-9956-ffa450edef68
2005-05-30 21:10:56 +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
Brett Leslie Porter 47cf3a81f4 cli 1.0 is broken - on linux, empty vars occur and it checks up the arg list as part of -D arguments
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178056 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 23:49:52 +00:00
Emmanuel Venisse 5c7ac1cb57 Add javadoc report
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177962 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 12:17:30 +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 d85ce5d9ef m upgrade to commons-cli 1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170499 13f79535-47bb-0310-9956-ffa450edef68
2005-05-17 01:06:38 +00:00
Brett Leslie Porter f9f481fc12 turn on reports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170017 13f79535-47bb-0310-9956-ffa450edef68
2005-05-13 13:20:13 +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 158a667d94 remove maven-monitor dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169433 13f79535-47bb-0310-9956-ffa450edef68
2005-05-10 07:50:47 +00:00
Brett Leslie Porter 4b12bf0e6e add (commented out) reports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168514 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 03:57:48 +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 e9a7f3ce85 Initial version of site generation with repots.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168031 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 00:47:01 +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 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 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 d377256c93 update to new container
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163972 13f79535-47bb-0310-9956-ffa450edef68
2005-04-19 09:00:48 +00:00
Brett Leslie Porter 2a143e22e6 update wagon
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163954 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 08:33:19 +00:00
Brett Leslie Porter b2e4433615 utilise the container for populating all mojo configuration, including expressions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163947 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 04:52:31 +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
Brett Leslie Porter 433e62f61c fix the pom - it is a compile time dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163921 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 01:09:02 +00:00
Brett Leslie Porter a1d22fd80b put the wagon dependency version update in the right place
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163920 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 00:28:30 +00:00
Brett Leslie Porter e62f087f24 some POM enhancements
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163862 13f79535-47bb-0310-9956-ffa450edef68
2005-04-08 07:50:53 +00:00
Brett Leslie Porter d23b13eb35 rename the assembly plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163805 13f79535-47bb-0310-9956-ffa450edef68
2005-04-06 06:21:16 +00:00
Brett Leslie Porter a99819c454 utilise assemble plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163799 13f79535-47bb-0310-9956-ffa450edef68
2005-04-06 05:11:24 +00:00
Brett Leslie Porter a91be5bc51 use new name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163789 13f79535-47bb-0310-9956-ffa450edef68
2005-04-05 16:30:55 +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
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 49593155d0 update poms for releases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163741 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 16:03:43 +00:00
Brett Leslie Porter 14bb2c805a change the maven group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163670 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 06:52:55 +00:00
John Dennis Casey e9a9323812 o Changed maven-user-model/UserModel/UserModelBuilder to maven-settings/MavenSettings/MavenSettingsBuilder.
This supports a change to a simpler local configuration file (~/.m2/settings.xml by default), which has the general format of:

<settings>
  <profiles>
    <profile>
      <active>true</active> <!-- not needed if this is the only profile -->
      <localRepository>/path/to/repo</localRepository>
    </profile>
    .
    .
    .
  </profiles>
  <servers>
    <server>
      <id>myserver</id>
      <username>me</username>
      <password>mypass</password>
      <privateKey>/path/to/key</privateKey>
      <passphrase>key-passphrase</passphrase>
    </server>
    .
    .
    .
  </servers>
  <proxies>
    <proxy>
      <active>true</active> <!-- not needed if this is the only proxy -->
      .
      .
      .
    </proxy>
    .
    .
    .
  </proxies>
</settings>

o Added special parameter named '#settings' which simply injects the current MavenSettings from the MavenSession into the request parameters.
o Adjusted the it-verifier and mboot2 accordingly.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163578 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 06:29:35 +00:00
Brett Leslie Porter a44b6f9726 flip pom format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163511 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 01:35:25 +00:00
John Dennis Casey 77d3e6c5f5 o Added (pom|project)? to the eval pattern in the regex param extractor, to trim ${project.artifactid} to mean the same as ${artifactId} within the pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163490 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:06:22 +00:00
John Dennis Casey dfbae27c44 o Added first-pass logging and event-monitoring impls. Converted all System.out calls in maven-component plugins to use logger.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163457 13f79535-47bb-0310-9956-ffa450edef68
2005-03-04 09:04:26 +00:00
John Dennis Casey 95d01ff572 o Completed marmalade-mojo support, tested with m2 bootstrap with empty local repo and maven-core pegged at 2/26/2005.
Will resolve CI issues as soon as lifecycle is fixed for IT0013.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163430 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 18:29:47 +00:00
John Dennis Casey db65155072 o Working on getting it0015 (marmalade-mojo support) working...nearly there, it0015 is still disabled.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163415 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 05:09:14 +00:00
Brett Leslie Porter b005ece7c4 get project reports working
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163376 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 00:06:06 +00:00
Jason van Zyl 754feeadb3 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163257 13f79535-47bb-0310-9956-ffa450edef68
2004-12-23 23:46:42 +00:00
Jason van Zyl 3a28b21872 o removing the use of OGNL, snagged some classes from velocity to do
the plugin parameter expression evaluation.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163241 13f79535-47bb-0310-9956-ffa450edef68
2004-12-05 21:45:36 +00:00
Jason van Zyl 9805428ed2 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163223 13f79535-47bb-0310-9956-ffa450edef68
2004-10-26 01:15:46 +00:00
Jason van Zyl 275f002ac9 o updating to the latest wagon snapshots
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163221 13f79535-47bb-0310-9956-ffa450edef68
2004-10-26 00:42:32 +00:00
Jason van Zyl ef61424a93 o my changes in plexus caused some nasty problems so i've backed
them out until tomorrow when i can take another shot.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163112 13f79535-47bb-0310-9956-ffa450edef68
2004-09-18 06:08:18 +00:00
Jason van Zyl 3a85d3cfb6 rollback
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163111 13f79535-47bb-0310-9956-ffa450edef68
2004-09-18 04:31:54 +00:00
Jason van Zyl a37f880493 o the assembly of the maven runtime more closely resembles what the
plexus runtime generator produces so that i may attempt to use it
  some point in the near future

o flipped back to 0.9-S of wagon until I run this on beaver to
  verify

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163110 13f79535-47bb-0310-9956-ffa450edef68
2004-09-18 04:22:07 +00:00
Brett Leslie Porter 9cc7a9e92b align wagon versions, and take the artifact container out of the root class realm
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163097 13f79535-47bb-0310-9956-ffa450edef68
2004-09-17 21:55:41 +00:00
John Dennis Casey 72d9230f28 o Modified to use plexus-artifact-container-1.0-alpha-1-SNAPSHOT to reflect the change in the artifact container's POM...that container has not been released in any official way, so I changed the version to a -SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163092 13f79535-47bb-0310-9956-ffa450edef68
2004-09-17 16:48:18 +00:00
Jason van Zyl f560b3c346 o add the distributionManagement element so I can deploy the m2 site
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163066 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 01:45:52 +00:00
John Dennis Casey a949eb66de o Removed GoalDecorationPhase, since goal decoration is now a part of the model
o Removed PluginDownloadPhase, since plugin resolution/download has to be a part of the prereq and pre/postGoal resolution, too
o Changed DefaultMaven to execute the session lifecycle, and the component wiring to likewise wire the DefaultMaven with a session lifecycle manager
o Removed the org.apache.maven.decoration package and its contents, since this is all in the model now
o Fixed the GoalResolutionPhase to verify each goal's plugin in turn as it resolves prereqs, preGoals and postGoals
o Fixed the GoalResolutionPhaseTest to work with the new resolution model
o Added a new createGoalExecutionContext to the MavenTestCase base class, to allow me to inject a MavenProject directly rather than a pom file
o Fixed the MavenLifecycleManagerTest to only expect 4 lifecycle phases, now than the plugin resolution and goal decoration phases are obsoleted
o All builds on local machine, but will depend on plexus-0.17.jar/pom and plexus-artifact-container-1.0-alpha-1.jar/pom to build on beaver
o I uploaded plexus-artifact-container-1.0-alpha-1.jar to ${plexus.home}/dist, but cannot upload POMs due to priveleges problem in poms dir.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163007 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 04:40:02 +00:00
John Dennis Casey 24ce8263d9 o Changed to depend on plexus-0.17 instead of -0.16
o Changed the embedder/container used to be the new artifact-aware container (plexus-artifact-container-1.0-alpha-1)
o Added new dependency to maven-core for artifact-container.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163006 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 01:18:19 +00:00
Jason van Zyl e81d9919d5 o bumping version of wagon (michal is about to deploy 1.0-alpha-1)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162933 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 21:42:47 +00:00
Jason van Zyl 601320d28f Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162925 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 19:02:31 +00:00