Commit Graph

375 Commits

Author SHA1 Message Date
Brett Leslie Porter fae1470d47 fix error reporting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163560 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:48:55 +00:00
John Dennis Casey 4d1ca8da33 o Removed AuthenticationInfoProvider stuff
o Added ArtifactRepositoryFactory stuff to construct with AuthenticationInfo if possible.
o Added UserModelBuilder stuff for componentizing UserModel construction.
  -> DefaultUserModelBuilder has a configuration point 'userModelPath' which can redirect where it reads user.xml from (${user.home} is substitutable here).
o Added warning message to deployment plugin when deployment repo has no authentication info available.
o Added warning message for repos with null <id/> (auth info cannot be assigned here).
o Added a couple of debug-level messages for aid in debugging repo- and userModel-related problems.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163558 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:41:06 +00:00
John Dennis Casey 56708f7983 Removed artifactId and modelVersion from inheritance assembly, as these should always be supplied by a pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163557 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:37:56 +00:00
Brett Leslie Porter ba06a10501 some clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163552 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 02:50:58 +00:00
Jason van Zyl 8f754f2bb1 o need the path translator in the core until we allow the processing of multiple plexus.xml files.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163549 13f79535-47bb-0310-9956-ffa450edef68
2005-03-14 06:31:25 +00:00
Jason van Zyl 9d2c2d6d51 o fixing construction of mojo descriptor id
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163548 13f79535-47bb-0310-9956-ffa450edef68
2005-03-13 23:52:43 +00:00
Jason van Zyl a501f4c08a o cleaning up the path translator and adding a method to allow arbitrary
path translation given a path and basedir

o moved the component configuration for the path translator into the
  plexus.xml so that the DefaultPluginManager can use it as a dependency

o DefaultPluginManager.createParameters() will now look for parameters with
  the type = java.io.File and translate the path to the basedir of the
  project.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163543 13f79535-47bb-0310-9956-ffa450edef68
