Commit Graph

844 Commits

Author SHA1 Message Date
Brett Leslie Porter 8e13f138c7 rollback release, I was missing the tag base
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289405 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 07:08:59 +00:00
Brett Leslie Porter 7b290671a2 remove release pom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289403 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 07:06:32 +00:00
Brett Leslie Porter 36d5fe1528 merge changes from tag, up to 289396
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289398 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 06:47:46 +00:00
Brett Leslie Porter 17ce104b1a [maven-release-plugin] prepare release maven-clean-plugin-2.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289395 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 06:27:18 +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
Brett Leslie Porter 0b67c7c6c6 beta 2 POM - if required. Plugins should try and stay on beta-1.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289373 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 04:01:55 +00:00
Brett Leslie Porter c193b0fa5d fix JDK 1.5 only call
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289370 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 03:33:31 +00:00
Brett Leslie Porter e3899c9cbc fix eclipse plugin tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289359 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 01:37:39 +00:00
Brett Leslie Porter 9262d5171e PR: MNG-898
Submitted by: Magne Rasmussen
Reviewed by:  Brett Porter
Allow overriding classes/resources in tests.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289354 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 00:58:58 +00:00
Kenney Westerhof c9bf147e29 o EclipsePlugin now does NOT download sources by default.
Specify -Declipse.downloadSources=true to do so.

o WarMojo produces an artifact, even if exploded is specified. This makes sure
  that the install phase doesn't fail because there's no artifact.

o DependenciesReport: add caught exception to the new thrown exception
  for better messages.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289353 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 00:37:58 +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
Kenney Westerhof 334b952859 o Did some refactoring: moving utility methods to EclipseUtils so there's no
confusion as to which project is used.

