Commit Graph

449 Commits

Author SHA1 Message Date
Jason van Zyl 1a0b546e7f MNG-2690 Some maven-project tests fail under maven-surefire-plugin 2.3
Submitted by: Mark Hobson


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543614 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 21:01:48 +00:00
Jason van Zyl b4f380dd3c MNG-2683 Better exception messages
Submitted by: Mark Lundquist


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543604 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 20:46:48 +00:00
John Dennis Casey 5401fb4c64 OPEN - issue MNG-2784: Multiple executions of the same plugin at the same life cycle phase in a multi-module profile mixed up
http://jira.codehaus.org/browse/MNG-2784

NOT applying this patch, as there is a much simpler solution. The processing is currently in the correct order, so all we need to do is make sure the Map.values() method retains this order. Therefore, I changed the Map implementation for plugin executions to LinkedHashMap.

I've also added a test for this issue...

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543599 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 20:35:44 +00:00
John Dennis Casey 09553c6ff3 REOPENED - issue MNG-1910: Allow jdk 1.4+ as profile requirement
http://jira.codehaus.org/browse/MNG-1910

Applied.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543579 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 19:12:58 +00:00
Jason van Zyl e12fbd08e9 o fix typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543382 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 04:19:59 +00:00
Jason van Zyl 6cb79190cd MNG-2813: Fix OutOfMemoryError when using profiles and pom inheritance
Submitted by: Jochen Kuhnle


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543373 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 03:11:29 +00:00
Jason van Zyl 82146b83f0 MNG-2921 Fixing the ejb-client dependency problem introduced by MNG-1577
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543349 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 01:31:29 +00:00
John Dennis Casey a55e9c24fe Making resolution of artifacts from the reactor work with classifiers (hopefully).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541942 13f79535-47bb-0310-9956-ffa450edef68
2007-05-26 21:22:10 +00:00
Jason van Zyl 3481d0f425 o need mr wagon
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532025 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 17:42:59 +00:00
Andrew Williams 40e2c95113 artifact-manager is no longer used
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532008 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 16:59:28 +00:00
Jason van Zyl 05986fc6f2 o remove maven-artifact-test, not used anywhere
o fix shade plugin so the new uber is produced
o allow plexus-utils back into the mix
o take out the dep.xml assembly descriptor as shade is making the uber jar now



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@531259 13f79535-47bb-0310-9956-ffa450edef68
2007-04-22 19:58:09 +00:00
Carlos Sanchez Gonzalez 04d3f322fe Add javadocs for getArtifacts and getDependencyArtifacts
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@521825 13f79535-47bb-0310-9956-ffa450edef68
2007-03-23 17:47:47 +00:00
Jason van Zyl 05162de0d0 o bits for mng-1577
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@521543 13f79535-47bb-0310-9956-ffa450edef68
2007-03-23 00:11:31 +00:00
Jason van Zyl 17a7a726c5 MNG-2868 The behavior in MNG-1577 is now available on the trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@520923 13f79535-47bb-0310-9956-ffa450edef68
2007-03-21 16:00:17 +00:00
John Dennis Casey 34bf67ecf1 Merging revIds: 515814:520600 from 2.1-lifecycle-refactor branch to trunk.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@520609 13f79535-47bb-0310-9956-ffa450edef68
2007-03-20 21:40:59 +00:00
Jason van Zyl 7d17a9c108 MNG-2877 resolve attached artifacts from reactor that are not in repo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@519740 13f79535-47bb-0310-9956-ffa450edef68
2007-03-18 23:40:05 +00:00
Jason van Zyl f03d8d662f o testing repeatedly with an empty repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@516820 13f79535-47bb-0310-9956-ffa450edef68
2007-03-11 00:48:53 +00:00
Jason van Zyl badcd2287f o roll back to wagon beta-2 to fix the rash of problems with m2eclipse plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@516654 13f79535-47bb-0310-9956-ffa450edef68
2007-03-10 05:38:50 +00:00
Andrew Williams 94ba392461 Copy the ArtifactMetadataSource to use the 'default' hint as well as the, deprecated, 'maven' one. This will mean that with the new plexus components don't have to hint to get the default impl
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514652 13f79535-47bb-0310-9956-ffa450edef68
2007-03-05 11:48:15 +00:00
Andrew Williams 1f9709694d More role-hint fixes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514019 13f79535-47bb-0310-9956-ffa450edef68
2007-03-02 23:43:49 +00:00
Andrew Williams cf8cb43998 use the correct role hint
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513881 13f79535-47bb-0310-9956-ffa450edef68
2007-03-02 18:41:39 +00:00
Kenney Westerhof cd8c1d61a2 Fix unit tests.
The order of the tests is important since the same groupId/artifactId/version
combinations are used in different local repositories in the tests, containing
different poms. The DefaultMavenProjectBuilder caches models with g🅰️v,
so it can serve a model from another local repo.

