Commit Graph

72 Commits

Author SHA1 Message Date
Brett Leslie Porter c44890b92c update dependency and parent versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289378 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 04:30:44 +00:00
John Dennis Casey 5038a4d249 Resolving: MNG-876. Versions are incremented correctly again.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289348 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 23:36:29 +00:00
John Dennis Casey 75ac363378 Resolving: MNG-879. Now, all isSnapshot() stuff for the release plugin is handled by ArtifactUtils, so it's possible to reuse the logic rather than replicate it.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289311 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 20:40:43 +00:00
John Dennis Casey c5361940c3 Resolving: MNG-880, filling in of null values was using project.model rather than project.originalModel.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289305 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 20:09:27 +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
Brett Leslie Porter d31da596ee set eol style
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280967 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 23:45:29 +00:00
John Dennis Casey 43ed2bd7e4 Resolving: MNG-890, putting m2 invocation in batch mode when doing release:perform.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280905 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 18:41:55 +00:00
Brett Leslie Porter ca5253159a default to true for resume mode, use default-value for parameter defaults, and leave in parent so release-pom works even if it is now substandard due to some regressions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280745 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 02:27:44 +00:00
Emmanuel Venisse d72b1ae50c Update releasePom fields only if fields are null
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280545 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 12:14:53 +00:00
Emmanuel Venisse c6dc853abb Set distributionManagement in release pom if it's defined in a parent pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280360 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 15:58:21 +00:00
Emmanuel Venisse d2488680e1 Fix release pom creation for some null values
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279798 13f79535-47bb-0310-9956-ffa450edef68
2005-09-09 15:34:31 +00:00
Emmanuel Venisse cbf7453e2d o Fix prepare release for poms with non snapshot parent
o Fix version resolver for version without "-" like -alpha-2 but 1.0.2

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279767 13f79535-47bb-0310-9956-ffa450edef68
2005-09-09 13:26:54 +00:00
Brett Leslie Porter 7b6f292c73 more fixes to the release plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279328 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 14:27:51 +00:00
Brett Leslie Porter 457a613ee9 various release plugin fixes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279256 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 06:01:23 +00:00
Brett Leslie Porter 22f9a34107 various release plugin fixes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279240 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 04:14:22 +00:00
Brett Leslie Porter aa34ddef37 fix release-pom.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279063 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 18:50:54 +00:00
Brett Leslie Porter 8c97337f8b release plugin bugfixes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279051 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 18:17:16 +00:00
Brett Leslie Porter 4405b100ef improve reporting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278997 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 13:27:49 +00:00
Brett Leslie Porter 6dca3b1af7 fix the expression for the SCM manager
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278991 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 12:55:31 +00:00
John Dennis Casey fe5a91b0d6 Working on: MNG-483
Fixing profile application to separate profiles discovered in and around POM from those in settings.xml, and apply them separately in the order: 

for-each-project-in-inheritance:{POM, profiles.xml}, settings.xml

Added common interface for accumulating, explicitly activating and deactivating, and retrieving profiles to be applied to a given project. This manager interface (ProfileManager) is general enough to be applicable to both the project-level and settings-level profiles.

Added 'performRelease'-keyed profile to super-POM which will be used by the release plugin and anyone using a parallel process, and which will enable '-DupdateReleaseInfo=true' for the deploy mojo, along with enabling the source attachment for the project.

Added 'attach' parameter to JarSourceMojo to allow local POM to turn off source attachments, overriding release profile in super-pom.

Updated the release:perform mojo to use '-DperformRelease=true' for switching on the new release profile, rather than just using '-DupdateReleaseInfo=true'...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233013 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 16:31:02 +00:00
John Dennis Casey 25f83d1033 Fixing problem where release:prepare was only going to add the top-level release-pom.xml...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227234 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 16:57:54 +00:00
Brett Leslie Porter b072910ab3 make sure plugin repositories don't get used to resolve parents and dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227164 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 05:11:16 +00:00
John Dennis Casey 786091aa6c Working on: MNG-662
o Cleaned up resume functionality, and checkpointing for the release:prepare mojo.

TODO:

