Commit Graph

842 Commits

Author SHA1 Message Date
Brett Leslie Porter e78bef0429 PR: MNG-598
implement ability to retrieve packaging handlers (lifecycle mappings) from extension plugins. Remove plugin mapping
metadata for the same
integration tests are in place for type handlers but commented out until implemented (41)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225263 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 09:04:32 +00:00
John Dennis Casey 73e549b231 o Fixing resolution of LATEST in plugin-versions, when <useLatest/> is enabled in plugin-registry.xml, or when --check-plugin-latest is specified on the command line.
o Fixing core-library resolution for expression: ${plugin.artifacts} and ${plugin.artifactMap} (latter is keyed by g:a)

o Modified maven-core-it-plugin to accept something like "-DartifactToFile=org.apache.maven:maven-artifact"...it'll lookup that artifact in ${plugin.artifactMap}, and touch a file that's a mutation of the abs. path for that artifact.

o Added pomArtifact to ResolutionGroup, since the MavenMetadataSource ALWAYS creates a new Artifact for a pom...this allows us to retrieve the resolved Artifact for that pom.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225234 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 05:54:24 +00:00
John Dennis Casey 4b1038de53 Working on: MNG-607
o Added '-f' CLI option, to allow use of non-standard pom files, or spawning of a build from outside of the project dir.
o Added preferential processing of release-pom.xml over pom.xml if it exists (assumes that the current checkout is a release of the software)
o Moved all file discovery from MavenCli to DefaultMaven, to allow embedders to have access to this logic.
o Modified MavenExecutionRequest to add a flag for reactor-activation and the name of a non-standard pom to use, if appropriate.
o Removed getFiles() and getProjectFiles() from MavenExecutionRequest, since file discovery is now done in the DefaultMaven.
o Added integration tests to check preference of release-pom.xml in standalone and '-r' mode
o Added integration tests to check usage of '-f' option within and outside of the project directory
o Added processing for cli-options.txt to maven-core-it-verifier (Verifier.java) to allow specification of '-f' and '-r' in tests


NOTE: the release plugin still doesn't correctly remove the release-pom.xml from HEAD/trunk, since I don't have access to the SCM remove command from maven-scm. I'm waiting for Emmanuel to finish some API changes before moving to the new maven-scm version, and implementing this final step.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225226 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 03:55:37 +00:00
John Dennis Casey 3251b41d8e Correcting core-library resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225208 13f79535-47bb-0310-9956-ffa450edef68
2005-07-25 23:50:13 +00:00
Brett Leslie Porter 086463b5b4 PR: MNG-456
allow separate snapshot and release repositories
deprecate existing snapshotPolicy and checksumPolicy in favour of updatePolicy and checksumPolicy within the <releases> and <snapshots> elements in the <repository> element.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224707 13f79535-47bb-0310-9956-ffa450edef68
2005-07-25 09:51:12 +00:00
Jason van Zyl 7a2d130893 o applying a small patch by stephane to get the RAR plugin working.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224478 13f79535-47bb-0310-9956-ffa450edef68
2005-07-23 16:56:41 +00:00
John Dennis Casey 701ef520a3 Working on MNG-607
o Changed MavenMetadataSource to a component, to avoid having to lookup artifactFactory and projectBuilder in order to 
  construct it.

o Added add(..) method to ScmBean in the release plugin to allow addition of release-pom.xml

o Changed the PrepareReleaseMojo to resolve ONLY version and parent-version for the normal pom.xml, and fully resolve all
  artifacts used in the release-pom.xml, including version, parent-version, dependency closure (given by project.getArtifacts()), plugins, and reports. It will then add the release-pom.xml, and (attempt to) delete it before performing the final commit for next development version.

o Added some mapping methods to ArtifactUtils, to key by artifact.getId, and to create an Artifact.getId()-compatible string from parameters.

o Added TestProjectBuilder to remove the requirement in ProjectClasspathTest to modify the fields of the project builder directly.

o Cleaned up the AbstractReleaseMojo and PrepareReleaseMojo to avoid container lookups...they're now mojo parameters with the 'component.' prefix.

NOTE: Next step is to figure out how to use maven-scm to remove an SCM resource, to enable the prepare mojo to take the release-pom.xml back out of HEAD after the tag is complete.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224413 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 22:07:28 +00:00
Brett Leslie Porter 6e6c12a647 general cleanup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220319 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 13:43:45 +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 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 53fd3dd6fb PR: MNG-567
fix off by one error

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220058 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 13:05:26 +00:00
Brett Leslie Porter 5d00be82d0 add project info report
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220051 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 12:38:02 +00:00
Brett Leslie Porter ed7ccf707a PR: MNG-530
don't attempt to configure non-report mojos during reporting



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220042 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 12:18:35 +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 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
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 76d971b4ba Removing leftover lifecycle binding for ValidatePomMojo in the maven-plugin-plugin (removed that last night).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219716 13f79535-47bb-0310-9956-ffa450edef68
2005-07-19 17:15:41 +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
John Dennis Casey 6f81043b7b Centralized repository handling in AbstractVersionTransformation, for consistency (should fix MNG-527).
Changed download strategy for plugins.xml metadata to download only when non-existent locally or when plugin prefix cannot be located within local metadata. NOTE: This could lead to local-only installs of plugins having their prefix mappings overwritten.

