Commit Graph

84 Commits

Author SHA1 Message Date
Brett Leslie Porter 78e74cd7fe lining up versions. still use beta-1 where appropriate
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291803 13f79535-47bb-0310-9956-ffa450edef68
2005-09-27 00:56:40 +00:00
Brett Leslie Porter cbcf2d48e1 PR: MNG-788
add filtering to the build element


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290877 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 02:52:39 +00:00
Brett Leslie Porter 73eb79c668 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289461 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 09:46:28 +00:00
Brett Leslie Porter 670aa3a838 [maven-release-plugin] prepare release maven-resources-plugin-2.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289459 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 09:46:12 +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 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 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
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
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
Trygve Laugstol e2d7c7622a o Adding missing file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209427 13f79535-47bb-0310-9956-ffa450edef68
2005-07-06 08:01:51 +00:00
Jason van Zyl f04f9ed2a6 o http://jira.codehaus.org/browse/MNG-516
Thanks to Andreas Hoheneder



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209401 13f79535-47bb-0310-9956-ffa450edef68
2005-07-06 03:09:21 +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
Brett Leslie Porter 2ebe7275bf PR: MNG-178
Submitted by: Kenney Westerhof
Reviewed by:  Brett Porter

add filtering support to the resources
(applied with modifications)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191749 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 01:21:07 +00:00
Brett Leslie Porter 6cd2e31078 refactoring of the resolveTransitiveDependencies call.
simplified by removing a bunch of duplicated code in addArtifacts - no need to merge, you have the full list. 
separated the original artifacts (dependency artifacts) from the resolved artifacts (getArtifacts)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191667 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 15:32:02 +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
John Dennis Casey d2e1f3c975 o Adding support for <executions/>, which means multiple runs of the same goal/set-of-goals with different configs.
o Adding @phase declarations for those mojos that seem to be part of the main build, just for completeness
o Added two ITs, to test that <executions/> doesn't mess up the normal operation, and to test multi-execution for a goal.