2005-03-13 01:45:38 +00:00
Jason van Zyl e6d8aeb6c0 o allowing the selective execution of a set of mojos inside a plugins by
specifying a <goals/> section inside a <plugin/> configuration.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163539 13f79535-47bb-0310-9956-ffa450edef68
2005-03-12 21:54:21 +00:00
Brett Leslie Porter d179db8752 fix plugin configuration discovery
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163536 13f79535-47bb-0310-9956-ffa450edef68
2005-03-12 06:10:57 +00:00
Jason van Zyl f0a20e0bcd o not needed anymore
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163534 13f79535-47bb-0310-9956-ffa450edef68
2005-03-12 05:18:28 +00:00
Brett Leslie Porter 25be5d900a don't inherit name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163533 13f79535-47bb-0310-9956-ffa450edef68
2005-03-11 23:51:00 +00:00
Brett Leslie Porter 9b9df37a1c refactor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163532 13f79535-47bb-0310-9956-ffa450edef68
2005-03-11 23:25:00 +00:00
Brett Leslie Porter 5f424a5ac0 multi-module support
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163528 13f79535-47bb-0310-9956-ffa450edef68
2005-03-11 01:06:48 +00:00
John Dennis Casey f6c2684903 o Moved the default plugin stuff to <pluginManagement/>. Plugin config will be pulled from here and injected into <plugins/> as needed to satisfy type-handlers at runtime.
o Added the ability for DefaultMaven to load only the super-pom in the event that no pom.xml exists to initiate the assembly.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163527 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 23:01:38 +00:00
John Dennis Casey a8cb7de0b0 o Added plugin version management/enforcement through the POM's build section.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163525 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 21:36:58 +00:00
John Dennis Casey 5dc8cb4f33 o Added default of ~/.m2/repository for users who don't have ~/.m2/user.xml specified.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163519 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 16:35:04 +00:00
Emmanuel Venisse 97ad0f7800 A little fix for build correctly m2.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163514 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 09:19:53 +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
John Dennis Casey 8d74f0acc4 o Added user.xml as the central point of config for local repository, both in MBoot2 and maven proper.
o Added proxy-profile support to user.xml


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163510 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 22:13:07 +00:00
John Dennis Casey 7f6f4452f2 o Changed Set to List for remote repo handling so that we can maintain declarative ordering in remote repos we use.
o Added UserModel support, integrated with maven-artifact and wagon via AuthenticationInfoProvider implementation.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163501 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 05:48:31 +00:00
Brett Leslie Porter 1fe8c76a3d move all artifact creation to artifact factory - further refactoring planned
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163499 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 02:39:10 +00:00
Brett Leslie Porter e8a0f65e58 actually, test deps are transitive, just not for other test deps
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163496 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 07:11:43 +00:00
John Dennis Casey 77d3e6c5f5 o Added (pom|project)? to the eval pattern in the regex param extractor, to trim ${project.artifactid} to mean the same as ${artifactId} within the pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163490 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:06:22 +00:00
Brett Leslie Porter ba74921b31 formatting fix
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163489 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:05:50 +00:00
Brett Leslie Porter b5f8943edf transitive test dependencies should be ignored
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163488 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:01:43 +00:00
Brett Leslie Porter b31db60bff tests and repairs for scope
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163486 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 05:34:52 +00:00
Brett Leslie Porter a8e6af5ff9 GoalWalker was deleted
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163485 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 02:26:00 +00:00
Trygve Laugstol 9bebbc1023 o Improving some error reporting.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163484 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 01:55:22 +00:00
Brett Leslie Porter eb1ba08fac getRuntimeClasspathElements
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163483 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 01:51:20 +00:00
Brett Leslie Porter 0d7111f7ba gone to maven-artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163479 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 01:38:51 +00:00
Brett Leslie Porter 1d615cd239 turn on logging, resolve some issues surrounding test dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163473 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 23:02:43 +00:00
Brett Leslie Porter d514fff118 clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163472 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 22:08:23 +00:00
Brett Leslie Porter 47da41f68e refactor source roots to be lists
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163470 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 20:56:23 +00:00
Brett Leslie Porter 72a993eea1 remove old code related to the previous goal structure
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163469 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 19:21:38 +00:00
John Dennis Casey 2513cb25aa o Added <pluginManagement/>
o Removed goal decoration.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163468 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 19:03:19 +00:00
Brett Leslie Porter 6c36fe6f71 add basic test dependency handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163466 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 09:41:55 +00:00
Brett Leslie Porter 8c6292c23f remove <file>, add <scope>
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163463 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 08:15:26 +00:00
Brett Leslie Porter 1f205ca4c0 exclude wagon-api from resolution, it comes from core
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163460 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 07:22:49 +00:00
Brett Leslie Porter 5eb67a452f add private key, passphrase until we have them in the user configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163459 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 05:02:31 +00:00
John Dennis Casey dfbae27c44 o Added first-pass logging and event-monitoring impls. Converted all System.out calls in maven-component plugins to use logger.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163457 13f79535-47bb-0310-9956-ffa450edef68
2005-03-04 09:04:26 +00:00
Jason van Zyl fe4cb5e0bb o moving the snapshot handling to maven-artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163455 13f79535-47bb-0310-9956-ffa450edef68
2005-03-03 15:33:06 +00:00
Brett Leslie Porter bc4d75dedb must initialise the whole plugin, even if already loaded, as only some mojos may have been processed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163453 13f79535-47bb-0310-9956-ffa450edef68
2005-03-03 11:42:30 +00:00
Brett Leslie Porter 30eedfb626 add missing error message when the package goal is not found
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163451 13f79535-47bb-0310-9956-ffa450edef68
2005-03-03 11:19:45 +00:00
Emmanuel Venisse 6211437619 - Allow recursive evaluation
- Allow evaluation for default value


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163446 13f79535-47bb-0310-9956-ffa450edef68
2005-03-02 12:29:03 +00:00
Brett Leslie Porter 11e305e84f clean up exceptions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163444 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 07:05:33 +00:00
Brett Leslie Porter 418aa443dd clean up exceptions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163443 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 06:43:13 +00:00
Brett Leslie Porter d4396153d0 start to push the lifecycle definition towards the type handlers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163439 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 04:35:54 +00:00
Brett Leslie Porter 7f4dc2f9c0 error handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163437 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 04:03:24 +00:00
Brett Leslie Porter 7b1ca71aac each task on the CLI is to be executed individually - don't preprocess all the goals.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163432 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 22:57:39 +00:00
John Dennis Casey 95d01ff572 o Completed marmalade-mojo support, tested with m2 bootstrap with empty local repo and maven-core pegged at 2/26/2005.
Will resolve CI issues as soon as lifecycle is fixed for IT0013.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163430 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 18:29:47 +00:00
Brett Leslie Porter ab5308649d Make sure loop is correctly aborted if there is a failure
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163429 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 03:06:07 +00:00
Brett Leslie Porter 1d2c0d1d46 simple recognition of plugin for current type
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163427 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 23:47:29 +00:00
Brett Leslie Porter bd54ac838b allow plugins to be disabled (to override inheritence)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163425 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 22:34:01 +00:00
Brett Leslie Porter 21f1cffa59 compile based on source roots
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163423 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 21:51:52 +00:00
Brett Leslie Porter 236dc52410 configure phases based on configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163422 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 21:22:18 +00:00
Brett Leslie Porter 50759a44cf pre-process plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163420 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 06:19:13 +00:00
Brett Leslie Porter d5d05a51c5 start to enhance the lifecycle. Need to pre-process plugins as currently goals are only executed if added to a phase after the current goal. Also need plugin configuration to activate these changes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163419 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 05:39:55 +00:00
John Dennis Casey db65155072 o Working on getting it0015 (marmalade-mojo support) working...nearly there, it0015 is still disabled.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163415 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 05:09:14 +00:00
Brett Leslie Porter 00a55be3cb bring back the reactor (instantiation still needs work - see comments)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163414 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 03:48:17 +00:00
Brett Leslie Porter 0e249ddc83 reintroduce execution failures
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163412 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 03:14:49 +00:00
Brett Leslie Porter 360ae403b2 refactoring to simplify - taking notes of potential clean up after lifecycle is completed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163410 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 01:23:20 +00:00
Brett Leslie Porter c31bc6b7ce clean up some artifact related code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163406 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 05:33:18 +00:00
John Dennis Casey 52de04e862 Retrying commit after updating maven-core to HEAD.
o Fixed problems with plugin-plugin (had to do with refactored plugin-tools stuff)
o Added marmalade-mojo support, although without an integration test (verified it doesn't get in the way of 'normal' functionality, though)
o Added code in mboot2 to copy marmalade-mojo support libs to ${maven.home}/lib


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163405 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 05:12:30 +00:00
Brett Leslie Porter dac661c709 path alignment for files in dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163401 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 04:37:54 +00:00
Brett Leslie Porter fd8d091275 place tests in consistent locations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163400 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 04:21:52 +00:00
Brett Leslie Porter 87b3e49afd add file to dependency, and handle in injection
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163399 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 04:16:18 +00:00
Brett Leslie Porter 4b7ab94e31 removed unused source directories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163398 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 04:15:47 +00:00
Brett Leslie Porter 423d6ab68d some better error reporting for goals that are not found
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163391 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 00:49:40 +00:00
Brett Leslie Porter 5f65f68c1b put back change I accidentally reverted
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163389 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 23:59:27 +00:00
Brett Leslie Porter c022a8807d use ${..} style interpolation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163381 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 03:56:25 +00:00
Brett Leslie Porter 4465e49559 refactoring:
- use an expression in the suport POM to set up finalName
- have interpolator and injector deal only with model


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163380 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 03:27:00 +00:00
Brett Leslie Porter c903684688 fix tests. Would like to find an alternative to utilising maven-artifact inside this class.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163379 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 02:37:39 +00:00
Brett Leslie Porter bd55c2ab5d fix bad formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163378 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 02:06:22 +00:00
Brett Leslie Porter ec94b8fe2e move injectors to a package
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163377 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 01:59:34 +00:00
Brett Leslie Porter b005ece7c4 get project reports working
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163376 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 00:06:06 +00:00
John Dennis Casey fd7587de72 o Added to ignore some classes I want around for ideas, but not to make it into the main build.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163371 13f79535-47bb-0310-9956-ffa450edef68
2005-02-20 18:09:12 +00:00
John Dennis Casey 98002718c3 o Refactored mojo/plugin generation, extraction, etc. to accommodate multiple mojo languages.
o Tested with java mojos, mboot to verify nothing broken by refactor.
o TODO: Add marmalade support tests...currently only java-mojos are supported in mboot2, so this isn't going to interrupt things.
o TODO: Once marmalade support is tested, add to the list of artifacts built by mboot2.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163369 13f79535-47bb-0310-9956-ffa450edef68
2005-02-20 16:25:22 +00:00
Emmanuel Venisse 2011539175 Use new install and deploy goals instead of jar:install and jar:deploy goals
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163368 13f79535-47bb-0310-9956-ffa450edef68
2005-02-19 14:47:09 +00:00
Jason van Zyl 49e98f5f71 o lifecycle executor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163360 13f79535-47bb-0310-9956-ffa450edef68
2005-02-16 07:25:31 +00:00
Jason van Zyl 780b693240 o the introduction of the lifecycle stuff we've been chatting about so you
can now do things like:

  m2 package

  which makes the jar

  m2 install

  which installs the jar

  m2 test

  You can also execute individual goals still like:

  clean:clean
  pom:install
  idea:idea

  Execution of goals this way will still have the dependency resolution
  flag obeyed but they are run in isolation in that pre/post goals don't
  exist anymore. You need to slot your mojos into the lifecycle.

  I will add the mechanism whereby configuring a plugin will push
  the mojo into the lifecycle.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163359 13f79535-47bb-0310-9956-ffa450edef68
2005-02-16 07:16:33 +00:00
Brett Leslie Porter 2433342e7e fix APT parse errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163357 13f79535-47bb-0310-9956-ffa450edef68
2005-02-16 01:23:55 +00:00
Brett Leslie Porter c54347e9e0 need to reinstate the non-project builder version for plexus-runtime-builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163355 13f79535-47bb-0310-9956-ffa450edef68
2005-02-15 21:39:07 +00:00
Brett Leslie Porter aad6d7c1b0 clarify integration tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163354 13f79535-47bb-0310-9956-ffa450edef68
2005-02-14 04:44:00 +00:00
Jason van Zyl dd522ff10c o little additions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163353 13f79535-47bb-0310-9956-ffa450edef68
2005-02-13 20:21:16 +00:00
Jason van Zyl 89c4612bf8 o using a snippet to extract the relevent bit out of the configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163352 13f79535-47bb-0310-9956-ffa450edef68
2005-02-13 20:09:22 +00:00
Brett Leslie Porter aa25e4562f add notes relating to alternate lifecycles (eg for site)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163351 13f79535-47bb-0310-9956-ffa450edef68
2005-02-13 03:54:12 +00:00
Jason van Zyl 734257981b o adding test class processing phase
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163350 13f79535-47bb-0310-9956-ffa450edef68
2005-02-12 17:36:42 +00:00
Brett Leslie Porter 8ad0f8f745 *very* quick download monitor. Instantiation and output to be reviewed later
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163348 13f79535-47bb-0310-9956-ffa450edef68
2005-02-10 07:09:57 +00:00
Brett Leslie Porter 1fb63ba3c0 moving repository permissions settings to a separate class - they don't belong in authentication info
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163346 13f79535-47bb-0310-9956-ffa450edef68
2005-02-09 06:17:38 +00:00
John Dennis Casey f191abe11c o First iteration of discussion on implementing marmalade scripting support for mojos.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163345 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 20:51:47 +00:00
Brett Leslie Porter 49963682a2 pass the proxy request parameters to the default wagon
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163344 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 10:32:45 +00:00
Brett Leslie Porter 67d58c8d04 clean formatting, and ensure not to munge the model's repository list while assembling the lineage
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163342 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 06:02:40 +00:00
Brett Leslie Porter 67695dec70 method only used once
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163341 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 04:39:51 +00:00
Brett Leslie Porter d783d9ce98 reduce number of classes holding on to localRepository unnecessarily
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163339 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 04:12:58 +00:00
Brett Leslie Porter 797291178f cleanup: remove the remote repository list from the MavenMetadataSource as it was only used in retrieve(), and the equivalent list can be passed directly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163338 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 03:26:06 +00:00
John Dennis Casey bf3c9c2a02 o Replaced Model/MavenXpp3Reader with MavenProjectBuilder in MavenMetaDataSource,
to take advantage of the post-processing (managed dependencies, pom interpolation,
  inheritance assembly) involved with building a project. This shoud make transitive
  dependency resolution more consistent with the rest of m2's handling of
  POM information.

  It has been tested on marmalade in the jelly-core taglib, but
  I'm not sure how to setup an integration test using the it-verifier
  to build multiple POMs in a single test, so I'm not sure how to
  setup an integration test for this.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163336 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 04:02:10 +00:00
John Dennis Casey 4f8225545e o Added pom interpolation based on regex search-and-replacement with ReflectionValueExtractor pom lookups.
o Moved ReflectionProjectValueExtractor into o.a.m.util package and renamed to ReflectionValueExtractor
o Added unit tests for interpolation
o Added integration test for interpolation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163335 13f79535-47bb-0310-9956-ffa450edef68
2005-02-03 20:54:15 +00:00
Brett Leslie Porter e480dd8d3e o add basic auth to model and lightweight wagon
o add proxy configuration in lightweight wagon
o not yet wiring in the properties from maven.properties into the repository


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163334 13f79535-47bb-0310-9956-ffa450edef68
2005-02-03 11:39:27 +00:00
Brett Leslie Porter 6503a19dfc add license, reformat to style and change failing test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163333 13f79535-47bb-0310-9956-ffa450edef68
2005-02-03 09:10:02 +00:00
John Dennis Casey 2ce3a6cbde o Fixed formats for inheritance assembler additions
o Removed unused import on defaults injector.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163331 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 22:14:46 +00:00
John Dennis Casey 64f75b8aa0 o Removed dependency validation after default injection, since this is the job of the validator (later in the project-building process)
o Reformatted using m2 eclipse formatting file.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163330 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 22:13:15 +00:00
Michal Maczka 4dfcf82eae correcting role name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163329 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 20:15:28 +00:00
Brett Leslie Porter cf673c6270 add missing note about goal aliasing
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163328 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 09:18:20 +00:00
John Dennis Casey 6eb196cc55 o Corrected issue with inheritance of <dependencyManagement/>
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163326 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 03:11:02 +00:00
John Dennis Casey da47c49f4f o Revised the defaults section to <dependencyManagement>, all builds and is happy.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163325 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 02:23:12 +00:00
John Dennis Casey 58ead792af o over-specified the dependency's properties empty-check...
Dependencies should be able to override the default properties simply
  by supplying <properties/>. This change enables that.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163324 13f79535-47bb-0310-9956-ffa450edef68
2005-02-01 22:44:43 +00:00
John Dennis Casey e687cfed61 o Added dependencyDefaults section to POM.
The nested <dependencyDefault> element closely mirrors the <dependency> element specification.
  It provides the ability to set url, artifact, properties, version for a dependency that matches on
  {groupId, artifactId, type}. Url, artifact, and version will only override the dependency's values if
  the dependency doesn't provide the value, and (in the case of url and artifact) the dependency
  doesn't provide a version (url and artifact are assumed to be version-specific).

  Properties will only be overwritten, and only in the case where the dependency
  doesn't specify them.

  Dependencies are validated after merging with defaults, since version is not required
  on either <dependency> or <dependencyDefault> but is required between the two.

o Added component interface/default impl for injecting project defaults.
o Added unit and integration tests.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163323 13f79535-47bb-0310-9956-ffa450edef68
2005-02-01 22:43:03 +00:00
John Dennis Casey cfc50a76aa o Added some discussion notes at the end of the document, since I'm not sure where else to put them.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163313 13f79535-47bb-0310-9956-ffa450edef68
2005-01-24 01:41:24 +00:00
Jason van Zyl 0575ec3c76 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163312 13f79535-47bb-0310-9956-ffa450edef68
2005-01-22 16:11:57 +00:00
Jason van Zyl 3f3c38afc9 o first copy of notes, this first push will become 3-4 pages over the course of the day, bare with me.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163311 13f79535-47bb-0310-9956-ffa450edef68
2005-01-21 15:45:41 +00:00
John Dennis Casey faaa6ba7f5 o Accidentally committed a bunch of development stuff...cleaning up.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163310 13f79535-47bb-0310-9956-ffa450edef68
2005-01-20 20:38:05 +00:00
John Dennis Casey d81fa66315 o Added imports for MavenExecutionRequest and MavenExecutionResponse.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163309 13f79535-47bb-0310-9956-ffa450edef68
2005-01-20 20:36:45 +00:00
Trygve Laugstol cd38ae43fc o Improving exception message.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163297 13f79535-47bb-0310-9956-ffa450edef68
2005-01-06 23:58:52 +00:00
Trygve Laugstol 796064a35c o Removing plexus-utils from the excludes list.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163291 13f79535-47bb-0310-9956-ffa450edef68
2005-01-04 17:56:20 +00:00
Emmanuel Venisse a45ae033dc Fix command line for cygwin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163288 13f79535-47bb-0310-9956-ffa450edef68
2004-12-30 14:04:55 +00:00
Jason van Zyl 873fc22f6d *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163287 13f79535-47bb-0310-9956-ffa450edef68
2004-12-30 05:30:46 +00:00
Jason van Zyl 153d46aa2f *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163279 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 20:50:49 +00:00
Jason van Zyl 107aa56cc5 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163276 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:43:20 +00:00
Jason van Zyl a6a0eab73d *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163275 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:32:54 +00:00
Jason van Zyl 2c809a239c o don't merge configuration if there is no project. again here we
might always want to send the super POM through for consistency.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163274 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:32:36 +00:00
Jason van Zyl ebbb80139c o if we don't have a project then we don't have any pre/post goals.
this happens when we are initializing a project. maybe for the
  initializing mode we should send in the parent POM. not sure yet.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163273 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:30:43 +00:00
Jason van Zyl 1e3e8c5073 o throw a configuration exception if a component can't be found we can't recover from that.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163272 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:29:14 +00:00
Jason van Zyl fe05b1efc9 o formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163271 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:09:31 +00:00
Jason van Zyl a605b693e8 o formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163270 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 18:59:06 +00:00
Jason van Zyl 52ab7890fc no message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163267 13f79535-47bb-0310-9956-ffa450edef68
2004-12-25 16:38:26 +00:00
Jason van Zyl 4d6c85244d o reformatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163266 13f79535-47bb-0310-9956-ffa450edef68
2004-12-25 16:35:42 +00:00
Jason van Zyl 8e02162f79 o reformatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163265 13f79535-47bb-0310-9956-ffa450edef68
2004-12-25 16:29:15 +00:00
Jason van Zyl 16036aa792 updating copyright
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163264 13f79535-47bb-0310-9956-ffa450edef68
2004-12-25 16:26:25 +00:00
Jason van Zyl 8afb73892d remove notion of maven home from the core
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163263 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 22:28:36 +00:00
Jason van Zyl 33332423f6 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163262 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 21:36:00 +00:00
Jason van Zyl a8d5efcfdb *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163261 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 20:55:54 +00:00
Jason van Zyl 47798a5834 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163260 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 20:51:45 +00:00
Jason van Zyl d7591b9f76 o move some shared execution request handling code to the super class
o cleanup the plugin manager interface, we don't need to set the local
  repository as that information is in the request and session.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163259 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 17:29:42 +00:00
Jason van Zyl 7099cca292 o we'll deal with v3 -> v4 conversion somewhere else.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163258 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 03:20:02 +00:00
Jason van Zyl 754feeadb3 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163257 13f79535-47bb-0310-9956-ffa450edef68
2004-12-23 23:46:42 +00:00
Emmanuel Venisse 0e31910a59 Use parameters
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163244 13f79535-47bb-0310-9956-ffa450edef68
2004-12-06 10:47:07 +00:00
Jason van Zyl 4d4fc115d9 o we're still using ognl-esque expressions but we don't need its syntax internally.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163242 13f79535-47bb-0310-9956-ffa450edef68
2004-12-05 22:06:34 +00:00
Jason van Zyl 3a28b21872 o removing the use of OGNL, snagged some classes from velocity to do
the plugin parameter expression evaluation.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163241 13f79535-47bb-0310-9956-ffa450edef68
2004-12-05 21:45:36 +00:00
Jason van Zyl 4eff8b0aea o Trying to keep only keep the main entry point into maven as the only classes in the top level package.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163238 13f79535-47bb-0310-9956-ffa450edef68
2004-12-05 04:16:07 +00:00
Jason van Zyl 2c09099b78 o in the contextualize method where we are getting a reference to the container but we only need the basis PlexusContainer. The only place we need the artifact enabled container is in the addPlugin method. Otherwise, in standard PlexusTestCases we will get a ClassCastException. You do not need to use an ArtifactEnabledTestCase unless you actually want to use the facilities of the artifact enabled container.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163234 13f79535-47bb-0310-9956-ffa450edef68
2004-11-14 07:13:05 +00:00
Trygve Laugstol 8d339b01b8 o Fixing a bug where the resolve dependencies flag was ignored.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163233 13f79535-47bb-0310-9956-ffa450edef68
2004-11-05 20:31:14 +00:00
John Dennis Casey 308e07f34c o Add the model's parent to the set of artifacts to be resolved. This will allow dependency poms' parent-poms' dependencies to be included in the build classpath as implicit dependencies.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163231 13f79535-47bb-0310-9956-ffa450edef68
2004-11-03 22:56:42 +00:00
Emmanuel Venisse d4fdb18d1f Set maven.repo.local system property.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163226 13f79535-47bb-0310-9956-ffa450edef68
2004-11-02 11:03:27 +00:00
Emmanuel Venisse b8d4bcaa0d Make the script resilient to changes in the classworlds JAR. It works ONLY if M2_HOME doesn't contains spaces.
If we use double quote around %M2_HOME%\\core\\boot\\classworlds-*.jar for classpath, '*' isn't interpreted by dos.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163225 13f79535-47bb-0310-9956-ffa450edef68
2004-10-28 21:08:13 +00:00
Jason van Zyl 2c8cc4ab93 o make the script resilient to changes in the classworlds JAR
Could someone try to do the same with the .bat file before I update
  to a release version of classworlds?


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163224 13f79535-47bb-0310-9956-ffa450edef68
2004-10-27 18:03:44 +00:00
Jason van Zyl 9805428ed2 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163223 13f79535-47bb-0310-9956-ffa450edef68
2004-10-26 01:15:46 +00:00
Jason van Zyl 275f002ac9 o updating to the latest wagon snapshots
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163221 13f79535-47bb-0310-9956-ffa450edef68
2004-10-26 00:42:32 +00:00
Jason van Zyl 3a09b73001 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163219 13f79535-47bb-0310-9956-ffa450edef68
2004-10-24 18:52:00 +00:00
Jason van Zyl 6d581ccb9d o don't need to block out xstream anymore, it's not a core dep any longer
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163218 13f79535-47bb-0310-9956-ffa450edef68
2004-10-24 18:31:02 +00:00
Jason van Zyl 91da8f24e7 o removal of xstream
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163214 13f79535-47bb-0310-9956-ffa450edef68
2004-10-24 18:15:08 +00:00