o Use executedProject everywhere except for acquiring the artifact list; the 
  executedProject misses that list (that's because no deps are resolved in
  the forked lifecycle execution; it's delayed until the plugin is encountered
  and it's requiresDependencyResolution is seen.)

o Added flag -Declipse.downloadSources=true|false to skip source downloading


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289188 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 10:14:32 +00:00
Brett Leslie Porter a72cf986ac updated repository ids
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289180 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 08:42:04 +00:00
Kenney Westerhof a3eede2515 Removed unused MavenProject parameter.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289178 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 08:33:42 +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
John Dennis Casey 22adefde14 Fixing case where non-POM artifacts are passed to the project builder for parsing...doing defensive construction of POM artifacts inside the project builder, and fixed the call in the DependenciesReport.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280903 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 18:38:54 +00:00
Vincent Siveton eb89e520e4 MNG-891(Javadoc fails to include libraries): Readded cmd.createArgument().setValue( ... ) for all elements in the arguments list; Formatted code.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280832 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 12:09:06 +00:00
Brett Leslie Porter 6c2fbc16a7 use component release
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280799 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 07:37:03 +00:00
Brett Leslie Porter fd4eb4c1d2 some dependency clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280759 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 04:08:29 +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
John Dennis Casey 62552ef4ab Added beginnings of DescribeMojo, and added setters for all mojo parameters in the plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280661 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 21:16:15 +00:00
Kenney Westerhof 4bbf7a627c Fix MNG-873
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280592 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 17:06:14 +00:00
Kenney Westerhof 5777c1ac9f Forgot these two:
o repository metadata: use FQCN

o verifier plugin: use non-deprecated notation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280561 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 14:26:34 +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
Kenney Westerhof 8e47a7e719 Changed modello-maven-plugin version to 1.0-alpha-4 since alpha-5
hasn't any snapshots released yet.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280540 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 11:44:19 +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 459737fa5f Resolving MNG-851. Using MavenProject.getFile() rather than constructing new. Also fixed maven-deploy-plugin with similar bug.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280405 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 20:08:01 +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
Brett Leslie Porter e635816bcd reorganise but leave commented out
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280330 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 12:45:06 +00:00
Brett Leslie Porter 6b229cd09a PR: MNG-824
Submitted by: Edwin Punzalan
Reviewed by:  Brett Porter
add goals that are in the m1 version


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280260 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 05:32:22 +00:00
Brett Leslie Porter fe3df1bd1d PR: MNG-760
Submitted by: Fabrizio Giustina
Reviewed by:  Brett Porter
m2 eclipse plugin improvements (source download and attachment, customization of natures/builders/conclasspath, flexible project dupport) and refactoring
(applied with modifications)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280259 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 05:27:40 +00:00
Brett Leslie Porter 40738a5a86 PR: MNG-613
clean up

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280241 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 03:13:50 +00:00
Vincent Siveton f6cc2c6b9b MNG-560: Added initLocalesList() and codeToLocale() methods to honnor correctly locales parameter; Added how to documentation to contribute a new translation; Added a test project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280130 13f79535-47bb-0310-9956-ffa450edef68
2005-09-11 13:24:56 +00:00
Stephane Nicoll 42718256a5 MNG-853: added Javadoc and parameter's documentation.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280101 13f79535-47bb-0310-9956-ffa450edef68
2005-09-11 09:48:34 +00:00
Stephane Nicoll d18e4b8a1b MNG-852: added Javadoc and parameter's documentation.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280096 13f79535-47bb-0310-9956-ffa450edef68
2005-09-11 08:43:37 +00:00
Jason van Zyl bb35ab5dfc o removing yet more references to the old cruft
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279899 13f79535-47bb-0310-9956-ffa450edef68
2005-09-09 22:39:43 +00:00
Stephane Nicoll 54d740b70b MNG-420: provides a default jdkName based on the java.version system property.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279847 13f79535-47bb-0310-9956-ffa450edef68
2005-09-09 19:19:39 +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
Vincent Siveton f4239df692 Corrected getConfigFile() by specifying sun as default config file; added log4j.properties to remove warn for org.apache.commons.beanutils.BeanUtils; formated code; added copyright to pom.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279769 13f79535-47bb-0310-9956-ffa450edef68
2005-09-09 13:31:51 +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
Emmanuel Venisse e98d10f444 Fix mail notifier configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279526 13f79535-47bb-0310-9956-ffa450edef68
2005-09-08 07:26:56 +00:00
Kenney Westerhof b2c8100048 adding required phase 'generate-sources'.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279412 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 20:07:39 +00:00
Kenney Westerhof a35354aceb fixed possible corrupted source path when there are more compileSourceRoots.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279407 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 19:45:54 +00:00
Stephane Nicoll 368a03839f updated developers section.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279403 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 19:30:51 +00:00
Stephane Nicoll 9da3f0d5ff MNG-826:
- Jar dependencies are not included in the generated application.xml ; Hence 'library' is the default behavior and has been removed
- Added includeInApplicationXml property on JavaModule to allow it to be included in the generated application.xml

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279376 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 16:37:45 +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
Trygve Laugstol 7d198eb4ad o Adding licenses.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279318 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 13:12:56 +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
Brett Leslie Porter 3a4efa1029 PR: MNG-613
make sure versions are aggregated

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278961 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 09:52:37 +00:00
Brett Leslie Porter cb2370199b PR: MNG-613
deploy snapshot information to the correct directory and fix some other minor issues

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278930 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 06:58:44 +00:00
Brett Leslie Porter 8f3c207194 PR: MNG-613
changes versioning to use repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278881 13f79535-47bb-0310-9956-ffa450edef68
2005-09-05 23:12:55 +00:00
Trygve Laugstol 488cac14ff o Adding newline at end of file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278605 13f79535-47bb-0310-9956-ffa450edef68
2005-09-04 15:56:52 +00:00
Brett Leslie Porter 9d9251e843 remove unneeded dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278551 13f79535-47bb-0310-9956-ffa450edef68
2005-09-04 03:05:38 +00:00
Brett Leslie Porter 82ac502e78 PR: MNG-833
Submitted by: Christoph Sturm
Reviewed by: Brett Porter
o fix NPE
o allow linking of projects in the reactor as modules

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267532 13f79535-47bb-0310-9956-ffa450edef68
2005-09-04 01:13:15 +00:00
Brett Leslie Porter 66869b1f65 PR: MNG-811
Add default excludes after the main excludes are set so that they don't get overwritten.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267436 13f79535-47bb-0310-9956-ffa450edef68
2005-09-03 08:00:53 +00:00
Brett Leslie Porter efa3609d70 PR: MNG-819
Submitted by: Edwin Punzalan
Reviewed by:  Brett Porter
Add maven1 features to the checkstyle plugin


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267435 13f79535-47bb-0310-9956-ffa450edef68
2005-09-03 07:47:53 +00:00
Brett Leslie Porter b99fec5c6d PR: MNG-822
Submitted by: Edwin Punzalan
Reviewed by:  Brett Porter
EAR improvements


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267433 13f79535-47bb-0310-9956-ffa450edef68
2005-09-03 07:34:07 +00:00
Kenney Westerhof c23770947f o Finished MNG-632.
Note: I'm not sure wheter my tmpDir approach is the best.
  It's certain to work all the time (depending on FileUtils.createTempFile),
  but it may leave a lot of 'garbage' in target/.

o Updated maven-core's assembly descriptor to make use
  of new line endings functionality.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267344 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 23:01:56 +00:00
Kenney Westerhof 9da1858237 Fixed IndexOutOfBouds when <sourceDirectory></sourceDirectory> is specified.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267278 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 19:15:27 +00:00
Trygve Laugstol cf8820b905 Fixing MNG-825: "Clean plugin should fail if unable to delete target"
o Changed the default from complaining through the logger to throwing an
  exception.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267218 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 14:56:22 +00:00
Brett Leslie Porter abd4ae6018 PR: MNG-613
make repository metadata behave more like snapshots with daily updates.
next step is to move the version checking to use that instead and fallback to the old files

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@266298 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 07:16:16 +00:00
Trygve Laugstol 4bfe2cc1ab Fixing MNG-810: "create a mojo goal named -> javadoc:jar"
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@265765 13f79535-47bb-0310-9956-ffa450edef68
2005-09-01 19:11:49 +00:00
Brett Leslie Porter 9b6a7939db rename group metadata
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@265618 13f79535-47bb-0310-9956-ffa450edef68
2005-09-01 01:56:04 +00:00
Vincent Massol 3b1f894e37 MNG-813: Expose the m2 local repository location to the junit tests using the "localRepository" system property.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@265582 13f79535-47bb-0310-9956-ffa450edef68
2005-08-31 20:49:49 +00:00
Brett Leslie Porter 6731a0485b updated API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264971 13f79535-47bb-0310-9956-ffa450edef68
2005-08-31 08:21:35 +00:00
Brett Leslie Porter c991b41571 refactoring towards similar pattern of artifact metadata
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264967 13f79535-47bb-0310-9956-ffa450edef68
2005-08-31 08:11:47 +00:00
Kenney Westerhof 6fdbe554dd o Fixed tabs -> spaces (sorry, makes diff hard to read) and some codingstyle
issues.

o Modified model: added a 'BaseSet' type as a basetype
  for DependencySet and FileSet; it contains fileMode and
  directoryMode to work with the new plexus-archiver.

o Bumped plexus-archiver version to 1.0-alpha-2-SNAPSHOT.

o Added support for actually using fileMode and directoryMode.
  (tested this with a modified maven-core assembly descriptor,
  not committed as a test though).



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264888 13f79535-47bb-0310-9956-ffa450edef68
2005-08-30 22:57:50 +00:00
Brett Leslie Porter e0457b0204 PR: MNG-613
reorganise in preparation for generalised repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264091 13f79535-47bb-0310-9956-ffa450edef68
2005-08-29 06:37:33 +00:00
Brett Leslie Porter 7a8c848b01 PR: MNG-788
bring back the "filtering" attribute in resources from m1


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@263841 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 07:18:35 +00:00
Vincent Siveton 9ef6cc7f50 Cleaning up the code a bit: replace static array of all reports file name generated by Maven by a list (more dynamic); the first token in the locales variable is the default locale (set in the VM); create createDuplicateExceptionMsg() to handle the exception msg when some files are duplicated; move code to generate reports in a new method called generateReportsPages(); improve logging.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240444 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 18:16:19 +00:00
Vincent Siveton cafb004caf Added a test in the banner macro to remove Velocity error (RHS of #set statement is null. Context will not be modified....)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240337 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 20:40:17 +00:00
Brett Leslie Porter b380d0e2d4 make the ordering predictable by sorting the key set.
Switched the key to be the simpler eclipse source root link name.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240187 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 08:05:47 +00:00
Brett Leslie Porter 22365aeefe fix tests:
- ordering of link elements was wrong
- windows path separator was wrong


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240180 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 07:46:12 +00:00
Kenney Westerhof a98961eeed o Fix MNG-410 (and MNG-769, MNG-738). Added testcase project-3 to demonstrate this.
o Added testcase to check generation of eclipse files in
  different location; modified the testcase to support this,
  and deal with the absolute paths.

o Neatified the addSourceLinks/addResourceLinks: using
  a map to keep track of duplicate source folders has the side
  effect of only needing one of those methods; it should
  also be faster :)

o Tried to add support for includes/excludes, but eclipse only
  supports unique source directories; this is typically not the
  case in maven, filters are used to split one resourcedir
  up. Left the code in for future reference.
  TODO: find a way to merge includes/excludes. If only
  the dir where in/excludes are specified is unique, they
  could be written without problem. This requires a preprocessing
  pass.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240143 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 21:28:30 +00:00
Kenney Westerhof ca3882cde6 o Fix MNG-781 (skip null configurations).
That issue is now renamed to the more general problem.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239964 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 23:26:32 +00:00
John Dennis Casey b935ee1b58 Fixing String.replace(..) problems in AbstractCompilerMojo.java
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239674 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 14:54:33 +00:00
Brett Leslie Porter 3576f334b6 add optional logging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239663 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 13:50:09 +00:00
Trygve Laugstol 7f9ca76326 o Cleaning up the code style a bit:
- removing usage of this. as a prefix for referencing local variables
 - renaming public_, private_ and protected_ to showPublic, etc.
 - removing usage of final.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239601 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 11:12:26 +00:00
Vincent Siveton c29e4dbabc MNG-754: Added artifact information in the exception
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239599 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 10:56:50 +00:00
Trygve Laugstol 7c55d5cfb2 o Adding a missing part of Rod's last patch.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239596 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 10:27:28 +00:00
Brett Leslie Porter bc77a5ba07 PR: MNG-758
add @component tag for requirements

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239397 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 12:28:54 +00:00
Kenney Westerhof d6bd62e537 o Fixed MNG-772: applied Jesse McConnell's patch with minor style adjustments,
and did some more code cleanup.

o Tracking with projects have been referenced in order to stop adding the same
  project twice if there's a dep on more than one artifact attachment from a
  project.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239392 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 11:31:46 +00:00
John Dennis Casey 78bd69c44c Resolving: MNG-643
o Added includes/excludes for compile and testCompile
o added integration tests for single execution of compile and testCompile with excludes
o Added integration test for multiple execution of compile in different phases per Dan Tran's request

The bulk of this commit is KrisBravo's work (I think that's who Corridor Software Developer is??). Thanks for the help.




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239272 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 23:14:34 +00:00
Trygve Laugstol b88302c209 Fixing MNG-710: "Add ability to fork the maven-compiler-plugin"
Patch created by Rod Coffin.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234499 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 14:43:26 +00:00
Stephane Nicoll 30804e163a Now allowing custom manifest file to be set in the generated EAR file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234462 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 10:08:55 +00:00
Stephane Nicoll a20c98aa76 Removed excludedDependencySet as it has been implemented another way
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234200 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 13:29:05 +00:00
Brett Leslie Porter 4e79a1aa80 forgot why they were wrapped in an array list...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233443 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 07:11:44 +00:00
Brett Leslie Porter cc276e2e2a forgot the import
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233441 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 06:45:34 +00:00
Brett Leslie Porter 3c460805af PR: MNG-746
allow naming of TestCase as well as Test


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233437 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 06:22:20 +00:00
Brett Leslie Porter 28813de005 PR: MNG-479
workaround for failed unzipping of site. proper fix will require WAGONSSH-5 to be fixed.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233435 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 06:04:54 +00:00
Brett Leslie Porter 1afa38d91e add todir on batchtest to save reports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233431 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 04:27:34 +00:00
Trygve Laugstol d20e899dc8 o Adding support for using compilers that produce an single output file like
C#.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233318 13f79535-47bb-0310-9956-ffa450edef68
2005-08-18 13:36:54 +00:00
Trygve Laugstol 5aff0defc2 o Replacing hardcoded path separator ';' value with ${path.separator}.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233315 13f79535-47bb-0310-9956-ffa450edef68
2005-08-18 12:49:31 +00:00
Trygve Laugstol bea3c7f17b o Throwing an exception if the procotol isn't 'scp' as that's the only protocol
this provider currently supports.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233310 13f79535-47bb-0310-9956-ffa450edef68
2005-08-18 12:13:47 +00:00
Kenney Westerhof 3dcf43d418 Added support for custom project settings. Currenly only source/target/compliance level
is supported. It is extracted from the maven-compiler-plugin configuration and only
written when the settings deviate from the default.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233267 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 22:31:48 +00:00
John Dennis Casey 659a1f4736 Fixing some things:
o Artifact attachment via MavenProjectHelper was using string literals of the variables I was trying to use to fill in type and classifier (dumb, I know!)