- Add testing of some sort
- Verify that maven-scm's checkin function is recursive (suspect it's not)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227150 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 03:11:03 +00:00
John Dennis Casey 8f4b0deaaf Working on: MNG-662
o Moved release.properties management to a helper class
o Created a helper class for caching/prompting for project-versions
o Created a helper class for managing SCM info updates during the release:prepare process
o Moved as many of the shared fields out of AbstractReleaseMojo as possible, given the refactor to reactorized processing
o Refactored the PrepareReleaseMojo to process a list of projects, and resolve inter-dependencies during transforms, etc.
o Refactored the PerformReleaseMojo to adjust to the new helper classes.
o Removed the old transformers, since MavenProject.writeOriginalModel() can be used instead, using the modello writer
o Bumped the maven-scm versions up to 1.0-alpha-2-SNAPSHOT, and added maven-scm-manager-plexus.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227148 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 02:36:14 +00:00
Brett Leslie Porter eedd050414 PR: MNG-649
add classifier to dependency. it becomes part of the dependency key along with type when not null

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225524 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 14:17:41 +00:00
John Dennis Casey cfccde2596 Fixing minor typo in license
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225181 13f79535-47bb-0310-9956-ffa450edef68
2005-07-25 20:59:16 +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 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 3cb6be8740 set eol style
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219827 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 01:27:41 +00:00
Brett Leslie Porter 685bfbcb12 apply some inspections
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219826 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 01:24:35 +00:00
Brett Leslie Porter 853b70081b cleanup, reformat
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219588 13f79535-47bb-0310-9956-ffa450edef68
2005-07-19 01:11:17 +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 61db258aa9 Adding --no-plugin-updates to release:perform mojo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193105 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 08:08:10 +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
Emmanuel Venisse c0131f4de4 Use basedir as working directory for tag
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@192996 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 21:06:32 +00:00
Emmanuel Venisse 25d5870150 Don't use tag for commit. Commit pom change in the current branch.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191777 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 07:07:17 +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
Emmanuel Venisse f3346df4b8 Rewrite scm connections
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178416 13f79535-47bb-0310-9956-ffa450edef68
2005-05-25 09:36:20 +00:00
Emmanuel Venisse 82a6d51998 Rewrite scm tag part in project file in prepare release phase.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178323 13f79535-47bb-0310-9956-ffa450edef68
2005-05-24 23:35:00 +00:00
Emmanuel Venisse 8eb97c2ac9 Fix tag creation. We need to store in release.properties the tag choose by user
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178310 13f79535-47bb-0310-9956-ffa450edef68
2005-05-24 22:52:55 +00:00
Emmanuel Venisse cfb577b305 Use user.name system property as default scm user name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178017 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 20:51:54 +00:00
Emmanuel Venisse af40a5c6aa Use constant
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177979 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 13:28:22 +00:00
Emmanuel Venisse 1fc2ebc7f4 Ignore pom.xml.backup and release.properties files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177975 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 13:21:08 +00:00
Brett Leslie Porter a0c25d06fb simple tweaks and formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177936 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 07:03:01 +00:00
Brett Leslie Porter 48cf14a656 PR: MNG-378
Only deploy the release information at the point of release

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177934 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 06:43:12 +00:00
Brett Leslie Porter eeb42ca316 update input handler version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@171378 13f79535-47bb-0310-9956-ffa450edef68
2005-05-22 22:33:48 +00:00
Jason van Zyl 934763d0ad o removing debug and adding a note
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@171368 13f79535-47bb-0310-9956-ffa450edef68
2005-05-22 20:26:32 +00:00
Emmanuel Venisse e52be1da9a Check if pom is in the correct format.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@171311 13f79535-47bb-0310-9956-ffa450edef68
2005-05-22 13:15:15 +00:00
Jason van Zyl f226508aeb o note on the version transformer
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@171309 13f79535-47bb-0310-9956-ffa450edef68
2005-05-22 12:51:59 +00:00
Jason van Zyl 230d50014a o adding some more debug info to try and find the problem with a POM
transformation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@171307 13f79535-47bb-0310-9956-ffa450edef68
2005-05-22 12:42:01 +00:00