Commit Graph

94 Commits

Author SHA1 Message Date
Dennis Lundberg e5a230eb86 o Make sure that descriptions end with a period, if they have a defaultValue. This way it will look nice when we upgrade to a newer version of Modello.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@474566 13f79535-47bb-0310-9956-ffa450edef68
2006-11-13 23:22:15 +00:00
Vincent Siveton 388e354860 MNG-1997: document xsd support for pom and settings in guides
o added documentation

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@471193 13f79535-47bb-0310-9956-ffa450edef68
2006-11-04 14:06:42 +00:00
Carlos Sanchez Gonzalez 5a5a7ba09f Fix nonProxyHosts delimiter
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@426263 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 21:58:57 +00:00
John Dennis Casey 864fbd29e2 Consolidating modello plugin configuration into parent-pom within pluginManagement.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@421308 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 16:31:25 +00:00
Carlos Sanchez Gonzalez df2b72bb6c Set svn properties
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@420152 13f79535-47bb-0310-9956-ffa450edef68
2006-07-08 15:49:37 +00:00
Carlos Sanchez Gonzalez bd98854481 Remove unused method, consolidate if blocks
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@419885 13f79535-47bb-0310-9956-ffa450edef68
2006-07-07 12:46:49 +00:00
Carlos Sanchez Gonzalez f7a33ca068 POM cleanup, remove inherited fields, added license and xsd
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@419880 13f79535-47bb-0310-9956-ffa450edef68
2006-07-07 12:23:28 +00:00
Milos Kleint 158acd0146 remove System.out
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@415132 13f79535-47bb-0310-9956-ffa450edef68
2006-06-18 13:00:57 +00:00
Jason van Zyl 94e440000d o merge of the maven-embedder-refactor branch into the trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@392327 13f79535-47bb-0310-9956-ffa450edef68
2006-04-07 15:57:09 +00:00
John Dennis Casey eab65e11ad (merged from branch revId: 379662.)
Original URL: http://svn.apache.org/viewcvs?rev=379662&view=rev

[MNG-2095] Adding xsd generation to site phase for modello projects.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379663 13f79535-47bb-0310-9956-ffa450edef68
2006-02-22 03:13:17 +00:00
Emmanuel Venisse 353f7aedfc merge from rev.379395
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379411 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 10:17:56 +00:00
Brett Leslie Porter fa34c36025 [MNG-1509] fix profile activation from settings.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379314 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 02:55:23 +00:00
Brett Leslie Porter 9ae0914694 flip trunk to 2.1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356316 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 18:22:06 +00:00
John Dennis Casey 8a5fa61b17 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356099 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 01:41:09 +00:00
John Dennis Casey 9cf94e34f2 [maven-release-plugin] prepare release maven-2.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356093 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 01:34:03 +00:00
John Dennis Casey 187716230f Changing the version of modello plugin to the released.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356077 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 01:02:52 +00:00
Brett Leslie Porter 6abcb69443 enable activeByDefault from settings.xml
PR: MNG-1586
Submitted by: Edwin Punzalan


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355878 13f79535-47bb-0310-9956-ffa450edef68
2005-12-11 02:57:38 +00:00
Brett Leslie Porter 65acc94926 implement lax parsing of repository metadata XML files
PR: MNG-1788


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355404 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 07:58:04 +00:00
John Dennis Casey a321da38d6 PR: MNG-1525
Submitted By: Edwin Punzalan
Reviewed By: John Casey

NOT applying this patch. I found a better solution that will factor the interpolation of the POM into a flexible utility in plexus-utils, and will allow introduction of envar resolution to the POM. It will also make interpolating the settings.xml and profiles.xml using any of a number of expression resolvers (using envar resolution only for now).

BTW, I tried using System.getenv(..) in JDK1.4, and it fails with java.lang.Error and a deprecation message. So, I'm using Edwin's code to extract the envars into a Properties object. We can improve this later.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354462 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 16:28:07 +00:00
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