Commit Graph

2809 Commits

Author SHA1 Message Date
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 5d3ebf4434 avoid NPE if there are no parameters in the mojo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234155 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 07:27:29 +00:00
Brett Leslie Porter 3715ac2a6c default to group ID for package
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234150 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 05:41:30 +00:00
Brett Leslie Porter 34e167076d make sure to load extensions from all projects, not just the root in a reactor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234149 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 05:16:28 +00:00
Brett Leslie Porter d89c2f1356 ignores
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234144 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 04:12:40 +00:00
Brett Leslie Porter df64719ff7 use correct parent
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233574 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 23:11:08 +00:00
Brett Leslie Porter dbfa3f51db allow no policy (usually used in tests)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233573 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 23:10:56 +00:00
Brett Leslie Porter e888e3c1af rename an old test case that is abstract, remove unused one
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233571 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 23:05:46 +00:00
Brett Leslie Porter 932caa362a PR: MNG-729
fix artifact handler instantiation when the plugin extension is declared in a project that uses that packaging itself

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233480 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 13:15:07 +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 441219f137 remove plexus definitions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233436 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 06:13:28 +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
Kenney Westerhof 02dd765d93 it0050: fixed expected results and adding it to integration-tests (again).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233263 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 21:33:02 +00:00
John Dennis Casey 4935728ade Adding warning output for when a mojo is scrubbed from a forked lifecycle, as in MNG-709.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233260 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 20:50:27 +00:00
John Dennis Casey fcc893a626 Resolving: MNG-709...scrubbing caller from forked lifecycle, and letting it run in the main lifecycle after the fork returns.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233259 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 20:45:31 +00:00
John Dennis Casey 9bd6219732 Adding inverse test of it0051.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233251 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 19:36:05 +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
Brett Leslie Porter d1a98347dd add missing root tag
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233172 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 13:33:15 +00:00
Brett Leslie Porter a21b79dfb0 add correct urls
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233160 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 11:31:31 +00:00
Brett Leslie Porter 8dda01f002 fix scm url
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233159 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 11:26:07 +00:00
Brett Leslie Porter d433048957 remove pesky, erroneous tag
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233131 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 07:14:10 +00:00
John Dennis Casey 2adbbad9da Throwing exception if infinite loop detected in phase vs. executePhase...this is probably not optimal, but it's a start.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233104 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 02:05:04 +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
Kenney Westerhof ef2ef62898 Added integration test to prove MNG-739 cannot be reproduced.
Btw, FIXME: should we, if just one include is given, take that
as the only include, or add it to the default include of **/*Test.java?


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232852 13f79535-47bb-0310-9956-ffa450edef68
2005-08-15 18:47:28 +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
Trygve Laugstol 4f377df0f9 Fixing MNG-737.
o Correcting the groupId of the plugin.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232832 13f79535-47bb-0310-9956-ffa450edef68
2005-08-15 16:39:20 +00:00
Trygve Laugstol 0a99cab561 o Improving the 'related projects' section.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232831 13f79535-47bb-0310-9956-ffa450edef68
2005-08-15 16:32:16 +00:00
Brett Leslie Porter bda3808ae5 fix the integration test after the default location changed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232798 13f79535-47bb-0310-9956-ffa450edef68
2005-08-15 11:47:18 +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
Vincent Massol 1fe703883e MNG-150: Create a rar mojo. Applied on behalf of snicoll.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232602 13f79535-47bb-0310-9956-ffa450edef68
2005-08-14 13:19:12 +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
John Dennis Casey 88d49cb04f o Improving toString for Dependency in the 4.0.0 version codeSegment in maven.mdo
o Improving error messages for ResourceDoesNotExistException in the transformations
o Adding specificity to the dependency validation stuff, to output which dependency is offending...
o Added it1013 to show off the new dependency validation stuff.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232399 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 21:55:00 +00:00
John Dennis Casey 155c0a69a7 Resolving: MNG-686...Moving <directory/> specification from Build to BuildBase to allow profiles inline within the POM to change this setting.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232336 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 17:06:38 +00:00