Commit Graph

127 Commits

Author SHA1 Message Date
John Dennis Casey a321da38d6 PR: MNG-1525
Submitted By: Edwin Punzalan
Reviewed By: John Casey

NOT applying this patch. I found a better solution that will factor the interpolation of the POM into a flexible utility in plexus-utils, and will allow introduction of envar resolution to the POM. It will also make interpolating the settings.xml and profiles.xml using any of a number of expression resolvers (using envar resolution only for now).

BTW, I tried using System.getenv(..) in JDK1.4, and it fails with java.lang.Error and a deprecation message. So, I'm using Edwin's code to extract the envars into a Properties object. We can improve this later.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354462 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 16:28:07 +00:00
John Dennis Casey 896baf2832 PR: MNG-897
Fixing abstract scripted mojo descriptor extractor to properly construct script resource directories. Also, cleaned up the usage integration test. Ant support works now, but we need to decide what version this should be released under. It will involve re-releasing the plugin-plugin, to take advantage of the new maven-plugin-tools-api, I think.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@329948 13f79535-47bb-0310-9956-ffa450edef68
2005-11-01 01:25:19 +00:00
John Dennis Casey e21bf422e1 Switching to use AbstractScriptedMojoDescriptorExtractor and scriptSourceDirectory.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@328904 13f79535-47bb-0310-9956-ffa450edef68
2005-10-27 15:53:56 +00:00
John Dennis Casey 008685017d changing feedback for plugin extractor usage to be a little more visible.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@328903 13f79535-47bb-0310-9956-ffa450edef68
2005-10-27 15:52:53 +00:00
Brett Leslie Porter 6658ef65e3 avoid "unused" error
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327883 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 23:32:05 +00:00
John Dennis Casey 1dca6e1b69 Restoring 2.0.1-SNAPSHOT maven dependency versions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326374 13f79535-47bb-0310-9956-ffa450edef68
2005-10-19 04:17:20 +00:00
John Dennis Casey 0fd68fb754 Ant support is working. I want to revisit the testing before I let it go, though.
o Added maven-script-ant to wrapper Ant-based Plexus components in a Mojo-compliant shell

o Added maven-plugin-tools-ant to extract plugin descriptor metadata from Ant-based plugin sources

o Revised the maven-plugin-tools-model, which can be used as a generic companion metadata file for things like Ant-based mojos. It now includes an analogy to @parameter default-value=""

o Added javadoc format for DefaultWagonManager, correcting the name of an exception thrown by the configureWagon() method.

o Changed the required version of maven-plugin-tools-api in the plugin-plugin to 2.0.1-SNAPSHOT, to accommodate changes in the script-based mojo descriptor extractor API. This allows companion metadata files for mojo scripts, as in the case of Ant.

o Removed maven-plugin-tools-beanshell from the plugin-plugin's dependencies. It can be included as a plugin-dependency in the plugin projects that need it, in similar fashion to Ant's extractors.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326372 13f79535-47bb-0310-9956-ffa450edef68
2005-10-19 04:14:13 +00:00
Brett Leslie Porter b4c041a567 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321042 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:26:39 +00:00
Brett Leslie Porter d783c5fc41 [maven-release-plugin] prepare release maven-2.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321040 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:15:39 +00:00
John Dennis Casey 7df3803ef7 Fixing some missing descriptor description fields.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@315026 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 20:22:36 +00:00
Brett Leslie Porter 10a8e05df6 clean up project exception handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@314994 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 18:49:01 +00:00
Brett Leslie Porter 510de4fe54 upgrade plexus utils to 1.0.4-SNAPSHOT.
The group ID has changed, so add a bunch of exclusions to ensure the old is not picked up
fix bugs in mboot that wasn't honoring excludes.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307294 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 14:13:31 +00:00
Brett Leslie Porter bd41253cba handle boolean properties correctly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307041 13f79535-47bb-0310-9956-ffa450edef68
2005-10-07 07:25:50 +00:00
Brett Leslie Porter 192de6841a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293588 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:13:52 +00:00
Brett Leslie Porter b4e4a1f375 [maven-release-plugin] prepare release maven-2.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293584 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:02:48 +00:00
Brett Leslie Porter ceb990be61 remove marmalade references
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293478 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 00:51:29 +00:00
Brett Leslie Porter 3c53b31ce0 move marmalade code out of main bootstrap, into sandbox.
it should be moved to the marmalade project (either a straight import, or doing an svndump of that area of the repo).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293363 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 14:50:34 +00:00
Brett Leslie Porter ae1a7b9580 PR: MNG-644
remove deprecated tag

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293342 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:29:10 +00:00
Emmanuel Venisse cce67f6caa Allow to use a role-hint in parameter expression
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293284 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 09:45:43 +00:00
Brett Leslie Porter c5acaded88 upgrade to plexus 1.0-alpha-7 container, switching to new group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293193 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 00:54:01 +00:00
Brett Leslie Porter ddfcc65d55 PR: MNG-817
add goal="..." to @execute

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292125 13f79535-47bb-0310-9956-ffa450edef68
2005-09-28 05:09:14 +00:00
John Dennis Casey cd60968a2a Working on: MNG-897...added AntMojoDescriptorExtractor, PluginMetadataParser, and made small changes to the plugin metadata model used by scripts like Ant. This should be complete, except for wiring into the tool front-ends and testing with an Ant-based plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291823 13f79535-47bb-0310-9956-ffa450edef68
2005-09-27 04:46:37 +00:00
Brett Leslie Porter 27bc0aea4d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291643 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:30:36 +00:00
Brett Leslie Porter 80c8e188b8 [maven-release-plugin] prepare release maven-2.0-beta-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291641 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:18:55 +00:00
John Dennis Casey 9f80023fce First pass at generic, XML-based metadata model for mojo descriptors. Planning to embed this in XML comments within Ant build.xml files, etc.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291424 13f79535-47bb-0310-9956-ffa450edef68
2005-09-25 15:10:52 +00:00
Brett Leslie Porter 8858d8f85c PR: MNG-629
preparing for executing the lifecycle by passing reports into the site plugin, rather than extracting them from the plugin manager

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290634 13f79535-47bb-0310-9956-ffa450edef68
2005-09-21 06:45:50 +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 06ab86cb54 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289368 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:57:16 +00:00
Brett Leslie Porter 5632e45815 [maven-release-plugin] prepare release maven-2.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289366 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:50:12 +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
Jason van Zyl 843ed8061a o allowing the specification of the bean property that should be used for
reading/writing configuration values. I briefly discussed this with John but
  is up for discussion. We felt the most "bean" like way would be to allow
  something like the following:
  
  @parameter property="project"
  
  Which would mean that for that particular field to read/write it a
  getProject() and setProject(Project) method would be present.
  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279997 13f79535-47bb-0310-9956-ffa450edef68