Next step is to change the maven-plugin-plugin.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219615 13f79535-47bb-0310-9956-ffa450edef68
2005-07-19 04:15:26 +00:00
Brett Leslie Porter 77fee9a4fd add unique short options so that all are recognised
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219605 13f79535-47bb-0310-9956-ffa450edef68
2005-07-19 02:42:44 +00:00
Brett Leslie Porter 84a58b99ec cleanup, reformat
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219586 13f79535-47bb-0310-9956-ffa450edef68
2005-07-19 00:42:36 +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
Brett Leslie Porter 9ec3433ab1 TODO clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219420 13f79535-47bb-0310-9956-ffa450edef68
2005-07-17 22:56:08 +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
Emmanuel Venisse 872214ca25 Move plexus lifecycle mapping to plexus plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219213 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 16:19:48 +00:00
John Dennis Casey 3f47c60752 Cleaned up plugin-version resolution.
o Added four command-line options:

  --check-plugin-updates is a synonym for --update-plugins
  
  --no-plugin-registry turns off usage of plugin-registry.xml for plugin version resolution for the current build.
  
  --check-plugin-latest turns on usage of LATEST metadata for plugin version resolution for the current build.

  --no-plugin-latest turns off usage of LATEST metadata for plugin version resolution for the current build.

o Added settings.xml configuration <usePluginRegistry>true|false</usePluginRegistry> to en/disable the use of plugin-registry.xml for plugin version resolution. The default value is true, to use the plugin-registry.xml.

o Added plugin-registry.xml configuration <checkLatest>true|false</checkLatest> to en/disable the use of LATEST metadata when resolving plugin versions. The default value is false, or do not use LATEST.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219089 13f79535-47bb-0310-9956-ffa450edef68
2005-07-14 20:35:23 +00:00
John Dennis Casey 0cc696a407 Working on: MNG-576
o Implemented plan from my comments on MNG-576 for looking up lifecycle mappings within plugins.

o Fixed subtle bug in DefaultWagonManager for verifying checksums, where the destination file was being used to verify the checksum rather than the recently download temp destination.

o Fixed the DefaultRepositoryMetadataManager.resolve(..) method to allow the locally-installed metadata to be used if it is newer than the one resolved from the repository.

o Moved the lifecycle mappings for the EJB and WAR plugins out to META-INF/plexus/components.xml in the respective plugin's src/main/resources directory. it0016 and it0017 still pass.

o Changed the distributionManagement repository for maven-plugins/pom.xml to have id of 'central-plugins' and then added a normal artifact repository definition for central-plugins to that pom, to allow locally-installed repository metadata for the plugins to be put in the right place (and these builds should have access to the central plugin repo anyway).

o Changed the DefaultPluginMappingBuilder to only warn when plugins.xml for a particular plugin group is missing.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@216273 13f79535-47bb-0310-9956-ffa450edef68
2005-07-13 21:57:57 +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 4b53aba3bb Fixing issues related to MNG-377, where the plugins.xml metadata was being mishandled. Separated updating of this metadata into a separate mojo, bound to the 'package' phase, and put in a validator for the POM (POM has to have distributionRepository now for maven-plugin's) which is bound to the 'validate' phase. Put together an integration test that uses modello:java as a case where the pluginGroups must be consulted. Also had to change the Verifier to check a verifier.properties for failOnErrorOutput, which will suppress IT failures based on [ERROR] log output (modello outputs one of these, and kills the IT unnecessarily).
MNG-377 should be resolved at this point.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@215890 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 22:08:58 +00:00
John Dennis Casey b90c2d1e24 rolling back this change until I get the plugin-mapping stuff figured out, to keep the bootstrap working...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@210200 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 20:04:16 +00:00
John Dennis Casey 03a50c1462 [MNG-377] Resolving.
Added new mojos to the plugin-plugin that will update the plugins.xml mapping metadata in the plugin's group on the distribution repository.




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@210153 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 16:13:33 +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
John Dennis Casey 63aab278c2 Working on: MNG-377
o Added component descriptor for the MavenPluginMappingBuilder

o Added a new ComponentDiscoveryListener implementation to factor the DefaultPluginManager out of the plexus.xml for maven-core...the DefaultPluginManager now delegates to this component for plugin registration/lookup/etc. and has proper component requirements.

o Moved the DefaultPluginManager component declaration into components.xml, and added a component definition for MavenPluginCollector to plexus.xml in maven-core

Next step is to get rid of the old pluginKey junk, and start using o.a.m.Plugin instances to hold g🅰️v info for all plugins in the system...this will make the interface cleaner and remove the need to concat/parse the plugin identity. Then, I'll add the mapped-plugin lookup functionality to the lifecycle executor.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209563 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 03:18:53 +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 70055892fc Move plexus-utils to 1.0.1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209031 13f79535-47bb-0310-9956-ffa450edef68
2005-07-04 07:43:12 +00:00
Trygve Laugstol 55518cbd57 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@208743 13f79535-47bb-0310-9956-ffa450edef68 2005-07-01 10:37:49 +00:00
Emmanuel Venisse 0713fa12dd [MNG-541]. Fix NullPointerException when mojo doesn't have parameters.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202520 13f79535-47bb-0310-9956-ffa450edef68
2005-06-30 10:54:30 +00:00
Emmanuel Venisse b44ec86d40 [MNG-541]. Fix NullPointerException when mojo doesn't have parameters.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202502 13f79535-47bb-0310-9956-ffa450edef68
2005-06-30 07:53:20 +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 e7e0795a20 Rollback bad commit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201994 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 14:01:21 +00:00
Emmanuel Venisse 9e4e149f8e bumping maven-project dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201992 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 13:59:10 +00:00
Emmanuel Venisse 336ad1f71d Clean imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201984 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 13:07:42 +00:00
Emmanuel Venisse 04c30a2e05 bumping version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201983 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 13:07:08 +00:00
Brett Leslie Porter b63d6e9d32 merge changes for rev 193190 from the alpha-3 tag
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193195 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 18:33:19 +00:00
Brett Leslie Porter 7999f398e2 unused
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193194 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 18:26:32 +00:00
John Dennis Casey a707e0ce99 rolled back dumbass changes. fixed assembly plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193133 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 11:02:36 +00:00
John Dennis Casey 2fdc19b089 wrong assembly plugin version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193130 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 10:51:04 +00:00
John Dennis Casey c4db33f5da Adding assembly plugin info to get the thing running.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193129 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 10:46:52 +00:00
Brett Leslie Porter 539658eefa minor updates, remove outdated doco
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193112 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 08:43:27 +00:00
John Dennis Casey b796b7635a Fixing bug with resolving plugins and their deps.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193111 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 08:40:15 +00:00
John Dennis Casey 9699c96631 Adjusting DefaultPluginVersionManager to resolve based on pluginRepository rather than project repo.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193091 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:44:01 +00:00
John Dennis Casey 34a6140bef Adding wagon-file to the deps list for maven-core; adding artifact-exclusions for everything found in -maven.home- /lib in DefaultPluginManager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193088 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:23:17 +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
John Dennis Casey 8b85e50c52 Adding artifact filter for the plexus-input-handler...release-plugin uses it, and so does the PluginVersionManager, leading to CCE's.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@192972 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 18:40:34 +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
John Dennis Casey 854b76e61f Fixing plugin-version prompting once and for all (hopefully)...at least, the logic.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191757 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 03:27:27 +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
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
John Dennis Casey 4ce86c9b87 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@191664 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 14:51:55 +00:00
Brett Leslie Porter 2561a2893f reduce phase bindings for plexus application
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191658 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 13:50:00 +00:00
Brett Leslie Porter 86aa7ce7da comment and clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191653 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 12:16:26 +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 ce0065fea3 Adding feedback for version-update prompt, and fixing bug with [a]ll selection.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191618 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 02:56:23 +00:00
John Dennis Casey cda19f2e5c Resolving: MNG-494
o During addPlugin() only the plugin's artifact is resolved/added...just enough to get the plugin container to discover the pluginDescriptor.

o During getConfiguredMojo(), the rest of the plugin's artifacts will be transitively resolved and added to the plugin container (if this hasn't already been done). The deciding factor for attempting to complete the plugin container's artifact list is whether the only artifact in the pluginDescriptor's artifact list is the plugin artifact itself. If that makes sense.