o Source plugin didn't have an @phase for the JarSourceMojo...added, then added the goal configuration in the release profile in the super-pom

o Removed the source plugin bindings for the lifecycle mappings in maven-core

o Re-added [deprecated] method MavenProjectBuilder.build( File, ArtifactRepository, List )...you should use MavenProjectBuilder.build( File, ArtifactRepository, ProfileManager ) instead.

o Added profile handling/injection for the super-pom in two places: in buildStandaloneSuperPom() and in private build(..). This enables injection of the release profile which is provided in the super-pom.

o Added integration test to verify that using -DperformRelease=true results in the sources being attached...to override this behavior, another profile keyed on -DperformRelease could turn the 'attach' param for the source plugin off.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233245 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 19:23:45 +00:00
John Dennis Casey 345798c7ab Removing attached-Artifact creation code, replacing with MavenProjectHelper.attachArtifact(..).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233049 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 20:19:38 +00:00
Trygve Laugstol e21120a0a4 Fixing MNG-478: "war:war warSourceExcludes parameter not used when set in the
POM".
Patch created by Greg Case, thanks for your work!


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233048 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 19:54:30 +00:00
John Dennis Casey 7d4f3428fd Forgot to remove the SNAPSHOT check...this should close MNG-483
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233029 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 18:23:05 +00:00
John Dennis Casey 9a3085813d Working on MNG-483
o Added @requiresDirectInvocation (was: @cliOnly, but this implies m2 is run from CLI...counter-intuitive for embedding)

