Commit Graph

598 Commits

Author SHA1 Message Date
Benjamin Bentmann 0425ac9cb2 o Removed debugging output
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750551 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 18:58:03 +00:00
Benjamin Bentmann a27e6457b4 o Added debug logging for mirrors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750461 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 14:03:21 +00:00
Benjamin Bentmann 81b95fde8a o Removed debug logging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750434 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 12:09:21 +00:00
Benjamin Bentmann 205d7a6f48 o Added temporary debug logging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750431 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 11:58:18 +00:00
Jason van Zyl 7d14e6b520 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750361 13f79535-47bb-0310-9956-ffa450edef68 2009-03-05 07:54:36 +00:00
Jason van Zyl 0cc04bdd8a git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750352 13f79535-47bb-0310-9956-ffa450edef68 2009-03-05 07:20:02 +00:00
Jason van Zyl 7d32348c3d o no choice but to shunt the ProjectUtils which is used by the remote resources plugin into using the MavenRepositorySystem.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750324 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 06:00:07 +00:00
Jason van Zyl 74b14a5953 o use the custom settings for now
o pushing everything related to the plugin manager into one package in preparation for replacement with the plexus plugin manager


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750308 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 04:02:23 +00:00
Jason van Zyl 1a05bdac38 o use the repositories passed into the request
o make sure that mirrors are processed correctly in that the mirror that is defined must use the layout and policies of the repository it is mirroring


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750251 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 00:15:56 +00:00
Benjamin Bentmann d9bf8c6a60 o Reverted r750083 which is a bad approach with respect to embedding, instead just programmatically injected the central repo if not already given/overriden in the settings
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750098 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 18:40:33 +00:00
Jason van Zyl beedf0cf7b o restore profile manager location so that the site plugin works ...
o teach the resolution to understand when the root is local with a file present versus retrieving the root as well          


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749924 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 06:58:09 +00:00
Jason van Zyl a5fc1cfb14 o fix the mirroring code
o restore ArtifactResolver.resolve( artifact, remotes, local ) for the rr plugin


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749784 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 21:56:42 +00:00
Benjamin Bentmann aa74529144 o Added generics
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749586 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 11:48:20 +00:00
Benjamin Bentmann 352fd0a543 o Fixed handling of plugin groups
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749493 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 00:33:55 +00:00
Benjamin Bentmann ed6f76548b o Added generics
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749482 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 00:00:40 +00:00
Benjamin Bentmann db03ef60f0 o Fixed profile activation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749354 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 16:48:07 +00:00
Herve Boutemy c5571a0c78 used http://maven.apache.org/xsd/* for schema location
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748982 13f79535-47bb-0310-9956-ffa450edef68
2009-03-01 08:55:40 +00:00
Britton Isbell 74b67a85d7 Removed artifact resolver. Now just using the repositorySystem directly.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748908 13f79535-47bb-0310-9956-ffa450edef68
2009-02-28 19:22:02 +00:00
Britton Isbell b487a2fd45 Moved profile classes into main project package.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748889 13f79535-47bb-0310-9956-ffa450edef68
2009-02-28 17:26:56 +00:00
Britton Isbell 7040079ca9 Replaced the old profile injector code with new profile code. Merged project builders.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748609 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 17:28:54 +00:00
Jason van Zyl f2d3908905 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747888 13f79535-47bb-0310-9956-ffa450edef68 2009-02-25 18:28:39 +00:00
Jason van Zyl 4aea96aeb2 o use the artifact resolution request/result method to remove another couple methods from the repository system
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747658 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 04:55:59 +00:00
Jason van Zyl 00c302e021 o checking in so that oleg and shane can see the changes, there are three failing tests. i'm fixing in the plane and will check in when i land
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746850 13f79535-47bb-0310-9956-ffa450edef68
2009-02-23 00:04:14 +00:00
Jason van Zyl 69777c2ea2 o remove wagon manager from the request populator
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746531 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 16:15:26 +00:00
Jason van Zyl b4257bad3b o use RepositorySystem and LegacyRepositorySystem
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746432 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 03:22:21 +00:00
Jason van Zyl f6d25b36f8 o remove legacy artifact component references from the embedder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746311 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 18:03:46 +00:00
Jason van Zyl a8cd789425 o first push of a plug point for repository/transport in maven
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746285 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 16:27:27 +00:00
Britton Isbell c327c94443 Refactored out more uses of modello and moved classes from maven-project to maven-project-builder. Doing this so that maven-mercury will not have direct dependency on modello or maven model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746002 13f79535-47bb-0310-9956-ffa450edef68
2009-02-19 21:22:46 +00:00
Britton Isbell 73c0f41e3b Collapased Transformers into one. Extracted out some rules. Removed some references to Maven model in DomainModels to generalize. Removed Plugin mixins, which are no longer needed. Extension loading appears to be broken from refactoring. Need to fix this.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745712 13f79535-47bb-0310-9956-ffa450edef68
2009-02-19 03:00:52 +00:00
Benjamin Bentmann 55fe596230 [MNG-4037] Include Java home in version information
o Merged from r744645

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744647 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 10:18:00 +00:00
Benjamin Bentmann fda7685244 [MNG-4036] [regression] Maven 3.x can't resolve parent POMs from repositories defined in settings.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744560 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 19:38:53 +00:00
Britton Isbell 0abb04c8bb [MNG-3631] Mojo Configuration. Allow embedder to get executions by goal, query config with xpath and execute mojo.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744145 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 15:39:54 +00:00
Oleg Gusakov c1368df785 [MNG-4033] found more appropriate injection point for password encryption
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743948 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 01:42:38 +00:00
Oleg Gusakov e07ccacaf2 [MNG-4033] found more appropriate injection point for password encryption
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743947 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 01:38:15 +00:00
Britton Isbell 9863957196 [MNG-3862] Remove all plugin configuration manipulation from the plugin manager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743225 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 04:56:35 +00:00
Jason van Zyl 1da74993a9 o getting rid of $Id$
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742673 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 18:56:31 +00:00
Britton Isbell cb077dc469 MNG-3919: NPE in DefaultLifecycleBindingManager
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740468 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 21:50:27 +00:00
Britton Isbell adfb3ddeb9 Tests for MNG-1943 - interpolation in parent pom and MNG-3567 - pluginManagement inherited. Added additional methods to maven embedder for querying of plugin configs.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740395 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 19:50:11 +00:00
Britton Isbell d1124333ad Merge: sisbell-plugin-manager. MNG-3631 - Get plugin config, including mojo descriptor info.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739970 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 12:02:44 +00:00
Benjamin Bentmann 7397cc69d6 [MNG-3951] Hide drive-relative paths from plugins
o Merged from r739385

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739735 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 10:44:19 +00:00
Jason van Zyl ed4f594ac4 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739478 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 01:06:48 +00:00
Jason van Zyl 13fa00ea3f [maven-release-plugin] prepare release maven-3.0-alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739476 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 01:06:37 +00:00
Jason van Zyl 557f0a5373 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738777 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 07:13:04 +00:00
Jason van Zyl 7f54cfff61 [maven-release-plugin] prepare release 3.0-alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738775 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 07:12:48 +00:00
Benjamin Bentmann 5872cd6d2e [MNG-3955] [regression] ${settings.localRepository} does not reflect actual repo path if maven.repo.local used
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734219 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 19:01:21 +00:00
Jason van Zyl 481cde5756 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731333 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:28 +00:00
Jason van Zyl 6991c79e34 [maven-release-plugin] prepare release maven-3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731331 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:05 +00:00
Jason van Zyl cc38a455f7 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731271 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:29:07 +00:00
Jason van Zyl bab3480d4b [maven-release-plugin] prepare release 3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731269 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:28:42 +00:00
Jason van Zyl 59e207e530 o adding runtime info to the settings adapter
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731173 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 04:43:10 +00:00
Benjamin Bentmann 3ec459f512 o Removed unreachable code (older JVMs will always bail out before the code is executed)
M:\apache-maven-3.0-SNAPSHOT\bin>mvn -v
Exception in thread "main" java.lang.UnsupportedClassVersionError: org/apache/maven/cli/MavenCli (Unsupported major.minor version 49.0)
        at java.lang.ClassLoader.defineClass0(Native Method)
        at java.lang.ClassLoader.defineClass(ClassLoader.java:539)
        at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:123)
        at java.net.URLClassLoader.defineClass(URLClassLoader.java:251)
        at java.net.URLClassLoader.access$100(URLClassLoader.java:55)
        at java.net.URLClassLoader$1.run(URLClassLoader.java:194)
        at java.security.AccessController.doPrivileged(Native Method)
        at java.net.URLClassLoader.findClass(URLClassLoader.java:187)
        at java.lang.ClassLoader.loadClass(ClassLoader.java:289)
        at org.codehaus.plexus.classworlds.realm.ClassRealm.loadRealmClass(ClassRealm.java:174)
        at org.codehaus.plexus.classworlds.strategy.DefaultStrategy.loadClass(DefaultStrategy.java:67)
        at org.codehaus.plexus.classworlds.strategy.ForeignStrategy.loadClass(ForeignStrategy.java:39)
        at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:207)
        at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:201)
        at org.codehaus.plexus.classworlds.launcher.Launcher.getMainClass(Launcher.java:144)
        at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:266)
        at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
        at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:408)
        at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:351)
        at org.codehaus.classworlds.Launcher.main(Launcher.java:31)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729292 13f79535-47bb-0310-9956-ffa450edef68
