Commit Graph

552 Commits

Author SHA1 Message Date
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
Kenney Westerhof 6508398316 o Bumped version of plexus-container-default to 1.0-alpha-6-SNAPSHOT
o Committed changes to the EAR plugin on behalf of Stephane Nicoll,
  awaiting his commit privileges.
  Resolves MNG-621 and MNG-622.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227088 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 21:47:50 +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
Kenney Westerhof 872e0972c8 Replacing all \ to / in paths - Eclipse writes windows paths with / and can't
read windows-native paths like C:\Documents and Settings\.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226987 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 11:52:22 +00:00
Vincent Siveton 2639914fee Correct a JS method name and format JS script
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226900 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 22:30:26 +00:00
Emmanuel Venisse c8ce1a91b5 Unallowed release in snapshot repos
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226783 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 12:35:27 +00:00
Kenney Westerhof e300b10792 Removed unused imports and added package declarations to maven-plugin-tools-java
test resources (to stop eclipse from complaining).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226699 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 22:12:34 +00:00
Kenney Westerhof 64887493fe o When eclipse files are created in another location, add a link to the pom;
o Fixed some coding style errors;


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226695 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 21:10:36 +00:00
Jason van Zyl 33ee96ceb9 o http://jira.codehaus.org/browse/MNG-420
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226683 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 19:20:33 +00:00
Kenney Westerhof b294585343 o Project references are now written to .project, so that eclipse
can calculate the build order - no more rebuilds needed to fix this!

o Added a switch -Declipse.workpace=/path/to/workspace that allows for the
  .classpath and .project files to be written to a new directory:
  - For each project a new directory is created.
  - Eclipse 'Links' are created to the original project location for the
    sources and resources directories.
  - The target directory will be in the new workspace location, not in
    the original project tree.
  
  This offers the following advantages:
  
  - Project trees that normally couldn't be imported into eclipse
  because of the overlap error now can be imported succesfully
  (m2 works now!)

  - Projects that reside on a ClearCase SMB mounted drive (which are
  very slow) can now have a target directory on a local drive without
  modifying the pom, greatly improving build speed in eclipse.

o Fixed some minor bugs where the wrong project instance was used.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226669 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 18:00:13 +00:00
Vincent Massol 31bb2440b9 Percentage is a string with a percent symbol.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226509 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 13:23:01 +00:00
Brett Leslie Porter e255dee1c9 - disable parent copying for now, it's broken (infinite loop)
- fix detection of files to correct two bugs: site.xml was incorrectly detected as a dupe of site.apt and identical filenames in different paths were incorrectly marked as dupes

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226507 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 13:00:55 +00:00
Vincent Massol 1dc404f9ca - Upgrade to Clover 1.3.9
- Added CloverLogMojo (clover:log goal) to display the content of the clover database


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226483 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 07:50:03 +00:00
Brett Leslie Porter 475b0eb767 clean up code a little before attempting a bugfix
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226476 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 05:59:30 +00:00
John Dennis Casey dad9ebc577 o Fixing DoxiaMojo (there was an API incompatibility there, having to do with FileUtils...not sure if there is something that didn't get deployed, or what)
o Adding cli-options.txt for three ITs that failed when I cleaned out the local repo

o Fixing the setFile(..) method of ActiveProjectArtifact (hopefully) for Emmanuel's continuum build problem...




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226426 13f79535-47bb-0310-9956-ffa450edef68
2005-07-29 23:26:42 +00:00
Vincent Siveton f5130c14a2 MNG-661: added link between parent project and modules
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226364 13f79535-47bb-0310-9956-ffa450edef68
2005-07-29 12:37:56 +00:00
Vincent Siveton 7a26239e7c Throw an exception if files in the site directory or in the generated site directory are duplicates
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226350 13f79535-47bb-0310-9956-ffa450edef68
2005-07-29 11:52:43 +00:00
Vincent Siveton 674bfaa0f4 Refactor the maven-site.vm: added a macro to handle the copyright
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226349 13f79535-47bb-0310-9956-ffa450edef68
2005-07-29 11:49:47 +00:00
Brett Leslie Porter 2ddf785fef PR: MNG-651
include ejb-clients in an EAR


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225758 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 12:17:45 +00:00
Brett Leslie Porter 9a86709abd PR: MNG-249
make compile and package reactor aware



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225731 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 09:32:32 +00:00
Brett Leslie Porter f9eaca7ab0 PR: MNG-549
Submitted by: Kenney Westerhof
make eclipse plugin reactor aware


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225723 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 07:33:56 +00:00
Brett Leslie Porter 6ab4f5ac99 note about improvement
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225716 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 06:39:14 +00:00
Vincent Siveton 120ade04b0 MNG-663: adding a link for the URL of the organization for developer
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225654 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 23:35:12 +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
Emmanuel Venisse 3fb0852fdf Allow the creation of external reports. html files are now generated only by external reports and not by doxia mojo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225521 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 14:07:04 +00:00
Brett Leslie Porter 04a4dde5bb optimize imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225506 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 12:57:53 +00:00
Vincent Siveton 7670af82a1 Fix a typo for bottom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225450 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 04:09:34 +00:00
Vincent Siveton 5125817f61 MNG-599: Using the organization name and the inception year in the Velocity template
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225446 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 03:12:55 +00:00
Brett Leslie Porter c577901fb4 cleanup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225326 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 15:24:35 +00:00
Brett Leslie Porter 3c68ec366c no need for the manager - it is stored in the artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225315 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 14:22:13 +00:00
Brett Leslie Porter 2d666f57a7 move main J2EE packaging definitions back to being built in
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225311 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 14:00:23 +00:00
Brett Leslie Porter 443a67df1d better error message for missing deployment repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225296 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 12:51:04 +00:00
Vincent Siveton cbb5657526 MNG-588: Throw an exception if two index files already exist
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225290 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 12:33:12 +00:00
Vincent Massol 9f5fbe1f72 MNG-628: No more clover.html + no more site resources generated. Done this time by extending AbstractMavenReport and overriding it's main methods (generate() and execute()). AbstractMavenReport would need to add native support for external reports to have something clean (see MNG-645)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225271 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 10:44:31 +00:00
Vincent Siveton 524a4602c4 MNG-477: Trying to unpack none jar file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225270 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 10:44:06 +00:00
Vincent Massol c692568a42 Do not extend AbstractMavenReport as it does not support externally generated HTML report files (see MNG-645). Indeed, in our case it is Clover which generates the report files.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225267 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 09:48:04 +00:00
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 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
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
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 22282d4f24 typo caused nothing to get included
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224369 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 17:29:23 +00:00
Brett Leslie Porter fd615cbeea PR: MNG-579
correct inclusion of tlds

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224365 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 16:51:09 +00:00
Brett Leslie Porter f37561b2e3 PR: MNG-595
Submitted by: Jesse McConnell
Reviewed by:  Brett Porter
add support for -encoding flag to javac


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220765 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 15:57:10 +00:00
Brett Leslie Porter 235cf9a0d5 correct equals
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220324 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 14:17:24 +00:00
Brett Leslie Porter c6b4b521d7 make note
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220323 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 14:09:14 +00:00
Brett Leslie Porter 64399eb8e3 TODOs and cleanup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220314 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 12:50:26 +00:00
Brett Leslie Porter 9c4c5e57ff use prebuilt artifact lists
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220308 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 12:29:50 +00:00
Brett Leslie Porter 229118d4a1 package before assembly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220222 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:46:15 +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 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