Commit Graph

570 Commits

Author SHA1 Message Date
John Dennis Casey 09ebb0f615 Resolving: MNG-163
Use MavenProject.addResource(..) and .addTestResource(..) to perform this function. I've built a BuildOverlay to insulate the interpolated, initialized Model's Build instance from runtime changes to these, in a similar fashion to addCompileSourceRoots(..), because I wanted to preserve some compat with plugins using ${project.build.resources}.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230920 13f79535-47bb-0310-9956-ffa450edef68
2005-08-08 23:06:48 +00:00
Trygve Laugstol daba7dca27 Resolving http://jira.codehaus.org/browse/MNG-710: "Add ability to fork the
maven-compiler-plugin".
o Applying Rod Coffin's patch. Removed the basedir as a configurable argument.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230869 13f79535-47bb-0310-9956-ffa450edef68
2005-08-08 19:58:32 +00:00
Kenney Westerhof 2823fe4711 Solving MNG-711:
o Added a check in MavenProject.getArtifacts() to never return null,
  but an empty Set, since there's almost no checking.

o Added requiresDependencyResolution test to SurefirePlugin.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230827 13f79535-47bb-0310-9956-ffa450edef68
2005-08-08 17:55:21 +00:00
Vincent Siveton 08da2ff248 MNG-695: Added more tests on anonymousConnection, devConnection and scmUrl to prevent NPE. Added the test case num 11.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230612 13f79535-47bb-0310-9956-ffa450edef68
2005-08-07 00:07:50 +00:00
Vincent Siveton f862da60b6 Added methods to repeat arguments (for group, tag, link and linkoffline options provided by the Javadoc standard doclet). Added plexus-utils as transitive dep.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230549 13f79535-47bb-0310-9956-ffa450edef68
2005-08-06 14:32:43 +00:00
Trygve Laugstol b4cbc02567 o Adding parameters:
- Show deprecation
 - Show warnings
o Using the setters on the configuration object instead of passing them in
  their raw format (eg -target 1.1).

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230547 13f79535-47bb-0310-9956-ffa450edef68
2005-08-06 12:36:48 +00:00
Trygve Laugstol b1b01a6c94 o Adding support for selecting the Plexus compiler implementation. Configure
the compiler plugin with <compilerId>, both "javac" and "eclipse" will work.
  The default value is still "javac" so this shouldn't break anything.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227494 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 21:23:32 +00:00
Vincent Siveton 7020caf8ee Put plexus-utils dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227345 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 11:17:50 +00:00
Brett Leslie Porter 0a637acedd rollback last set of changes, and fix the bug in the existing revision by storing the filenames in a list rather than the identical keys in a set
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227282 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 00:35:39 +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
Vincent Siveton 4f34ea4f93 Rolling back to still allow exception on duplicate files and some small improvements.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227216 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 13:11:10 +00:00
Kenney Westerhof a8229d20f5 Add missing )
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227200 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 11:38:25 +00:00
Kenney Westerhof 7a69f15c15 o Resolved MNG-692, although I think a more general solution is required;
o Fixed another boolean-logic error in the ear plugin.
  Stephane: (x != a) || (x != b) is always true, unless a == b.. ;-)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227198 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 11:29:36 +00:00
Vincent Siveton 9508fdde65 Refactored the ScmReport class to handle the SCMs with the maven-scm component. Generates reports for all SCMs supported by the maven-scm-provider component: ClearCase, CVS, Perforce, Starteam and SVN.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227197 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 11:25:33 +00:00
Kenney Westerhof d031f4309a Bumping version of plexus-compiler-(api|javac) to 1.5-SNAPSHOT:
o Resolves MNG-689

	o Improved parsing of compiler output


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227187 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 09:28:03 +00:00
Kenney Westerhof bf93930cf9 Forgot to remove the module package.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227177 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 07:21:15 +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
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