o Added handling for new @requiresDirectInvocation (generation/parsing, MojoDescriptor support, etc.)

o Added check in DefaultLifecycleExecutor to throw a LifecycleExecutionException if a mojo specified in a lifecycle binding is marked as direct-invocation only.

o Added MavenProjectHelper/DefaultMavenProjectHelper to provide convenience methods for manipulating MavenProject instances (for example, attaching artifacts or adding resources)

o Removed maven-artifact dependency from maven-source-plugin, and added dependency on maven-plugin-api (should've been there)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233021 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 18:03:20 +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 531c1c4f79 Applying patch from Jason Grant for unpacking assemblies and for attaching assemblies as attached artifacts - Thanks, Jason
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233012 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 16:21:39 +00:00
Vincent Siveton 6db6fb8909 MNG-722: Applied changes proposed by Incze Lajos, ie using OutputStreamWriter(FileOutputStream(...), outputEncoding) instead of FileWriter(...). Added also the outputEncoding parameter in the default-site.xml.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232989 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 12:47:25 +00:00
Trygve Laugstol b584a47541 o Removing comment about no contributors.
o Changing the promt from "$>" to "$ ".


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232887 13f79535-47bb-0310-9956-ffa450edef68
2005-08-15 21:38:11 +00:00
Trygve Laugstol 4de1c8c892 Fixing MNG-623: "Improve the exclusion / inclusion of a dependency inside the
ear"
Committing on behalf of Stephane Nicoll.
Provides two new flags to customize ear modules: 

* excluded ; if set the module is not bundle in the EAR file 
* library ; if set the java module is considered as a 3rd party library and no
  entry is generated in the application.xml 
 
The patch also update the documentation.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232833 13f79535-47bb-0310-9956-ffa450edef68
2005-08-15 16:46:12 +00:00
Vincent Massol a10ae839cb MNG-736: Move ear source directory to comply with other plugin's structure. Applied on Stephane's behalf.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232787 13f79535-47bb-0310-9956-ffa450edef68
2005-08-15 10:37:30 +00:00
Kenney Westerhof aefdc2b95d Set project's basedir on the ant Target so relative paths
work.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232502 13f79535-47bb-0310-9956-ffa450edef68
2005-08-13 15:04:18 +00:00
Kenney Westerhof f14a81d454 Moved execution code to abstract base class, so other ant-enabled plugins
may use this more easily.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232501 13f79535-47bb-0310-9956-ffa450edef68
2005-08-13 15:01:24 +00:00
Kenney Westerhof 59128be85b Making sure there is always a filter present, to prevent malfunctioning
plugin configuration code disabling running any tests.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232500 13f79535-47bb-0310-9956-ffa450edef68
2005-08-13 14:58:04 +00:00
Trygve Laugstol 9fa2ff16f6 o Updating to the latest Plexus compiler API.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231478 13f79535-47bb-0310-9956-ffa450edef68
2005-08-11 16:14:18 +00:00
Vincent Siveton a133047280 MNG-722: added a new outputEncoding parameter in the DoxiaMojo class. Updated the maven-site.vm
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231433 13f79535-47bb-0310-9956-ffa450edef68
2005-08-11 12:28:52 +00:00
Kenney Westerhof 7fa0cc72c3 Donating maven-antrun-plugin to the Maven2 project, as discussed with Brett.
Enjoy! :-)