It's a bit of black magic, but I think it'll work unless/until we find something more elegant. I'm abusing the container a little bit here, so it might be sensitive to plexus changes in future.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191582 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 22:42:26 +00:00
John Dennis Casey d7e421fd01 Resolving: MNG-496
o Adding extraction of mojo-specific configuration from the merged config for the plugin
o Warning at the DEBUG log-level for unused plugin configuration during the extraction process above
o Added integration test it0028 to test with unused plugin configuration present.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191552 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 20:11:01 +00:00
John Dennis Casey 9aaca6a72d o Added conversion handling of checksumPolicy to Settings and Profiles.
o Moved the profiles-builder stuff into maven-profile, to make that API more self-contained for reuse in Ant tasks, etc.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191551 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 20:08:05 +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
Brett Leslie Porter ae93f02c8d PR: MNG-418
use a silent transfer monitor in batch mode


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191492 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 15:21:50 +00:00
Brett Leslie Porter 22f6d7e1a7 only report 0 seconds if there was no minutes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191487 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 15:10:39 +00:00
Brett Leslie Porter 8dec28247b PR: MNG-471
implemented cloned lifecycle, project and tests. update mojos accordingly


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191476 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 14:42:56 +00:00
Brett Leslie Porter 543189e2fd PR: MNG-471
- correct the lifecycle instantiation
- read/write executeLifecycle in the plugin descriptor


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191416 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 08:00:53 +00:00
Brett Leslie Porter 81fe76fd27 PR: MNG-471, MNG-489
- refactor project out of MavenSession so that it can be cloned
- refactor lifecycle construction out so we can clone the existing one and pass it into a new execution
- only resolve plugins that are executed (MNG-489)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191413 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 07:17:32 +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 ded91a973b better default bindings of goals for a plexus application
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191399 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 06:15:34 +00:00
John Dennis Casey 68e52f7f9c Adding default interval type of minutes, in case W|D|H|M is not specified. This is to be consistent with the snapshot policy in the repository.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191357 13f79535-47bb-0310-9956-ffa450edef68
2005-06-19 18:02:07 +00:00
John Dennis Casey 9863732555 PR: MNG-432
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191312 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 23:45:47 +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
Brett Leslie Porter c16f3e139f record the base version (ie, keep SNAPSHOT so each new snapshot doesn't cause a prompt)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191287 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 13:29:36 +00:00
Brett Leslie Porter a9f174c834 Clean up of the lifecycle executor, simplify configuration and push back into the plugin manager.
This fixed a couple of bugs along the way.

One change that this has brought to bear from the document is you now must specify a goal for it to be bound to the LC
(see it0008)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191285 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 13:01:26 +00:00
Brett Leslie Porter dedfacf69a remove unused code and empty directories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191267 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 05:20:21 +00:00
John Dennis Casey fdfb9d5a2d Changing <reporter/> to <plugin/> in the reporting section.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191266 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 04:23:20 +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 fb065d7858 PR: MNG-257
- hook up the source:jar goal to packaging, but only execute for non-SNAPSHOT builds
- allow comma-delimited list of goals in phase definitions
- only register necessary phases for the goals given


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191111 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 08:33:41 +00:00
Brett Leslie Porter f4fb75176a remove old docs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191110 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 08:31:45 +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
John Dennis Casey af66c7a376 Adding sample settings.xml files. One goes in the maven distro, the other is in the maven-settings project dir, for reference. The one in maven-settings is intended to be authoritative.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191043 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 01:17:36 +00:00
John Dennis Casey a3cf96219f Resolving issue: MNG-379
o Added support for update-all and update-none when prompting the user.

o Added --update-plugins/-F option to force an update of the plugins used in the project.

o Added autoUpdate setting for the plugin registry. This is used when in non-interactive mode, to determine whether to register plugin updates

o Added updateInterval to determine when/how often to check for updates to registered plugins. Supports three syntaxes:

  - 'never'
  - 'always'
  - 'interval:XXX' (where XXX can be a combination of weeks, days, hours, and minutes in the syntax: 1w1d1h1m)
         > this renders the interval syntax similar to 'interval:1w' to check every week.

  NOTE: update intervals are calculated from the time a particular plugin was last checked.

o Added lastChecked attribute for registered plugins, to use as a basis for calculating update-check interval

o Added RuntimeInfo classes for maven-settings and maven-plugin-registry, to help in tracking the file each instance comes from, in addition to merging info which is useful when extracting the user-level instance from the merged instance (for persisting changes to the user instance, f.e.).

o Changed verifyPlugin(..) to take an instance of Settings, to allow persistent decisions across the session (like update-all, update-none in the plugin version manager)

This should take care of outstanding issues with this new feature. I'm closing the JIRA issue now, and we'll deal with any bugs/shortcomings as separate issues.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191021 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 22:38:57 +00:00
Brett Leslie Porter 49ea8e4001 tweak the available phases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190870 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 05:24:43 +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 140e01d80a Removing old component definition for MavenSettingsBuiler - this is provided by the maven-settings artifact now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190600 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 14:47:01 +00:00
John Dennis Casey ce3665851c o Re-adding support for user-level settings which are not assumed to be in ~ (for continuum and other server-style apps' convenience)
o Adding support for global (installation-level) settings.xml file which is identical to the one in ~/.m2, and which will be overridden by user-level settings. The default location for this is ${maven.home}/settings.xml.

o Adding IT to test merging of global- and user-level settings.xml files

o Moved DefaultMavenSettingsBuilder/MavenSettingsBuilder to maven-settings project, to make them more generally available (to ant, for instance)

Resolves issue: MNG-294



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190517 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 21:56:00 +00:00
John Dennis Casey eb0a46b6bb Fixing flaw from previous commit, where artifacts provided by the maven distro are excluded from the plugin artifact list.
Now, we're using all artifacts referenced by the plugin in the artifacts list for that PluginDescriptor...the only drawback is since we're not using a repository layout for the maven /lib, there is no good way to include the artifact-path from /lib...we're using the artifact-file from the local repo for those deps. This SHOULDN'T cause a problem, but it's possible...




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190414 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 15:05:28 +00:00
John Dennis Casey a55fd04696 o Adding ${plugin.*} expression support for mojos. Specifically, added support for ${plugin.artifacts} to retrieve the plugin's classpath artifacts. NOTE: There may be artifacts which are FILTERED by the resolution process, since they are provided in the maven distro. NOT SURE HOW BEST TO RESOLVE THAT...but it'll cause problems with people forking certain mojos, undoubtedly.
May resolve: MNG-455



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190413 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 14:49:49 +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
John Dennis Casey d2e1f3c975 o Adding support for <executions/>, which means multiple runs of the same goal/set-of-goals with different configs.
o Adding @phase declarations for those mojos that seem to be part of the main build, just for completeness
o Added two ITs, to test that <executions/> doesn't mess up the normal operation, and to test multi-execution for a goal.

Should resolve: MNG-172.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190335 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 02:47:57 +00:00
Brett Leslie Porter 8918d09b75 remove MAVEN_OPTS - no need for such a high setting, and make it consistent with the shell script
also, the form of MAVEN_OPTS did not work when it was already set due to extra quoting


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190218 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 05:16:59 +00:00
Brett Leslie Porter 2a8ed2f339 PR: MNG-154
Define the lifecycle according to packaging.
Some more work on the structure of this is required.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189871 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 00:57:19 +00:00
John Dennis Casey 8a257be6fc Fixed problems with merging profile-defined properties into the project, and fixed the ITs testing profile definitions in the process.
This should finally resolve MNG-421


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189768 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 15:53:31 +00:00
John Dennis Casey 30b1434723 Resolving: MNG-421
o External profiles (from settings.xml, profiles.xml) are now available before the main MavenProject is constructed, which allows repositories defined in external profiles to be used to resolve project parents and dependencies.

NOTE: I need to double-check whether the profile-defined repos are actually used to resolve the parent project(s)...there may be another commit following on the heels of this one.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189667 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 23:34:35 +00:00
John Dennis Casey 921d4ced59 o Started maven-projecthelp-plugin to help with build analysis (this helped me to visualize profile stuff)
current goals:
     projecthelp:active-profiles
     projecthelp:effective-pom

o Added source attribute to the Profile model class in maven-model, along with code in the normalization utilities (converters from profiles.xml and settings.xml models to maven-model instances) to identify the source of a particular profile.

o Added a activeProfiles cache of the Profiles in effect for the current project, on the MavenProject class



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189612 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 17:54:11 +00:00
Brett Leslie Porter 7c69d89b08 add wagons to the exclusion list as long as they are in core (needed for site:deploy)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189525 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 05:18:36 +00:00
John Dennis Casey a58b76e2e4 Adding profiles.xml and settings.xml support for profiles, along with integration tests for each.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189510 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 03:27:43 +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
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
Brett Leslie Porter 3623775987 only test the expressions if the field is required
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188656 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:33:41 +00:00
Brett Leslie Porter 89da261562 put back deprecation message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188649 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:16:17 +00:00
Brett Leslie Porter a48cfef4eb PR: MNG-423
move default value into configuration, rather than relying on Java. More convenient for other languages, and allows us to validate/document it. Cleaned up the plugin manager handling. More should be pushed into plexus proper.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188647 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:13:52 +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
Brett Leslie Porter 4aa157e75c cosmetic update
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180243 13f79535-47bb-0310-9956-ffa450edef68
2005-06-06 06:37:26 +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
Trygve Laugstol d34ec0926a o Fixing a small bug that would cause a NPE if a plugin doesn't contain any mojos.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180000 13f79535-47bb-0310-9956-ffa450edef68
2005-06-04 16:10:13 +00:00
Jason van Zyl 177692f82c o sorting the artifacts used in the filter
o adding plexus-i18n which has now been added to the site rendering
  mechanism to provide internationalization support.
  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179923 13f79535-47bb-0310-9956-ffa450edef68
2005-06-04 01:31:13 +00:00
Emmanuel Venisse c4809aed16 Fix typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179775 13f79535-47bb-0310-9956-ffa450edef68
2005-06-03 11:56:03 +00:00
Brett Leslie Porter a60964a9af fix typo in lifecycle
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179517 13f79535-47bb-0310-9956-ffa450edef68
2005-06-02 05:41:27 +00:00
Emmanuel Venisse 7bba85198e Check if plugin contains some mojo, and send an exception instead of NullPointerException if it isn't the case.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179369 13f79535-47bb-0310-9956-ffa450edef68
2005-06-01 09:08:04 +00:00
John Dennis Casey 215c30bbb3 Moved the packages org.apache.maven.model.settings and org.apache.maven.model.profiles to org.apache.maven.settings and org.apache.maven.profiles, respectively.
This is restoring the settings to their original package structure, and putting profiles next to it...the change I'm reversing was not a good one, conceptually.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179289 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 21:48:55 +00:00
John Dennis Casey 25fb7c646d improved the error diagnosis for invalid plugin parameters, as in MNG-345
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179274 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 21:01:25 +00:00
John Dennis Casey 23f82d0199 o Added runtime exception to construction of DefaultArtifact, when one or more of the four attributes required for object identity are null
o Created corresponding runtime exception: InvalidArtifactRTException
o Added error diagnoser for InvalidArtifactRTException
o Changed logError() in DefaultMaven to use error diagnosers (even the devs could use a hand!)
o Added unit test for InvalidArtifactDiagnoser.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179265 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 19:31:58 +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
John Dennis Casey fda1ed95c9 o changed the inheritanceApplied flag to be set by default, and unset if the plugin is merged to the child without <inherit/> being specified...this makes it work with isolated POMs.
o changed the semantics of when the unsetInheritanceApplied() method is called...it's now only when <inherit/> is NOT set.
o changed the default inheritByDefault attribute on MojoDescriptor to be true
o added inheritByDefault to PluginDescriptor (even though we don't have tools supporting it yet), with semantics identical to MojoDescriptor
o added generator/builder support for the inheritByDefault attribute of PluginDescriptor
o added calculation of inheritanceApplied || inheritByDefault to lifecycle executor before allowing plugins/mojos to bind.
o Everything builds, but we need some sort of IT to test the finer points.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178836 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 23:05:09 +00:00
John Dennis Casey 239439bb04 o Added inherited field to the Plugin and Goal classes in maven.mdo
o Added annotation inheritedByDefault (looks like: @inheritedByDefault true|false) for java mojos
o Added support for inheritedByDefault to MojoDescriptor, descriptor generator and builder
o Factored the plugin combinatorial logic into ModelUtils in o.a.m.project, for later reuse in a plugin-aware model inheritance builder
o Refactored the DefaultModelDefaultsInjector to use the new ModelUtils for plugin merging (this is factored into a utility for reuse in inheritance assembly)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178733 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 03:27:55 +00:00
Brett Leslie Porter 84269d34fa PR: MNG-359
Allow .. in module names to support a flat layout for eclipse


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178621 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 08:40:05 +00:00
Brett Leslie Porter ba2f6ce87a hasArgs was the culprit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178058 13f79535-47bb-0310-9956-ffa450edef68
2005-05-24 00:46:54 +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 6f74c90590 allow multiple system properties to be specified
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177938 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 07:18:16 +00:00
Emmanuel Venisse 0b208ead83 Clean imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170987 13f79535-47bb-0310-9956-ffa450edef68
2005-05-19 20:14:08 +00:00
Emmanuel Venisse a624012a8d Check if mojo has parameters before populate it
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170736 13f79535-47bb-0310-9956-ffa450edef68
2005-05-18 11:59:09 +00:00
Emmanuel Venisse 2f6b576c4b Check if mojo has parameters before populate it
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170735 13f79535-47bb-0310-9956-ffa450edef68
2005-05-18 11:51:42 +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 92780b9511 remove redundant vars
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170490 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 23:43:58 +00:00
Emmanuel Venisse 025d519b89 Remove debug
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170435 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 19:48:50 +00:00
Emmanuel Venisse 8b6052bbc6 Start of release plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170406 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 16:27:51 +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 c334dfaf2a PR: MNG-344
correctly render exceptions for initial project retrieval failure

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169591 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 05:58:03 +00:00
Brett Leslie Porter 8fc3e7a305 PR: MNG-338
Helpful error message for non-redistributable JARs, eg jdbc

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169577 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 04:29:44 +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 b10ed41fca reformat, apply license
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169548 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 01:04:50 +00:00
Brett Leslie Porter 967fa87820 PR: MNG-373
make sure plugin configuration is always injected

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169490 13f79535-47bb-0310-9956-ffa450edef68
2005-05-10 16:14:34 +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
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 d47f6c7dd6 move the Log interface to o.a.m.plugin.logging in maven-plugin-api, breaking the dependency on maven-monitor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169431 13f79535-47bb-0310-9956-ffa450edef68
2005-05-10 07:39:33 +00:00
Brett Leslie Porter 2eb327853b we do not currently support concurrent versions of a plugin a build as there is no access to the resolved version outside of the artifact container
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169398 13f79535-47bb-0310-9956-ffa450edef68
2005-05-10 02:57:10 +00:00
John Dennis Casey 7eda955b1d o Cleaned up a couple of things in repoclean that broke with the last update.
o Added concept of ErrorDiagnoser to help interpret errors and provide user feedback
o Added PluginParameterException to provide richer information than simply PluginConfigurationException (it's derived from PluginConfigurationException)
o Added implementations of ErrorDiagnoser for artifact resolution and plugin configuration handling.
o Modified DefaultMaven's logFailure(..) method to use errorDiagnosers Map (injected via Plexus)

I approached the plugin parameter expression/name feedback in this way, as it seems like a general pattern for interpreting errors without embedding this logic deep within the app itself. Feel free to rollback if this causes issues.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169379 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 23:30:01 +00:00
Brett Leslie Porter 05affa0a65 PR: MNG-192
Add "RELEASE" notation so that plugins without a version can be discovered

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169303 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 12:30:10 +00:00
John Dennis Casey 469f96a4f1 o Added '-e' switch, to allow error stacktraces without enabling DEBUG error level throughout.
o Added listing of error messages from getCause() chain in DefaultMaven rather than simply spitting out the (often useless) aggregator Exception's message.
o Added '-e' to the IT verifier's invocation of m2.

I'm trying to get visibility to errors here...

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169230 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 04:25:56 +00:00
Brett Leslie Porter 8e6a8fa694 actually make the changes I said I had for MNG-372
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169202 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 00:22:11 +00:00
Brett Leslie Porter 46e32b8b90 PR: MNG-371
Submitted by: Kenney Westerhof
Reviewed by:  Brett Porter
give the location of the plugin descriptor

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169201 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 00:21:33 +00:00
Brett Leslie Porter 0a7842482f PR: MNG-372
Submitted by: Mark Hobson
Reviewed by:  Brett Porter
deal better with spaces in paths on windows
(applied with modifications)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169184 13f79535-47bb-0310-9956-ffa450edef68
2005-05-08 22:50:01 +00:00
Brett Leslie Porter 6348de7143 comment out readonly check, as it breaks an integration test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169172 13f79535-47bb-0310-9956-ffa450edef68
2005-05-08 21:47:31 +00:00
Emmanuel Venisse dd4c6fb600 Add reports to the menu
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169077 13f79535-47bb-0310-9956-ffa450edef68
2005-05-07 13:01:17 +00:00
John Dennis Casey f1d5f829f2 Correcting module-path validation to error on '..' rather than '/'...'/' causes problems when modules are not direct subdirs of the current basedir.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168639 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 19:17:11 +00:00
Brett Leslie Porter b90399de88 make sure debug really is debug by initialising before DefaultMaven gets looked up.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168635 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 18:56:34 +00:00
John Dennis Casey 76c4ceda28 o Added duplicate check for mojo descriptor Parameters
o changed the exception(s) throws during mojo descriptor extraction to be derivatives of InvalidPluginDescriptorException
o changed PluginConfigurationException in plugin.descriptor to InvalidPluginDescriptorException
o changed all "true".equals(something) to Boolean.valueOf(something).booleanValue()
o added validation of 'modelVersion' back to [Default]ModelValidator
o Fixed/added tests for new 'modelVersion' validation
o changed all requiresXXX in MojoDescriptor to XXXRequired, and getRequiresXXX():boolean to isXXXRequired():boolean to help maintain bean-ness for future use




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168630 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 17:41:03 +00:00
Brett Leslie Porter 216a640dd0 recognise prefix of plugins already loaded
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168605 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 14:21:00 +00:00
Brett Leslie Porter d9ac5ea1e5 use consistent ordering for reactored projects
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168569 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 08:22:28 +00:00
Brett Leslie Porter 4f60e7e0a1 fix substitution in messages files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168568 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 08:21:58 +00:00
Brett Leslie Porter 3f031d5722 avoid NPE if there are not report plugins defined in the POM when generating the site.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168565 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 08:05:52 +00:00
Brett Leslie Porter d17b250fec - allow multiple versions of a plugin to operate concurrently.
- allow specification of a mojo as groupId:artifactId:version:goal
- general removal of more hard coding

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168543 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 07:03:14 +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 acabb9d990 Added isXXXEnabled() methods to Log.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168486 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 01:00:37 +00:00
John Dennis Casey 5877385df1 Final pass on cleaning up the mojo api...collapsed MavenPluginDescriptor and PluginDescriptor in the same way as MavenMojoDescriptor/MojoDescriptor had been; eliminated the need for plugin.descriptor.Dependency and MavenPluginDependency (using ComponentDependencies instead); adjusted the MojoExtractors (name?) to return Lists instead of Sets; added duplicate checking to a new addMojo(MojoDescriptor) method on PluginDescriptor, so we catch it on all sides; changed the Generators to use execute(outputDirectory, pluginDescriptor) rather than the myriad pluginDescriptor-derived values; added an IT for checking that the build for a plugin will fail if multiple mojos are detected with the same goal; and, added a special case to PluginDescriptor.getGoalPrefixFromArtifactId() to handle maven-plugin-plugin. That should be about it. I'm not sure that I've gotten the IT for that failure test added to svn yet, so that may follow.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168481 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 00:32:08 +00:00
Brett Leslie Porter c9d01daf19 remove erroneous TODO item
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168295 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 07:23:13 +00:00
Brett Leslie Porter 7363dbc843 PR: MNG-145
Implement and document repository download mirrors

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168292 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 07:16:07 +00:00
Brett Leslie Porter 6dca9007eb a couple of notes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168278 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 05:44:44 +00:00
John Dennis Casey e095874576 Cleaned up plugin descriptor generation/reading to be more consistent, and to include some things that were being left out. Removed more deprecated behavior from annotations support and expression support. Wrote up the first pass on the mojo api and annotations spec. Fixed the mmld-mojo suppport to accommodate the new expression syntax and collisions with the default expression evaluator for mmld. Added an exception to plugin configuration in DefaultPluginManager to not look for a Field when the configurator == map-oriented.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168233 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 01:33:42 +00:00
Emmanuel Venisse bd9a7f4f7b Add some debug trace
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168221 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 00:40:46 +00:00
Brett Leslie Porter e94fd427f3 improve error message if there is no expression
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168220 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 00:35:55 +00:00
Brett Leslie Porter d4af503a5c align error handling with that of m1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168214 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 23:43:47 +00:00
Emmanuel Venisse 705f269567 Fix APT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168185 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 20:40:04 +00:00
Brett Leslie Porter acfba80edc consolidate defaults injection
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168152 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 17:34:52 +00:00
Brett Leslie Porter 7f7a1049e6 improve the artifact ID parsing - any maven or plugin is removed to get the default prefix. If you want something different, use the configuration for plugin:descriptor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168141 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 16:23:42 +00:00
Brett Leslie Porter 671b0828ec remove unused function
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168135 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 14:55:57 +00:00
Brett Leslie Porter 24c6328ad3 declare the desired "prefix" inside the plugin descriptor instead of pulling apart the artifact ID (though that is how the default is created).
Currently, the reverse is not handled in anyway, so a non-default prefix may not work, but this makes the code easier to isolate.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168099 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 08:17:39 +00:00
Brett Leslie Porter 118a53927d remove old style req, resp mojo support
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168082 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 05:52:55 +00:00
John Dennis Casey 5345ee5fc6 Removed backward compat for plugin class-level parameter annotations and '#' expressions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168070 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 04:20:36 +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
Brett Leslie Porter e12a025c81 remove unused component dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168053 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 02:42:43 +00:00
Brett Leslie Porter 19d96b6163 reduce the code duplication of the injection
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168052 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 02:38:39 +00:00
Brett Leslie Porter e0b032ac0a improve the structure of the lifecycle execution code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168041 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 01:40:59 +00:00
Brett Leslie Porter b5670bdcaa start to clean up the plugin vs. goal name handling so the hardcoding can be reduced, and eventually removed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168040 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 01:20:49 +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
Brett Leslie Porter 6bb39db726 improve error message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165604 13f79535-47bb-0310-9956-ffa450edef68
2005-05-02 08:19:01 +00:00
Brett Leslie Porter 95a1895b16 add integration test phase
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165598 13f79535-47bb-0310-9956-ffa450edef68
2005-05-02 07:22:47 +00:00
Brett Leslie Porter 8d4ca04b2d fix bad expression handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165597 13f79535-47bb-0310-9956-ffa450edef68
2005-05-02 07:22:18 +00:00
John Dennis Casey 3966104e9c Removed the need for MavenMojoDescriptor (collapsed to just MojoDescriptor)...also partially setup the possibility for container-injected configurations, provided we enhance as described in getting-to-container-configured-mojos.apt.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165378 13f79535-47bb-0310-9956-ffa450edef68
2005-04-30 03:50:47 +00:00
Brett Leslie Porter 36f970b652 don't fail if there is a default value and the parameter is set to required.
Reformat according to intelliJ settings.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165266 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 06:06:14 +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
John Dennis Casey a58632b9dd Renamed Plugin.java, AbstractPlugin.java, PluginExecutionRe(quest|sponse) PluginExecutionException to Mojo*
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165238 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 00:12:09 +00:00
John Dennis Casey ab91b7f4c2 o Cleaned up field-level annotation support (especially descriptor extraction, generation, and building)
o Converted all "core" plugins (including maven-core-it-plugin) to use field-level annotations
o Removed generation of parameter descriptors for ${/#component.* param specifications.
o Added @readonly for parameters that cannot be overridden by user configuration (List override was dangerous here)
o Added validation against pom-derived configuration for @readonly parameters
o Fixed @parameter alias="" support...now configuration of the mojo instance actually will work with either the real param name or the alias. Would be nice to support multiple aliases, but that might require @alias annotations...
o Added [temporary?] support for null editable attributes for parameters, to support pre-built mojos from the repo.

Annotation support should be just about ready to go...


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165224 13f79535-47bb-0310-9956-ffa450edef68
2005-04-28 23:05:01 +00:00
Brett Leslie Porter 23ec733870 don't create dummy configuration for components
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165171 13f79535-47bb-0310-9956-ffa450edef68
2005-04-28 17:56:04 +00:00
Brett Leslie Porter 092c9b2423 fix typo in exclusion list
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165074 13f79535-47bb-0310-9956-ffa450edef68
2005-04-28 00:42:33 +00:00
Brett Leslie Porter 3760f873a1 PR: MNG-167
Add the ability for a mojo to "fork" a phase execution, in a separate iteration of the lifecycle.
Add @executePhase generate-sources to idea:idea


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164930 13f79535-47bb-0310-9956-ffa450edef68
2005-04-27 01:16:06 +00:00
Brett Leslie Porter 9a1bc52a21 fix package
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164910 13f79535-47bb-0310-9956-ffa450edef68
2005-04-26 23:23:33 +00:00
John Dennis Casey d8d2e34dca Resolving MNG-221, simplify qdox with field-level mojo parameter annotations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164872 13f79535-47bb-0310-9956-ffa450edef68
2005-04-26 20:30:21 +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 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 9eec3fc5c2 I fell for the oldest trick in the book again...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164324 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 03:24:39 +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 8e8d95924f fix error message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164299 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 23:39:05 +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 9774d3d1cb decouple project stuff from maven-core
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164205 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 09:01:47 +00:00
Brett Leslie Porter a803fc26b4 move artifact repository factory into maven-artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164201 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 08:48:41 +00:00
Brett Leslie Porter 874a8c1245 add more use of ${} expressions, fix problem when } was not at end
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164195 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 08:33:34 +00:00
Brett Leslie Porter d43cfef170 decouple auth info from repository, allows removing settings from project code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164189 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 07:55:32 +00:00
Brett Leslie Porter 7d6b029c43 some clean up of components and artifact repository factory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164181 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 07:16:09 +00:00
Brett Leslie Porter c98b557ac8 move artifact factory to maven-artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164178 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 06:16:25 +00:00
Brett Leslie Porter 21d261f503 clean the artifact factory interface a little
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164172 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 05:19:04 +00:00
Brett Leslie Porter c289cf4f7f change expressions to use ${} instead of #
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164171 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 04:32:35 +00:00
Brett Leslie Porter c8b5f21331 fix README instructions to be inline with web site
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164168 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 04:06:28 +00:00
Brett Leslie Porter aafbd6b61c remove dependency on settings from the project builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164089 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 17:17:36 +00:00
Brett Leslie Porter be6703f6da disperse constants only used in one place
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164081 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 16:26:57 +00:00
Brett Leslie Porter bc738a21f4 move utils to plexus-utils
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164078 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 16:16:25 +00:00
Brett Leslie Porter 804e18cac0 improved error handling for failed downloads
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164065 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 14:17:14 +00:00
Brett Leslie Porter c7e407ba12 improve error handling for failed downloads
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164058 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 13:47:42 +00:00
Brett Leslie Porter c435539656 improve download/upload monitors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164024 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 10:11:08 +00:00
Brett Leslie Porter 8e279f87e1 avoid NPE when there is no project file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163991 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 00:49:19 +00:00
Brett Leslie Porter ab2070d797 add deprecated parameter feature
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163983 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 16:49:01 +00:00
Brett Leslie Porter c1cea8cbb8 factor out project sorter, and use whole ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163982 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 16:48:11 +00:00
Brett Leslie Porter 06ebdedc0c PR: MNG-316
Submitted by:	Kenney Westerhof
Reviewed by:	Brett Porter
fix NPE when there is no default plugin configuration


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163981 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 16:46:27 +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 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
John Dennis Casey 9e512f8d03 posting an update that represents changes in the design for offline mode, back to being more similar to m1's concept of it.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163970 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 23:15:25 +00:00
John Dennis Casey 61406495be o Refactored the MavenSettings code into the settings.mdo/Settings class.
o Added code to cache the active proxy and profile inside the Settings instance for quicker lookup.

o Added a method to initialize a new active profile for a Settings instance in the event one didn't exist.

o Started adding offline mode. So far, I've implemented:

  - Warning when a mojo declares a requirement for connectivity, but we're offline.

  - INFO message stating when maven is running in offline mode.

  - Addition to the Profile class in o.a.m.settings package to allow specification of offline mode by declaring: <offline>true</offline>


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163969 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 21:50:55 +00:00
Brett Leslie Porter 30d097daaa remove half-done declaration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163967 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 07:08:21 +00:00
Brett Leslie Porter 335af74bb5 add missing delegation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163965 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 04:27:02 +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 e054a2fa5a resolve outstanding issues with scoping regarding tests. Algorithm to be documented in user's guide.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163953 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 07:31:40 +00:00
Brett Leslie Porter 912898c716 PR: MNG-285
fix bug in plugin management inheritence


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163952 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 06:16:47 +00:00
Brett Leslie Porter 8ace38fbce PR: MNG-281
show id if name is null in reactor


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163951 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 05:46:13 +00:00
Brett Leslie Porter f4bf6c145d allow the expression evaluator to align strings to a base directory, for the purposes of the file converter
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163949 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 05:29:00 +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 378cc229a3 convert #component expressions to <requirements/>
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163942 13f79535-47bb-0310-9956-ffa450edef68
2005-04-14 03:27:35 +00:00
John Dennis Casey f0e391dba7 Adding maven-plugin back to the exclude filter for artifact download temporarily, until the plugins are fixed...feel free to roll this back if it's a horrible idea.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163941 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 18:44:13 +00:00