2005-09-10 12:12:40 +00:00
Jason van Zyl 88af3474a0 o removing references to removed classes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279894 13f79535-47bb-0310-9956-ffa450edef68
2005-09-09 22:13:53 +00:00
Jason van Zyl 42ff197960 o getting rid of old cruft that has long since been useful
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279875 13f79535-47bb-0310-9956-ffa450edef68
2005-09-09 20:57:44 +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
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 71cb5dc399 Resolving: MNG-282
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227259 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 20:43:58 +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 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
John Dennis Casey 9d6ba0d633 Working on MNG-250...
Resolving MNG-488

o Brought the metadata tags for marmalade mojos up to snuff with the java-mojo annotations
o Added @aggregator annotation ( <aggregator>true</aggregator> in marmalade) for mojos
o Added support for aggregator flag throughout plugin-descriptor, generator, and builder.

More commits to follow...


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226329 13f79535-47bb-0310-9956-ffa450edef68
2005-07-29 03:04:38 +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
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
Emmanuel Venisse a029d766ce Update all versions to beta-1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202001 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 15:29:14 +00:00
John Dennis Casey fcbc5e7d6f Resolving: MNG-495
o Pressing [ENTER] at a plugin update prompt should result in the plugin being registered, as indicated by the prompt.
o Use CLI switch '--no-plugin-updates' to suppress usage of the plugin registry
o Use CLI switch '--update-plugins' to force updated/resolved plugin versions to be registered
o Neither of these has a short CLI option, since we're starting to run out of sensible char options for these types of things.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193082 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:03:10 +00:00
John Dennis Casey 6100b37321 Updating non-maven, non-modello deps to get rid of snapshots. Also removed marmalade stuff from mboot.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193052 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 02:31:28 +00:00
Brett Leslie Porter 543189e2fd PR: MNG-471
- correct the lifecycle instantiation
- read/write executeLifecycle in the plugin descriptor


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191416 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 08:00:53 +00:00
Brett Leslie Porter 60f4482686 change <model> to <project> in root tag.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191414 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 07:18:24 +00:00
Brett Leslie Porter dbcdd0b526 PR: MNG-471
add @execute phase|lifecycle doclet tag for java and beanshell
not sure how this would be configured for marmalade - will leave this for a once over of marmalade wrt the mojo api later


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191385 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 03:39:42 +00:00
John Dennis Casey 3e2449750d PR: MNG-414
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191311 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 23:27:40 +00:00
Brett Leslie Porter 379863a946 PR: MNG-451
Submitted by: Kenney Westerhof
Reviewed by:  Brett Porter

make configurator configurable!


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189856 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 23:22:34 +00:00
Brett Leslie Porter 420d9a5fca remove old cvs ignore files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188697 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 05:24:51 +00:00