Commit Graph

489 Commits

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