Commit Graph

603 Commits

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