Should resolve: MNG-172.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190335 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 02:47:57 +00:00
Brett Leslie Porter 45d95aa6fb update parent references to get access to the ci settings
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189881 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 02:42:40 +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
Brett Leslie Porter 5e14491f59 use directory scanner and a sane file copy routine to avoid reading the whole thing into memory first
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178602 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 06:03:11 +00:00
Brett Leslie Porter 2f950bb514 bump versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169997 13f79535-47bb-0310-9956-ffa450edef68
2005-05-13 08:39:42 +00:00
Brett Leslie Porter 3d1c04324d use released versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169969 13f79535-47bb-0310-9956-ffa450edef68
2005-05-13 08:04:45 +00:00
Brett Leslie Porter 7ed8a746d3 update to released versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169961 13f79535-47bb-0310-9956-ffa450edef68
2005-05-13 07:01:57 +00:00
Brett Leslie Porter bcf66ca8a2 set consistent versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169845 13f79535-47bb-0310-9956-ffa450edef68
2005-05-12 16:42:06 +00:00
John Dennis Casey a58632b9dd Renamed Plugin.java, AbstractPlugin.java, PluginExecutionRe(quest|sponse) PluginExecutionException to Mojo*
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165238 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 00:12:09 +00:00
John Dennis Casey ed14ff454d Modifying the mojo generators to handle alias, and other missing elements where appropriate. Changed the resources mojos to be as trim as I can, and added @required to the field-level annotations (this might be a good thing to do for all plexus components, dunno if it's there already)...finally, trimmed up the annotation handling in the JavaMojoDescriptorExtractor to push as many annotation fields as possible into the endangered area, and started pulling as much info from the field, other companion annotations on the field, etc. as I can...I think the annotations are there, now. They need to be cleaned up after converting all the core plugins to use field-level annotations, then we're set.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164990 13f79535-47bb-0310-9956-ffa450edef68
2005-04-27 15:11:28 +00:00
John Dennis Casey 075812942b Cleaned up field-level annotations. This will be the flagship example for the new annotation style.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164944 13f79535-47bb-0310-9956-ffa450edef68
2005-04-27 04:32:32 +00:00
John Dennis Casey d8d2e34dca Resolving MNG-221, simplify qdox with field-level mojo parameter annotations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164872 13f79535-47bb-0310-9956-ffa450edef68
2005-04-26 20:30:21 +00:00
Brett Leslie Porter 874a8c1245 add more use of ${} expressions, fix problem when } was not at end
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164195 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 08:33:34 +00:00
Brett Leslie Porter a75e7d2577 improved error handling and other clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163979 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 16:41:36 +00:00
Brett Leslie Porter 05ae5c03e3 split the plugin API and the plugin descriptor code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163927 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 05:11:49 +00:00
Brett Leslie Porter 9340e1add7 release alpha-1 plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163870 13f79535-47bb-0310-9956-ffa450edef68
2005-04-08 10:05:06 +00:00
Brett Leslie Porter 935cda15da clean up dependencies.
Still need to clean up ~/maven2/lib and some large dependencies from marmalade that
shouldn't be needed in general - but down to about a 3Mb repository.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163775 13f79535-47bb-0310-9956-ffa450edef68
2005-04-05 04:11:03 +00:00
John Dennis Casey fcb7a1c14b o Simplified the ResourcesMojo to eliminate the need for a ResourceEntry class, which is easily replaced by usage of a TreeMap (avoid the NoClassDefFoundError from before SEE MNG-243)
o Changed the references to repo1.maven.org for central repository to repo1.maven.org/maven2 in preparation for switchover to ibiblio.org

    This will allow us to transparently switch between redirects and CNAME changes for referencing ibiblio.org, since ibiblio will not allow a
    vhost for m2 or a rewrite rule...switching the URL for the repo will allow changes to the CNAME (satisfy ibiblio's pathing) while at the same
    time allowing the use of redirects (redirect can be at /maven2/index.html rather than /index.html, f.e.).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163772 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 21:32:53 +00:00
Brett Leslie Porter 14bb2c805a change the maven group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163670 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 06:52:55 +00:00
Brett Leslie Porter b84d4bc35e revert <includes> and <excludes> in MDO to old format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163666 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 14:26:28 +00:00
Brett Leslie Porter 8a720065d5 fix license
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163662 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 13:34:29 +00:00
Brett Leslie Porter d0de5773b3 convert resources mojo to new execute().
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163661 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 13:33:29 +00:00
Brett Leslie Porter 5c1f5b1e57 PR: MNG-52
change type of maven plugins to "maven-plugin" instead of plugin.
This should allow other products to have different plugin types, if necessary.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163562 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 22:31:54 +00:00
Brett Leslie Porter a44b6f9726 flip pom format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163511 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 01:35:25 +00:00
Brett Leslie Porter 46edb7818f depedency update
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163462 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 07:23:31 +00:00
Trygve Laugstol 4977f19845 o Setting some additional ignores.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163289 13f79535-47bb-0310-9956-ffa450edef68
2005-01-03 06:41:15 +00:00
Emmanuel Venisse 8a83719263 Close some streams.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163245 13f79535-47bb-0310-9956-ffa450edef68
2004-12-06 10:47:39 +00:00
John Dennis Casey dac27a045a Added test for binary resource with non-standard encoding...I'm trying to get a multi-byte character encoding so it might throw off a String-based copy...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163228 13f79535-47bb-0310-9956-ffa450edef68
2004-11-03 05:16:28 +00:00
John Dennis Casey 2ce99517fa o Changed fileCopy process to use byte arrays and ByteArrayOutputStream rather than String/StringBuffer to accommodate binary [test] resources.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163227 13f79535-47bb-0310-9956-ffa450edef68
2004-11-03 03:43:31 +00:00
John Dennis Casey 24ce8263d9 o Changed to depend on plexus-0.17 instead of -0.16
o Changed the embedder/container used to be the new artifact-aware container (plexus-artifact-container-1.0-alpha-1)
o Added new dependency to maven-core for artifact-container.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163006 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 01:18:19 +00:00
Brett Leslie Porter 72d71b215f disable test again - fails under mboot because there are no transitive deps
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162979 13f79535-47bb-0310-9956-ffa450edef68
2004-08-15 06:11:07 +00:00
Brett Leslie Porter 3f60d949ba this test now works
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162974 13f79535-47bb-0310-9956-ffa450edef68
2004-08-15 04:27:04 +00:00
Jason van Zyl 8ea2d0af7b o use plexus 0.16
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162929 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 19:33:45 +00:00
Jason van Zyl d83868e9cd *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162928 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 19:10:11 +00:00