Commit Graph

87 Commits

Author SHA1 Message Date
John Dennis Casey 410d22e73c Rolling back the release plugin's dependencies to -beta-1 of maven, and making resolvePluginVersion(..) with the flag for processAsReport public again with deprecation, so the release plugin continues to function into the next release.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291420 13f79535-47bb-0310-9956-ffa450edef68
2005-09-25 14:49:27 +00:00
John Dennis Casey 1d0b8995f6 Fixing versions of maven deps...needs new version of PluginVersionManager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291134 13f79535-47bb-0310-9956-ffa450edef68
2005-09-23 14:54:33 +00:00
John Dennis Casey 24a108a674 Resolving: MNG-767, MNG-768
o We should have a viable offline mode now. Plugin sensitivity updates to follow.

o See it0069 and it1014 for offline mode tests.

o Brett, building maven-plugins in offline mode with org/apache/maven/plugin/* removed will now give a nice error message. :)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291124 13f79535-47bb-0310-9956-ffa450edef68
2005-09-23 14:23:08 +00:00
John Dennis Casey 554dd0b525 Resolving: MNG-842
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290572 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 21:47:10 +00:00
John Dennis Casey 1b96369116 Resolving: MNG-927
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290554 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 20:11:42 +00:00
Brett Leslie Porter 385fef3bda don't include lifecycle introduced plugins (also resolves issue with release plugin snapshot)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290352 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 04:35:46 +00:00
Brett Leslie Porter 26fcb2bae8 revert version to snapshot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290349 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 04:10:50 +00:00
John Dennis Casey 4ae0c23626 Avoid setting finalName when it conforms to artifactId-version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290339 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 03:11:59 +00:00
John Dennis Casey ec8d262f16 Resolving: MNG-878, MNG-921
o Verified that plugins are added to the list in the model when invoked from the command line (878)
o Reformatted ModelUtils after the profiles-cloning addition
o Added cache-flush for the plugin map in MavenProject
o Moved dependencies for subproject/subproject2 into the parent-project POM, inside a profile
o Added activation property for this new profile into the test.sh script
o Added explicit activation inside of release:perform's m2 invocation for all profile-ids active in the release-plugin's execution.
o Added code to remove the dynamic parts of the POM from the release-pom.xml...it's not meant to be a dynamic version of a POM.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290336 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 02:59:44 +00:00
John Dennis Casey 74de0709de Resolving: MNG-920, and setting the version of maven-release-plugin to a rev of -beta-1 instead of -SNAPSHOT, to allow locally installed versions to work without tweaking the version locally.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290276 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 21:24:40 +00:00
John Dennis Casey 23af50ef4a Resolving: MNG-878, MNG-880 (again)
o Added full resolution of plugins listed in the project hierarchy
o Added better resolution of snapshots within the reactor, and resolution of ${finalName}
o Added usage of fully inherited model for release-pom.xml, to enable convergence of all POM inheritance to a single POM with no parent.
o Improved handling of SCM info in a reactored situation.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290221 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 17:58:46 +00:00
John Dennis Casey 66dddfc944 Resolving: MNG-881. This had to do with resource-list merging when the performRelease profile was activated. See MNG-895 for full resolution (this is a stop-gap solution for now).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289599 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 16:27:33 +00:00
Brett Leslie Porter d922db3226 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289586 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 15:29:31 +00:00
Brett Leslie Porter 08b53ea93a [maven-release-plugin] prepare release maven-release-plugin-2.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289584 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 15:29:17 +00:00
Brett Leslie Porter bdb58bf003 use releases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289583 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 15:28:58 +00:00
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