Commit Graph

285 Commits

Author SHA1 Message Date
Jason van Zyl 94ed8048ea o update to the beta-1 of the plexus container, and start instrumenting the projects for the generating of component metadata
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700760 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 13:08:41 +00:00
Jason van Zyl d4f897bded o put the maven-compat module into the distribution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699851 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 16:21:08 +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
Jason van Zyl 1260ced4f5 o collapsing all the profile code into maven-project, now it's all in one place
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699659 13f79535-47bb-0310-9956-ffa450edef68
2008-09-27 14:52:28 +00:00
Britton Isbell 3caaba53ed Fix: If the child pom found a parent pom within a local build, where the child pom project/parent/groupId[artifactId] did not match the groupId[artifactId] of the parent pom, then it would exclude the parent pom from inheritance. Now it will attempt to locate the parent pom in the local repo. If the parent pom is not found in local repo, build will fail.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696713 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 17:02:55 +00:00
Jason van Zyl 82beb43aa7 o remove the embedder integration test module`:wq
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696642 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 11:56:38 +00:00
Britton Isbell 2de60dd07b Rolling back to use modello alpha-13. This is the same fix John did for mng-3748 for 2.1. This also fixes mng-3680.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694721 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 16:10:29 +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
John Dennis Casey 5fc59a2bd9 bumping to artifact alpha-2-snapshot and wagon beta-4.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@692194 13f79535-47bb-0310-9956-ffa450edef68
2008-09-04 19:09:06 +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
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
Arnaud Heritier b3b20d857d Check that maven-parent 9 works with all projects
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@683423 13f79535-47bb-0310-9956-ffa450edef68
2008-08-06 21:53:33 +00:00
Jason van Zyl 4b1b242d78 o updating to maven-artifact 3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@682594 13f79535-47bb-0310-9956-ffa450edef68
2008-08-05 06:15:39 +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 d52ffdef81 reapplying John's merge of all 2.0.10-RC changes to date by reverting r679244, sans artifact upgrade and user agent parts. Passes all integration tests locally, seeing if Hudson and Continuum agree
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679263 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 01:56:21 +00:00
John Dennis Casey 24176a08a1 Rolling back merge attempt until I have time to fix failing unit tests (most likely tomorrow will do it).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679244 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 00:18:09 +00:00
John Dennis Casey 3c9be4bceb Merging changes in from 2.0.10-RC2 release candidate on 2.0.10-RC branch. Still have two failing unit tests in maven-core; I'll take care of those in a few minutes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679229 13f79535-47bb-0310-9956-ffa450edef68
2008-07-23 23:26:00 +00:00
Brett Leslie Porter e0e55f40ab remove unused shade plugin reference
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@677205 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 09:10:31 +00:00
Benjamin Bentmann fd61a15b62 o Updated to plexus-classworlds:1.2-alpha-13 to get fix for PLX-367
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676324 13f79535-47bb-0310-9956-ffa450edef68
2008-07-13 14:14: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
Jason van Zyl d960c39994 MNG-3656: Keep pushing artifact and plugin versions up to the parent POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674316 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 16:44:06 +00:00
Jason van Zyl 916d026ded o aligning all versions in the parent POM
Issue id: MNG-3656


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674310 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 16:13:25 +00:00
Jason van Zyl f3020e370e o starting to collection all the property versions in one place so that I can start working on promoting successful versions of builds
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674309 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 16:08:04 +00:00
John Dennis Casey 9514380003 Updating and commenting out artifact version property until I can get this working on localhost.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672816 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 16:38:11 +00:00
John Dennis Casey 5c32bc6b28 All tests pass on my localhost...committing to see how it works on hudson.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672782 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 14:35:43 +00:00
Vincent Siveton 188bd7a943 o merged from r672501 (updated to last modello-maven-plugin 1.0-alpha-18)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672502 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:23:59 +00:00
Brett Leslie Porter 179ce1a925 [MNG-3622] upgrade to wagon 1.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670353 13f79535-47bb-0310-9956-ffa450edef68
2008-06-22 13:03:37 +00:00
John Dennis Casey 16a288c93a rolling back to maven-parent 8 until later, to keep this stable for now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670059 13f79535-47bb-0310-9956-ffa450edef68
2008-06-20 21:00:03 +00:00
John Dennis Casey 46e229ef71 Bumping to 9-snap or maven-parent, to get clirr changes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669250 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 18:28:08 +00:00
Brett Leslie Porter 5be7ffdd23 moving to 5.0, as it's required at runtime for maven-artifact now anyway
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669226 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 17:04:33 +00:00
John Dennis Casey 08f3ac7ab4 Upgrade to plexus-interpolation 1.0.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@668296 13f79535-47bb-0310-9956-ffa450edef68
2008-06-16 20:44:25 +00:00
John Dennis Casey be00b00c70 Use latest plexus-container-default, to correct a NPE with ant-based mojos.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@667207 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 19:33:26 +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
Jason van Zyl 3b938d2dc2 use java 1.5
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649869 13f79535-47bb-0310-9956-ffa450edef68
2008-04-20 01:11:14 +00:00
Jason van Zyl 9185af5752 o updating to use latest snapshot of plexus which uses XBR. i'll update again when xbr does a release in a couple days.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649863 13f79535-47bb-0310-9956-ffa450edef68
2008-04-19 23:37:32 +00:00
Jason van Zyl 5018136c1a o updating the pom and build file for the addition of the distribution module
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648512 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 04:58:47 +00:00
Jason van Zyl a5865e985c o merging in work from xbr branch for the ant task based build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648287 13f79535-47bb-0310-9956-ffa450edef68
2008-04-15 15:41:13 +00:00
John Dennis Casey d51e3b5e7a Adding tests for the plugin-parameter expression evaluator, and some better behavior around MojoExecution and PluginDescriptor instances. Also, bumping plexus-container-default to -alpha-45-SNAPSHOT to take advantage of a new MapConverter fix.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648053 13f79535-47bb-0310-9956-ffa450edef68
2008-04-14 23:22:10 +00:00
John Dennis Casey 9b1b57f100 Adding codehaus snapshots repo for now until we have plexus-interpolator released.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644401 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 16:43:44 +00:00
John Dennis Casey 05e92de35e Adding plexus-interpolation to the POM and build.xml/.properties, to prepare for the fix to MNG-3355 and MNG-2339(a)...also adding a new embedder-driven integration-test project to eventually hold the error-reporting tests currently in the maven-embedder tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644352 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 15:13:24 +00:00
Brian E Fox 02b1ff0f76 use new parent
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@637236 13f79535-47bb-0310-9956-ffa450edef68
2008-03-14 20:04:09 +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 667d800240 integrate maven-toolchain, make buildable
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632594 13f79535-47bb-0310-9956-ffa450edef68
2008-03-01 14:07:09 +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
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
Herve Boutemy db4820c72b [MNG-3316] use plexus-utils 1.5+ which fixes problem when an XML attribute is named *encoding
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@630415 13f79535-47bb-0310-9956-ffa450edef68
2008-02-23 09:00:09 +00:00
John Dennis Casey 9a2d2f9e4d Rolling this back until version 8 is released...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629277 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 23:38:45 +00:00
John Dennis Casey adc2f41cae Bumping parent version to 8-SNAPSHOT until 8 is released.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629258 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 22:41:32 +00:00
Vincent Siveton fb4092ba17 o fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@628738 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 13:43:28 +00:00