Commit Graph

75 Commits

Author SHA1 Message Date
Jason van Zyl 4350da7547 Issue: MNG-1416
URL: http://jira.codehaus.org/browse/MNG-1416
 Summary: Patch:  Small addition to Settings.xml documentation
Reporter: K.C. Baltz (kcbaltz)

o apply patch to mdo file to doco on properties 


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345485 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 14:05:06 +00:00
Jason van Zyl 986e2a2ebf o adding a note about the default location of the settings file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@328941 13f79535-47bb-0310-9956-ffa450edef68
2005-10-27 19:41:37 +00:00
Brett Leslie Porter 56f566e79e clean some imports and unused code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327885 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 23:50:38 +00:00
Brett Leslie Porter 9fbd9218c7 make model config global
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327065 13f79535-47bb-0310-9956-ffa450edef68
2005-10-21 01:21:51 +00:00
Brett Leslie Porter b4c041a567 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321042 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:26:39 +00:00
Brett Leslie Porter d783c5fc41 [maven-release-plugin] prepare release maven-2.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321040 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:15:39 +00:00
John Dennis Casey 62149297e4 Resolving: MNG-1150
Applied patch for configuring Wagon instances via DefaultWagonManager. I reworked the configuration exception to be a derivative of TransferFailedException, since it pertains to the WagonManager usage of maven-wagon.

Thanks to Juan Codagnone for the patch.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320827 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 17:49:41 +00:00
Brett Leslie Porter 8c8c0c6b9e updated deps
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@315005 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 19:09:10 +00:00
John Dennis Casey f685d8605d Resolving: MNG-449, MNG-152, MNG-1090, MNG-1089, MNG-1122
o Removed -cpl and related command line switches for controlling use of LATEST metadata for resolving plugin versions
o Made LATEST the only metadata used to resolve plugin versions, since this is also available when releases are performed
o Added various error diagnostics for project build exceptions
o Enhanced artifact not found error diagnostics
o Removed maven-project and added maven-artifact to maven-surefire-plugin's pom
o Removed the stanza that added pluginArtifacts to the test-booter's classpath...they are already covered by the classpathElements
o Fixed ITs in connection to the removal of -cpl
o Changed the plugin manager to detect whether a plugin's artifact file has changed since the plugin container was created...if so, reload it.
o Took the projecthelp plugin out of the build until I can diagnose the problems with its build (probably tomorrow).



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@312827 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 07:35:33 +00:00
Brett Leslie Porter 510de4fe54 upgrade plexus utils to 1.0.4-SNAPSHOT.
The group ID has changed, so add a bunch of exclusions to ensure the old is not picked up
fix bugs in mboot that wasn't honoring excludes.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307294 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 14:13:31 +00:00
Brett Leslie Porter b926e6ff11 PR: MNG-838
improve error reporting for bad settings

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307263 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 05:34:40 +00:00
Brett Leslie Porter 24ebd82f31 PR: MNG-838
improve error reporting for bad settings

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307261 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 05:04:25 +00:00
Brett Leslie Porter 192de6841a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293588 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:13:52 +00:00
Brett Leslie Porter b4e4a1f375 [maven-release-plugin] prepare release maven-2.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293584 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:02:48 +00:00
John Dennis Casey e6dcc36ed5 Resolving: MNG-449, MNG-832
o If the metadata version is still in the plugin artifact after it's resolved, then simply return null and allow the plugin version resolution process to fail.