TODO:

o make <echo>...</echo> output visible.

o devise a way to pass on maven2 properties to <ant/>-called build.xml files.
  The ant code just copies all properties from the default PropertyHandler,
  however with m2 that's not possible since they are resolved/evaluated at
  runtime.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231230 13f79535-47bb-0310-9956-ffa450edef68
2005-08-10 13:38:21 +00:00
Kenney Westerhof ad947569c8 MNG-692, continued: also update project.artifact.file for War.
I'm leaving it alone for non-war (i.e. exploded/inplace webapp) generation.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231199 13f79535-47bb-0310-9956-ffa450edef68
2005-08-10 09:16:23 +00:00
Trygve Laugstol 0afba79871 o Updating WRT the latest plexus-api.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231064 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 17:03:55 +00:00
John Dennis Casey 1e1efffcba Resolving: MNG-592 (again)
o Modified the PluginMappingDeployMojo in maven-plugin-plugin to always deploy the plugins.xml regardless. This may be a bit heavy, but it avoids the snag with the plugins.xml being detected in the local repository after the install phase runs...plugin mappings weren't making it to the repository during deploy.

o Added a new series of IT: it2xxx which will be tests that require more than a single maven invocation, and will be run via shell script, at least for now. This one builds and deploys a plugin, then attempts to use the plugin by referencing the prefix mapping in the (non-central) remote repository.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231058 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 16:11:40 +00:00
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
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
Brett Leslie Porter 813a3b8040 fix NPE in dependencies report
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220050 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 12:37:43 +00:00
Brett Leslie Porter 186f48083f remove unnecessary report components definitions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220046 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 12:28:58 +00:00
Brett Leslie Porter ed7ccf707a PR: MNG-530
don't attempt to configure non-report mojos during reporting



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220042 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 12:18:35 +00:00
Brett Leslie Porter 5a0904e9fd PR: MNG-366
separate api from implementation keeping most of doxia, reporting and other libraries out of the core



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220009 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 06:54:21 +00:00
Brett Leslie Porter 5565016f24 refactor duplicate code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219990 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 03:11:07 +00:00
Brett Leslie Porter 82cc3271a2 set eol style
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219986 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 02:26:20 +00:00
Brett Leslie Porter 1d028ff436 move reports into maven-plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219985 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 02:20:27 +00:00
John Dennis Casey 99bdd48d92 Bumping plexus-utils version to 1.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219984 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 02:17:16 +00:00