Commit Graph

634 Commits

Author SHA1 Message Date
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