o Added a new mojo to update the plugin registry (if it's enabled) with newly installed versions of plugins.

o Added comments to maven-settings and maven-plugin-parameter-documenter poms marking the packageWithVersion config as deprecated pending modello alpha-5

o Cleaned up it0013 and it0020 to work with the new resolution (point one above).



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293520 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 04:19:40 +00:00
John Dennis Casey def783e4cf Resolving: MNG-934, MNG-669
o Changed default value for usePluginRegistry to 'false' in settings.mdo
o Changed default value for updateInterval to 'never' in plugin-registry.mdo
o Added ActivationOS in settings.mdo, profiles.mdo, maven.mdo
o Added code to the conversion utilities for Settings and Profiles to corresponding maven-model classes for ActivationOS
o Added OS activator for profiles which allows architecture, name, family, and version (with '!' negation of any of these)
o Added ActivationFile to settings.mdo, along with conversion code in the Settings->Model conversion utility
o Added packageWithVersion configuration to the modello plugin definition in maven-settings (this is apparently required now)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293479 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 01:07:36 +00:00
Brett Leslie Porter 21350c840b PR: MNG-644
remove deprecated settings and profile settings

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293326 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 12:49:40 +00:00
Brett Leslie Porter c5acaded88 upgrade to plexus 1.0-alpha-7 container, switching to new group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293193 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 00:54:01 +00:00
Brett Leslie Porter 27bc0aea4d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291643 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:30:36 +00:00
Brett Leslie Porter 80c8e188b8 [maven-release-plugin] prepare release maven-2.0-beta-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291641 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:18:55 +00:00
Brett Leslie Porter 6787ac0f16 remove release plugin leftover
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290871 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 01:07:12 +00:00
Brett Leslie Porter 3af4a18f48 PR: MNG-575
Submitted by: Jesse McConnell
Reviewed by:  Brett Porter
Add a way to configure permissions on deployed files

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290660 13f79535-47bb-0310-9956-ffa450edef68
2005-09-21 08:53:46 +00:00
Brett Leslie Porter 06ab86cb54 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289368 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:57:16 +00:00
Brett Leslie Porter 5632e45815 [maven-release-plugin] prepare release maven-2.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289366 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:50:12 +00:00
John Dennis Casey dca4ae4518 Resolving: MNG-886
o Added complex test case for the release plugin, called it2002.
o Added copying of reportArtifacts and extensionArtifacts sets when one MavenProject is constructed with another.
o Added some logging statements to PrepareReleaseMojo, which I will remove later when I'm done with this rash of bugfixes.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289294 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 19:21:28 +00:00
Kenney Westerhof 4aa55430cf o Put modello-maven-plugin under dependencyManagement and chose version
1.0-alpha-5-SNAPSHOT for all so they're all the same.
  
o Updated modello plugin invocations in all poms to by adding execution elements
  and fixing goals section to get rid of deprecated notation.
  
o Removed dependency on modello-core in maven-plugin-tools; it seems it
  was there because maven-plugin-tools-java used StringUtils from modello -
  changed that to use the plexus-utils version.

o Reversed commons-cli version back to 1.0 (brett asked me to, a few days back).

o Updated all models to use fully qualified classnames - do not assume
  java.util.* is included! (it won't be anymore from modello 
  1.0-alpha-5-SNAPSHOT onward).

o Added some <?xml processing instructions to some models that didn't have them
  - vim now recognizes these files as XML (so I get syntax highlighting :))




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280539 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 11:41:52 +00:00
John Dennis Casey c9b6d83c57 Resolving: MNG-835. Using activateByDefault within activation in the profile.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280476 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 03:23:16 +00:00
John Dennis Casey 395fe63613 Resolving: MNG-557
o Added new CLI switch {--settings,-s} for alternate user settings path.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227250 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 19:26:20 +00:00
Kenney Westerhof d396f24642 o Put all m2 core dependencies (plexus-container-default and plexus-utils)
under dependencyManagement of m2 and maven-plugins, and removed
  versions in all poms having either as a parent.
  Used version 1.0.2-SNAPSHOT for plexus-utils as that was used in maven-core
  and is not overridable.

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


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227084 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 21:34:54 +00:00
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
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
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
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 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 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 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 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
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
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 d6b4a7adea remove unrequired dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191628 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 06:02:14 +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 914cf98b69 set a default if no basedir sys property
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191411 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 07:10:27 +00:00
John Dennis Casey 385b7c96ae PR: MNG-487
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191309 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 22:38:49 +00:00
John Dennis Casey 1a89a7b751 Resolving issue: MNG-480
o Added support for -Dmaven.repo.local command line override of the local repo
o Propagating local repository location (either maven.repo.local, or from settings.xml) to ITs in Verifier
o Re-enabled it0023 and it0026
o Removed warning in README.txt for maven-core-it.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191163 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 14:34:18 +00:00
Brett Leslie Porter 2d7f97bc31 avoid NPE when no settings.xml file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191104 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 08:03:16 +00:00
John Dennis Casey 3c6c0c7a2c Taking out redundant sample settings.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191051 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 02:25:25 +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