Jason van Zyl
71dea0bbbd
o use the default local repository, i'll add a super clean mode later. i want speed right now.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648476 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 00:49:10 +00:00
Jason van Zyl
4c0d0199f5
o if you have m2_home it does not to be named after the version
...
o works with a symlinked m2_home
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648474 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 00:41:00 +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
Jason van Zyl
1c676ed4bb
o add the ant tasks to the directory structure for now for the bootstrap
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648289 13f79535-47bb-0310-9956-ffa450edef68
2008-04-15 15:42:05 +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
Vincent Siveton
3c05ebda15
o merged from r647732 (MNG-3520: Korean message resource)
...
Issue id: o m
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@647733 13f79535-47bb-0310-9956-ffa450edef68
2008-04-14 11:12:38 +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
ec3ec0567e
Fixing interpolation for project.basedir and pom.basedir, by internalizing the basedir handling into the interpolator (now that we're passing in projectDir, it's easier to handle there).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@647287 13f79535-47bb-0310-9956-ffa450edef68
2008-04-11 19:53:04 +00:00
John Dennis Casey
24af7274bc
Fixing error-reporting pointcuts for plugin manager changes I just checked in.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@646544 13f79535-47bb-0310-9956-ffa450edef68
2008-04-09 21:21:13 +00:00
John Dennis Casey
32a9c73445
Fixing MNG-2277 integration test.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@646517 13f79535-47bb-0310-9956-ffa450edef68
2008-04-09 20:21:39 +00:00
John Dennis Casey
21d8a411f6
Fixing MNG-2861.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@646142 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 23:49:47 +00:00
John Dennis Casey
5691b96e4d
Fixing MNG-3473 integration test.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@646052 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 19:51:15 +00:00
John Dennis Casey
0734c3e60e
quiet down some of the project-caching debug output for now...it's getting in the way of debugging other things.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@645971 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 15:25:13 +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
64b93201c3
Fixing it0103, which in this case had to do with when to use the relativePath to lookup the parent model from the project workspace.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644767 13f79535-47bb-0310-9956-ffa450edef68
2008-04-04 16:51:53 +00:00
John Dennis Casey
10b0c7d8e8
adding license header
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644497 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 21:05:12 +00:00
Herve Boutemy
49a0e76b82
[MNG-3497] rar, par and ejb3 archives should not be added to classpath
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644434 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 18:30:00 +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
82787b4ece
[MNG-3498] Fixing StringIndexOutOfBoundsException.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644378 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 15:48:36 +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
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
Milos Kleint
30ea33aefb
MEVENIDE-618 synchronize the flushPluginMap and getPluginsAsMap to prevent NPEs in multi thread access.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@643878 13f79535-47bb-0310-9956-ffa450edef68
2008-04-02 12:40:13 +00:00
John Dennis Casey
7442d682d1
Cleaning up the pluginRepositories warning, and isolating it to a compatibility aspect so we can scan Model and Profile instances as they pass through the system more cleanly and ignore violations from POMs that are resolved in the repository.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@643188 13f79535-47bb-0310-9956-ffa450edef68
2008-03-31 22:27:20 +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
John Dennis Casey
3f75133076
[MNG-3482][MNG-3391]
...
1. Moving the mergeManagedDependencies(..) call INSIDE of processProjectLogic(..), to just AFTER interpolation but BEFORE injection of managed-dependency information into the main dependencies information, and also ahead of model validation. This allows expressions in imported-POM specifications to be interpolated before these are merged to the current project.
2. Restricting the mergeManagedDependencies(..) logic to only happen when type == pom (which was already there) AND scope == import (which is new).
ALSO related to [MNG-3483].
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@641662 13f79535-47bb-0310-9956-ffa450edef68
2008-03-27 00:47:51 +00:00
Benjamin Bentmann
b56e146d2d
o Added svn:keywords
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640556 13f79535-47bb-0310-9956-ffa450edef68
2008-03-24 20:23:25 +00:00
Benjamin Bentmann
2bf41e24b2
o Added svn:eol-style=native
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640555 13f79535-47bb-0310-9956-ffa450edef68
2008-03-24 20:20:41 +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
Benjamin Bentmann
ca83db4b5b
o Beautified project name
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640228 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 17:49:56 +00:00
Benjamin Bentmann
0ec14e6ff4
o Added Eclipse files to svn:ignore
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@640222 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 17:10:35 +00:00
Brian E Fox
bc57c4bafb
going back to assembly beta-1 as there is an important regression in assembly:attached. MASSEMBLY-301
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@639744 13f79535-47bb-0310-9956-ffa450edef68
2008-03-21 18:18:07 +00:00
Brian E Fox
4ae119a9db
MNG-3395: adjust the ear plugin version
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@639019 13f79535-47bb-0310-9956-ffa450edef68
2008-03-19 21:08:04 +00:00
John Dennis Casey
b1f048aed7
[MNG-3286] Fixing inherited flag for plugin executions.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@638213 13f79535-47bb-0310-9956-ffa450edef68
2008-03-18 04:45:05 +00:00
Brian E Fox
63513cb1c7
MNG-3395: adjust the plugin versions (merge from 2.0.x)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@638013 13f79535-47bb-0310-9956-ffa450edef68
2008-03-17 18:38:51 +00:00
Brian E Fox
56178abd95
pass on the local repo to the its
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@638008 13f79535-47bb-0310-9956-ffa450edef68
2008-03-17 18:30:17 +00:00
John Dennis Casey
b8fb4e3471
[MNG-3355] Use translated paths to resolve expressions referencing build directories in the model during interpolation, if the project-descriptor is known (if the project is from the local filesystem, not from the repository system).
...
Also, merge repositories and pluginRepositories when creating their ArtifactRepository analogs, to restore the pluginRepository functionality. I've added a deprecation warning in these cases, but it may need to be made more prominent.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@637326 13f79535-47bb-0310-9956-ffa450edef68
2008-03-15 01:28:01 +00:00
John Dennis Casey
78f361ecd4
Adding comment on MNG-3391 problems...this is from the other day, and I forgot I had it.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@637277 13f79535-47bb-0310-9956-ffa450edef68
2008-03-14 21:35:41 +00:00
Brian E Fox
7c3fc6b47e
making the verifier use the target folder. This makes it easier to browse a CI workspace, lets you actually clean everything, and makes the tests work better on windows. who knew?
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@637248 13f79535-47bb-0310-9956-ffa450edef68
2008-03-14 20:25:20 +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
John Dennis Casey
e7eefe0b3f
Pushing project workspace usage out of ProjectCacheAspect into DefaultMavenProjectBuilder and DefaultModelLineageBuilder, to make it easier to understand how these critical pieces of logic execute relative to other pieces of the project-building process, such as managed-dependency merging.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@636023 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 17:27:29 +00:00
Milos Kleint
b8042967e0
MAVEN-3430 make sure getType never returns null.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@635690 13f79535-47bb-0310-9956-ffa450edef68
2008-03-10 21:07:54 +00:00
Brian E Fox
c3084c97fb
use the correct property syntax
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634822 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 21:04:05 +00:00
Brian E Fox
2f09ccf48c
MNG-3395: defaulted apache plugin versions in the superpom
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634817 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 20:57:51 +00:00
Vincent Siveton
c9888e169a
o merged from r634311 (MNG-3442: Add explicit resource bundle for English)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634313 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 15:45:08 +00:00
Vincent Siveton
39a85be0d3
o merged r634304 (MNG-428: Japanese message resource)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634305 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 15:32:01 +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