Solved this by changing groupId's in the poms and repositories so they don't
conflict.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513720 13f79535-47bb-0310-9956-ffa450edef68
2007-03-02 12:05:15 +00:00
Kenney Westerhof 7ddabf5a2d Remove svn:executable from pom and java files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513701 13f79535-47bb-0310-9956-ffa450edef68
2007-03-02 10:55:05 +00:00
Jason van Zyl 3dcf943dfc updating license headers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513038 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 22:54:19 +00:00
Jason van Zyl fb03e03672 o optimizing imports, trying to clean up settings use so i can track them down and purge them
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512775 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 14:47:51 +00:00
Jason van Zyl d3deb61421 o remove maven-tools and put the utility code in the only module that now depends on it, maven-project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512763 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 14:20:13 +00:00
Jason van Zyl f37ff7ef4d o use FileUtils for copying the POM.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512749 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 13:17:02 +00:00
Jason van Zyl 7d69da0eea o unrequired cast
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512552 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 01:30:44 +00:00
John Dennis Casey f4b3eedc8a Fixing some lingering dependency ordering problems from artifact resolution, and adding settings-builder advice to the CLI.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512339 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 17:47:30 +00:00
John Dennis Casey b8289153a1 Adding read/writeSettings() api to the maven-tools and the embedder along with unit tests in each place, and adding a cache object for the settings that is based on the build-context.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@510335 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 01:01:54 +00:00
John Dennis Casey 2b95701a5c Rearranging project-builder caching so it's done externally and available for use in the model-lineage builder and during artifact resolution as well.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@509692 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 18:09:53 +00:00
John Dennis Casey b994579133 Bumping plexus-utils dep to 1.4.1-snapshot, and commenting out some of the debug statements from the default model lineage builder, to limit the debug output on a build back to some sane[r] level.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@506742 13f79535-47bb-0310-9956-ffa450edef68
2007-02-12 23:33:43 +00:00
Jason van Zyl fae3cb98c8 MNG-2820 Leave the POM intact which means no interpolating and no license header whacking
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@506108 13f79535-47bb-0310-9956-ffa450edef68
2007-02-11 19:52:44 +00:00
Joakim Erdfelt 33f23db7de * Migrating to wagon-manager 1.0-beta-3-SNAPSHOT
* Created org.apache.maven.artifact.manager.ArtifactManager
* Deprecated org.apache.maven.artifact.manager.WagonManager in favor of new ArtifactManager
* Updated the rest of maven to utilize this new ArtifactManager.
* The default wagon providers list is now managed from within wagon-manager's dependency list.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505520 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 21:53:27 +00:00
John Dennis Casey ad35b458bf Fixing project-loading to process inheritance in the correct direction, and finishing support for custom profile activators...also moving /project/build/extensions handling out to a separate extension scanner component, for later reuse elsewhere.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@501186 13f79535-47bb-0310-9956-ffa450edef68
2007-01-29 21:26:30 +00:00
John Dennis Casey 08825262be Adding custom profile activator support, using the <custom/> tag in the <activation/> section of a profile.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@499911 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 19:02:16 +00:00
John Dennis Casey 8831e55e78 Fixing project inheritance and profile-injection now that we've moved to the model lineage builder. Iteration was backward.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@499603 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 22:53:00 +00:00
John Dennis Casey dfc4a10c68 Adding the notion of a build-context, and several build-context classes that can be used: ProjectBuildContext, which contains lineage and current-project info, ExecutionBuildContext, which contains the information in the original MavenExecutionRequest, and SystemBuildContext, which contains things like System properties...these use the BuildContextManager to store and retrieve their info from the core container's Context object.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497911 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 19:15:18 +00:00
John Dennis Casey 87226eab2e Stop re-applying profiles to models that have already had profiles applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497556 13f79535-47bb-0310-9956-ffa450edef68
2007-01-18 20:07:23 +00:00
John Dennis Casey 3e3b0fd239 Fixing caching of Model files, in case it's brought in via reactor and the current relativePath of a parent is wrong...it can still be found, as required by IT0103.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497554 13f79535-47bb-0310-9956-ffa450edef68
2007-01-18 19:58:42 +00:00
John Dennis Casey c7738df560 Splitting model-lineage loading and profile-application out into separate components...profile-application, so the model-lineage builder can run properly, and the model-lineage builder, so we can pre-scan for models with extensions that may contain things like profile activators, which would be used during project-loading.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@496910 13f79535-47bb-0310-9956-ffa450edef68
2007-01-17 01:36:07 +00:00
Brett Leslie Porter c416a33a4c [MNG-2745,MNG-2753] more completely remove env vars - no point in populating them if they are never used
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494710 13f79535-47bb-0310-9956-ffa450edef68
2007-01-10 04:40:39 +00:00
Brett Leslie Porter bd608ed4cf remove env var tests since the handling was removed. Note that the functionality needs to be re-enabled via the CLI: see MNG-2753
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494704 13f79535-47bb-0310-9956-ffa450edef68
2007-01-10 04:32:43 +00:00
Fabrizio Giustina bf7d7a01a0 MNG-2746 fixing an obvious NPE when parent path is a directory and pom is not found. Also reported in MNGECLIPSE-184 and CONTINUUM-1000
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494085 13f79535-47bb-0310-9956-ffa450edef68
2007-01-08 15:01:21 +00:00
Jason van Zyl a966656f38 o Code from netbeans integration that will write out changes to a model and preserve the existing structure for the most part.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@493824 13f79535-47bb-0310-9956-ffa450edef68
2007-01-07 19:53:06 +00:00
Kenney Westerhof 2327f170e6 Added a note on project sorting and cycles.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@489114 13f79535-47bb-0310-9956-ffa450edef68
2006-12-20 15:30:10 +00:00
Jason van Zyl cc5a658907 o update the deps to the new releases of wagon wheels and plexus
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@486535 13f79535-47bb-0310-9956-ffa450edef68
2006-12-13 07:42:00 +00:00
Brett Leslie Porter 8b0f212ffa fix a crappy error message. It said that a POM referenced itself, when the problem was that the expression referenced itself.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@475132 13f79535-47bb-0310-9956-ffa450edef68
2006-11-15 06:08:40 +00:00
Kenney Westerhof edde7a1b58 PR: MNG-2603
Revert accidental commit on ProjectSorter.java in revision r462868.

I locally modified the ProjectSorter to exclude the build plugins from the DAG
to fix some cycles in the reactor when importing the entire trunk (components,
shared, scm, plugins etc..) in Eclipse. This was never meant to be committed.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@463922 13f79535-47bb-0310-9956-ffa450edef68
2006-10-14 12:50:36 +00:00
Kenney Westerhof f286c9fbc6 Create artifact directory as the Get task doesn't create them
NOTE: accidently commited other files too. Only build.xml was 
  supposed to be committed.
  - it0074/pom.xml: leave as is; it fixes a <depedencies> section;
  - maven-plugin-tools-java/pom.xml was fixed by jason at revision 462919;
  - ProjectSorter.java is fixed in revision 463922;


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@462868 13f79535-47bb-0310-9956-ffa450edef68
2006-10-11 17:20:57 +00:00