2008-12-24 10:52:56 +00:00
Benjamin Bentmann 088b7c6241 o Fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728100 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 18:30:34 +00:00
Jason van Zyl 30dbc6db99 o fix typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728071 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 17:14:15 +00:00
Jason van Zyl 434431ec8d o restore the plugin registry cli option for compat with the verifier
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728066 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 17:05:15 +00:00
Jason van Zyl 6b040ab2f9 o remove some superfluous reader creation in the project builder
o remove profile handling from the construction of the super project, there are no profiles in it anymore (and shouldn't be in the future)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727267 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 04:01:59 +00:00
Jason van Zyl f5c4a25c9c o remove standalone property
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726579 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 23:49:30 +00:00
Benjamin Bentmann 7e76510cdc [MNG-3914] Add CLI option to control location of global settings from command line
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726563 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 22:27:23 +00:00
Jason van Zyl c744e7706e MNG-3913: figure out why this fails on the grid and reenable when we track it down.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726525 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 20:19:55 +00:00
Jason van Zyl 6d5eab14f6 o remove aspectj
o update compat log with CLI changes
o update everything to release versions, we have no snapshots anymore


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726521 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 19:51:59 +00:00
Jason van Zyl a5ab9893ad o disallow 1.4 now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726520 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 19:20:17 +00:00
Jason van Zyl 3f3945729f o only allow JDK 1.5 or above to execute Maven 3.x
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726517 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 19:04:51 +00:00
Jason van Zyl 2aed210e8c o remove the option for the plugin registry, not used for a long while
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726515 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 18:51:18 +00:00
Jason van Zyl ea43792cf2 MNG-3905 First pass at collecting all the repository related code and started to decouple from maven-artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726383 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 06:24:01 +00:00
Jason van Zyl e02b6e7005 o get rid of more Settings references beyond the embedder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726164 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 03:17:35 +00:00
Jason van Zyl 633b598548 o we will set the header in the wagon manager as we have no clients anymore and all of this will be gone in alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721766 13f79535-47bb-0310-9956-ffa450edef68
2008-11-30 06:09:15 +00:00
Jason van Zyl 0853c03589 o isolated realm is obsolete
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721765 13f79535-47bb-0310-9956-ffa450edef68
2008-11-30 06:01:09 +00:00
Jason van Zyl 9bc9c86231 o use annos where possible
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721750 13f79535-47bb-0310-9956-ffa450edef68
2008-11-30 01:46:13 +00:00
Jason van Zyl a648f36be2 o remove debugging info
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721279 13f79535-47bb-0310-9956-ffa450edef68
2008-11-27 21:09:09 +00:00
Jason van Zyl 8da8916f50 o adding in project build failure exceptions that were not being output
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721255 13f79535-47bb-0310-9956-ffa450edef68
2008-11-27 18:37:52 +00:00
Jason van Zyl c418d12814 o primarily refactoring in part for the preparation making room for mercury and processing events from maven-shared-model
o add plexus component descriptor generation to the bootstrap so we can start removing the hand-written descriptors and start
  using annotations everywhere



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720432 13f79535-47bb-0310-9956-ffa450edef68
2008-11-25 07:11:35 +00:00
Britton Isbell c26b2d69cd Merge of sisbell-maven-3.0-mercury branch to trunk. Includes maven-project-builder component, which breaks out some of the independent project builder classes, so that Mercury does not need to pull in the entire trunk.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719472 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 04:49:46 +00:00
Jason van Zyl a461aa6137 o turning this test off as the much stricter lookups require this be adjusted. it's a feature no one uses in this way yet.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718850 13f79535-47bb-0310-9956-ffa450edef68
2008-11-19 03:21:07 +00:00
Jason van Zyl 17d68dbce5 o adding some patches for changes in plexus
submitted by: Dain Sundstrom


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718845 13f79535-47bb-0310-9956-ffa450edef68
2008-11-19 02:31:49 +00:00
Jason van Zyl 56986ca004 o use the class lookup method which will now automatically partition lookups based on the class
submitted by: Dain Sundstrom



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@717964 13f79535-47bb-0310-9956-ffa450edef68
2008-11-16 02:38:13 +00:00
Jason van Zyl 1289a0e877 o remove plugin specific tests from the embedder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701697 13f79535-47bb-0310-9956-ffa450edef68
2008-10-04 19:23:33 +00:00
Jason van Zyl d3d1acbf1f o remove specific plugin tests from the embedder tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701695 13f79535-47bb-0310-9956-ffa450edef68
2008-10-04 19:22:42 +00:00
Jason van Zyl 556254c8c3 MNG-3653/MNG-3677: restored property file nabbing from the core JAR, and reworked the runtime component to be more general and used it from the CLI
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701264 13f79535-47bb-0310-9956-ffa450edef68
2008-10-02 22:36:41 +00:00
Jason van Zyl d06897e91c MNG-3637: making sure it says we fail when we fail
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701228 13f79535-47bb-0310-9956-ffa450edef68
2008-10-02 19:52:53 +00:00
Jason van Zyl cc5827fa72 MNG-3649: making sure that the request parameters which are populated from the CLI are honored in plugins like the release plugin which consume CLI options from the user
settings object. ug.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701216 13f79535-47bb-0310-9956-ffa450edef68
2008-10-02 19:16:47 +00:00
Jason van Zyl 6779e62e80 o artifact handlers are discovered in active collections now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701198 13f79535-47bb-0310-9956-ffa450edef68
2008-10-02 17:52:03 +00:00
Britton Isbell 534b660b4e Removed extension scanner. It was tied up into the old model lineage code, which is very buggy. Needs to be reimplemented.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700226 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 19:51:10 +00:00
Jason van Zyl b6c2132bc7 o merging from my branch to trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699806 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 12:16:53 +00:00
Britton Isbell bc3660ec47 Detangled profile activitation dependency on realm manager. Move org.apache.maven.realm package to maven-core project.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695332 13f79535-47bb-0310-9956-ffa450edef68
2008-09-15 02:54:31 +00:00
Britton Isbell 9fff4c0612 Moved PathTranslator to maven-core. maven-project no longer uses it.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694912 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 10:07:23 +00:00
Britton Isbell 7dc42ed958 Replaced interpolator code.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694907 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 09:28:23 +00:00
Britton Isbell 50a1d13a08 Removed a unit test related to aspect eventing. Added back in direct setting of compile/script directories.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694118 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 04:55:50 +00:00
Britton Isbell cacc78b1d0 Removed dynamic injection of pom build during project construction. Deleted aspects.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694109 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 04:16:40 +00:00
Britton Isbell 6b96692a93 Merge of sisbell-maven-2.1-profile branch. Removes use of project lineage from builder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@693332 13f79535-47bb-0310-9956-ffa450edef68
2008-09-09 01:04:17 +00:00
Jason van Zyl b07c8d2e36 reverting that commit, meant for my branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@688584 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 23:38:39 +00:00
Jason van Zyl 2a94051f54 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@688581 13f79535-47bb-0310-9956-ffa450edef68 2008-08-24 23:24:41 +00:00
Britton Isbell 4cb42c34a7 Merged back changes from sisbell-maven-2.1-profile
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@685575 13f79535-47bb-0310-9956-ffa450edef68
2008-08-13 14:47:51 +00:00
Britton Isbell 398b62158e Merge of branch: sisbell-maven-2.1-profile.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@685443 13f79535-47bb-0310-9956-ffa450edef68
2008-08-13 05:09:00 +00:00
Jason van Zyl c82352832a o updating to 3.0-SNAPSHOT
o aparently when we start from scratch the bootstrap wasn't working, so the maven ant tasks will now igore trying to download the projects we
  are actually trying to build.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@684975 13f79535-47bb-0310-9956-ffa450edef68
2008-08-11 23:05:20 +00:00
Britton Isbell c8b842c976 Merge of SI_MAVEN_2_1 branch. New builder code.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679609 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 23:06:59 +00:00
Brett Leslie Porter 1cb6db67de [MNG-3652] minor improvement to the user agent for trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679010 13f79535-47bb-0310-9956-ffa450edef68
2008-07-23 07:15:51 +00:00
Benjamin Bentmann a14916cf8c o Considered file extensions in command search to enable tests for Windows
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@677452 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 22:33:58 +00:00
Brett Leslie Porter d046f6039f embedder tests that download artifacts and plugins should use the settings file for now to honour mirrors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@677239 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 11:18:50 +00:00
Jason van Zyl 5e2d60366b o adding some code to detect system executables so that tests which wrap those executables are only run when they are present. in trying to get people to run the ITs from a Hudson bundle it's apparent that not everyone had SVN installed. we need to be more sensitive to different environments for testing if we want more people to participate.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676103 13f79535-47bb-0310-9956-ffa450edef68
2008-07-12 00:07:06 +00:00
Jason van Zyl 667fe087d5 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676082 13f79535-47bb-0310-9956-ffa450edef68 2008-07-11 21:16:59 +00:00
John Dennis Casey a3719ed76c Improving the reliability of these two tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675349 13f79535-47bb-0310-9956-ffa450edef68
2008-07-09 21:42:49 +00:00
Jason van Zyl 668818f6ba MNG-3656: cleanup is complete as far as I can tell. I also got rid of a bunch of deps that said were needed, but the build seems to work fine, and I'm about to try on Mr Hudson.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674319 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 17:21:25 +00:00
Brett Leslie Porter 278b580c8f [MNG-3652] set a user agent for Maven HTTP requests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673901 13f79535-47bb-0310-9956-ffa450edef68
2008-07-04 04:32:09 +00:00
Brett Leslie Porter 4c5f43abf9 We require the newer version of the surefire plugin or it is possible to get old versions of plexus-utils in the tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672727 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 08:34:38 +00:00
John Dennis Casey cd2602d9e6 Adding -V|--show-version, and cleaning up interpolation to correspond with recent refactoriing in 2.0.x branch. Also, changing super-POM to use basedir/build.directory expressions in build paths, to enable paths to respond to changes in other, more basic paths (like outputDirectory responding to a change in build.directory). This is in preparation for merging over the dynamicBuild behavior.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@671936 13f79535-47bb-0310-9956-ffa450edef68
2008-06-26 16:34:27 +00:00
Brett Leslie Porter 726e4adbba this causes plexus-utils clashes, remove
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670348 13f79535-47bb-0310-9956-ffa450edef68
2008-06-22 12:38:31 +00:00
Brett Leslie Porter 3acaa63cf8 adjust the embedder tests:
- remove a number of downloads from central that were slowing the build significantly
- ensure the tests will run with a repo manager and no central access
- ensure the tests will run offline if the local repository is populated

The technique for populating the repository is very hacky. We really need the tests to be doing this themselves. Perhaps moving these IT-like tests into the IT section and alongside the core ITs is the way to go - but this is a start.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669222 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 16:56:56 +00:00
Paul Gier 9f84e95bab Allow use of ! to deactivate a profile. Remove use of E: and D: for enabling and disabling.
Issue id: MNG-3571


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@656846 13f79535-47bb-0310-9956-ffa450edef68
2008-05-15 21:21:31 +00:00
John Dennis Casey e28b62cbe7 Allow multiple -P options, and fix explicit en/disable notations of E:/+ for enable, D:/- for disable.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@654207 13f79535-47bb-0310-9956-ffa450edef68
2008-05-07 18:44:18 +00:00
Brian E Fox 1c50dc0d0d clean up the poms and move versions to dependencyManagement
Issue id: c


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@653481 13f79535-47bb-0310-9956-ffa450edef68
2008-05-05 13:46:40 +00:00
Paul Gier 1245ac784e Add support for multiple -P params on the command line.
Issue id: MNG-3268


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@652912 13f79535-47bb-0310-9956-ffa450edef68
2008-05-02 21:04:22 +00:00
John Dennis Casey 0c2243d407 Adding system/execution property maven.mode.standalone that will reflect whether maven started via MavenCli or not.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@651080 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 21:49:49 +00:00
Herve Boutemy 007fe63a03 added site descriptors to provide modules/parent links (merged from 2.0.x branch r649903)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649913 13f79535-47bb-0310-9956-ffa450edef68
2008-04-20 11:37:31 +00:00
John Dennis Casey 36092a009d Adding ProjectBuilderConfiguration method for buildProjectWithDependencies, then switch the embedder.readProject* to use the ProjectBuilderConfiguration-enabled methods.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649629 13f79535-47bb-0310-9956-ffa450edef68
2008-04-18 18:00:27 +00:00
Jason van Zyl db643afb25 o removing the distribution assembly from the embedder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648511 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 04:57:44 +00:00
Jason van Zyl c224eeefb2 o put the embedder documentation in the normal site
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648507 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 04:36:21 +00:00
Jason van Zyl cc68735fcc o we don't need the scripts as everyone is using the same embedder now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648481 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 01:19:28 +00:00
Jason van Zyl 18e797c7d0 o turn off the debugging output, shave off a minute from the build, you can tell what's wrong from the test reports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648479 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 01:03:33 +00:00
Jason van Zyl 8aa6300529 o version is now stated in the parent POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648294 13f79535-47bb-0310-9956-ffa450edef68
2008-04-15 15:55:34 +00:00
Herve Boutemy 19b26ee657 [MNG-3509] added default locale and platform encoding to "mvn -v" output
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@647626 13f79535-47bb-0310-9956-ffa450edef68
2008-04-13 21:04:55 +00:00
Herve Boutemy a36b220670 added Os.OS_FAMILY to showVersion() output (merged from 2.0.x branch r587331)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@647624 13f79535-47bb-0310-9956-ffa450edef68
2008-04-13 20:47:21 +00:00
John Dennis Casey c32aa5a656 Fixing unit test problems from it0103 fix, and fixing it0042...just 4 more failing ITs before this is back on its feet.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@645015 13f79535-47bb-0310-9956-ffa450edef68
2008-04-05 02:19:29 +00:00
John Dennis Casey 1d9d014cde Fixing MNG-3355 and MNG-2339.
This commit introduces three changes: user-level properties that are separated from the execution properties, where execution properties contain envars, sysprops, and user-level properties...user-level properties are useful for POM interpolation for 2339 and 3355.

Second, a ProjectBuilderConfiguration interface and default implementation, to stem the proliferation of method parameters to projectBuilder methods. This was a natural place to introduce it, as user-level properties had to be passed in separately from the execution properties, for interpolation.

Finally, interpolation has been switched to use the new plexus-interpolation project, which is based on the classes in plexus-utils.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644354 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 15:18:18 +00:00
Brian E Fox 8ff17e2654 MNG-3484: patch from James William Dumay to quote MAVEN_OPTS
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@641699 13f79535-47bb-0310-9956-ffa450edef68
2008-03-27 03:07:26 +00:00
Benjamin Bentmann 1c3af9f908 o Fixed svn:keywords
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640236 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 18:20:22 +00:00
Benjamin Bentmann 898e4afab6 o Added svn:eol-style=native
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640234 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 18:04:33 +00:00
Benjamin Bentmann 4efc9b5de9 o Removed svn:executable
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640229 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 17:57:41 +00:00
John Dennis Casey fdf69050f1 Reinstate mojo execution logging to the console using the default event monitor. Also, have the error-reporting unit test cleanup after itself.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634134 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 02:48:44 +00:00
Jason van Zyl 9bf54d4984 o rolling back r631468, we will use the container to dynamically pull in wagons in 2.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634081 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 23:34:06 +00:00
Milos Kleint 696823a995 include toolchain in the final build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633982 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 19:14:49 +00:00
Brett Leslie Porter 97e9f53ac3 [MNG-2234] activate profiles that are not present in the settings so that they can be defined in the POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633766 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 04:56:46 +00:00
Vincent Siveton 80a6818f01 o merged from r633053 (fixed potential NPE)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633054 13f79535-47bb-0310-9956-ffa450edef68
2008-03-03 12:09:01 +00:00
John Dennis Casey a5f49900f2 Adding the beginnings of a workspace to Maven, which is just a shared cache component for project, model, and POM file instances (for now). This allows fine-grained control over when such caches are cleared in environments where embedder instances may be reused multiple times, and will eventually enable new profile activators that require access to project information in the current build along with other advanced caching and cache-querying features.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632482 13f79535-47bb-0310-9956-ffa450edef68
2008-02-29 22:58:00 +00:00
Jason van Zyl 4411b1c425 Changing to name and not email.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632468 13f79535-47bb-0310-9956-ffa450edef68
2008-02-29 22:36:19 +00:00
Brett Leslie Porter c2bc33050c [MNG-2664] add wagon-webdav to the built in providers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@631468 13f79535-47bb-0310-9956-ffa450edef68
2008-02-27 02:46:17 +00:00
John Dennis Casey f88f9df9ff Fixing bad logic in unit tests where a test plugin must build first.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@630047 13f79535-47bb-0310-9956-ffa450edef68
2008-02-21 23:30:48 +00:00
John Dennis Casey d54cf5b9bb Ignore missing modules during extension-scanning when MavenEmbedder.readProject(..) is called. At other times, as in the case of normal builds, don't suppress missing module exceptions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629571 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 18:53:09 +00:00
John Dennis Casey 793020c798 Tests to verify that SCM inheritance calculations are correct, using both project builder directly and the embedder's readProject(..) method.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629549 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 18:11:15 +00:00
John Dennis Casey f72505bc77 Removing unstable test...it should be covered well enough with a conventional unit test on DefaultMavenExecutionRequestPopulator. Also, rolling back changes to the standard embedder test project pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629188 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 18:46:18 +00:00
John Dennis Casey 8c34003044 Trying to diagnose a build failure on a remote server...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629184 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 18:40:29 +00:00
John Dennis Casey 4bc04c413b Re-enable offline flag from the settings.xml.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629161 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 16:57:12 +00:00
Vincent Siveton f8bc0a121f o fixed plexus-classworlds due to r619106
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619231 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 00:37:34 +00:00
John Dennis Casey 37b11eb9e9 [MNG-2178] Modding M2_HOME detection for winnt.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619114 13f79535-47bb-0310-9956-ffa450edef68
2008-02-06 19:26:54 +00:00
John Dennis Casey 1611fcfbdf [MNG-3354] & [MNG-3296] Patching Windows batch files for maven, to improve support for Windows+Novell integration, and to handle the end of winnt's local scope with the errorlevel preserved.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619106 13f79535-47bb-0310-9956-ffa450edef68
2008-02-06 19:03:43 +00:00
John Dennis Casey 10da177f1d [MNG-3119] Modifying MavenProject.addAttachment(..) and MavenProjectHelper.attachArtifact(..) implementations to throw an unchecked exception when a project attachment will collide with existing attachments. This includes tests to verify the behavior. The unchecked exception allows Maven to deal with it as a real build failure, while avoiding the need to modify the MavenProjectHelper API, which is part of Maven's core and which would render many existing plugins incompatible with new Maven releases.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@618497 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 00:09:27 +00:00
Vincent Siveton 4733739db6 o merged r617829
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@617830 13f79535-47bb-0310-9956-ffa450edef68
2008-02-02 16:44:10 +00:00
John Dennis Casey b7ce1b8c93 Fixing the case where there were exceptions in the build, but for whatever reason they didn't trigger a reactor-manager build failure flag...in cases where there isn't really a project against which to log the error, for instance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@616968 13f79535-47bb-0310-9956-ffa450edef68
2008-01-31 00:36:26 +00:00
John Dennis Casey f2d7a5aa5f Fine-tuning an error reporting pointcut, and also adding a method to the embedder to allow a third party access to the build plan for a specific project, given a set of goals to be invoked.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@616825 13f79535-47bb-0310-9956-ffa450edef68
2008-01-30 18:13:07 +00:00
John Dennis Casey ba9624676d Cleanup use of repositories for resolving plugin dependencies by using a LinkedHashSet to avoid duplicated repository defs (although two defs pointing to the same URL but with different id's will still look like two repos).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@615004 13f79535-47bb-0310-9956-ffa450edef68
2008-01-24 21:29:12 +00:00
John Dennis Casey 8d42ef1ce3 Fixing error-reporting pointcut that I broke.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614342 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 22:01:57 +00:00
John Dennis Casey 77352f07f7 remove a debugging sysout.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614318 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 20:51:00 +00:00