Commit Graph

6602 Commits

Author SHA1 Message Date
Paul Gier e4602cb85a Fix for profile deactivation.
Submitted By: David Bernhard
Issue id: MNG-3545


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@656405 13f79535-47bb-0310-9956-ffa450edef68
2008-05-14 20:22:22 +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
John Dennis Casey 89f6e8e60e Fixing xpp3 imports for plugin realms.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@654198 13f79535-47bb-0310-9956-ffa450edef68
2008-05-07 18:08:15 +00:00
Brett Leslie Porter e84395ecb3 remove property that shouldn't be needed - it was causing ${maven.repo.local} to be created locally as a directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@654116 13f79535-47bb-0310-9956-ffa450edef68
2008-05-07 14:13:53 +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
Carlos Sanchez Gonzalez 706890fd2b Remove component that no longer exists
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@652730 13f79535-47bb-0310-9956-ffa450edef68
2008-05-02 02:02:39 +00:00
John Dennis Casey 6d897f9312 Cleaning up artifact ordering for extensions and plugins in teh realm manager by switching to List for artifact collections, instead of allowing unordered Collection instances.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@651081 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 21:50:49 +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
Milos Kleint 12a125bcad report plugin map flushing shall be synchronized to prevent NPEs in multithreaded envs.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@650807 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 09:28:58 +00:00
John Dennis Casey 5900250b45 Cleaning up the error message formatting some more.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@650601 13f79535-47bb-0310-9956-ffa450edef68
2008-04-22 18:05:10 +00:00
John Dennis Casey 1cb3190b0f Make the error message construction a little more resilient to errors in classloading.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@650543 13f79535-47bb-0310-9956-ffa450edef68
2008-04-22 15:11:19 +00:00
Milos Kleint 02367233e1 getKey() is used many-many-many times when loading projects. it's ineffective to construct the key each time.
Ideally the cached key would get reste when groupId or artifactId gets set, I didn't figure how to do it in modello though..

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@650427 13f79535-47bb-0310-9956-ffa450edef68
2008-04-22 09:27:45 +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
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
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
John Dennis Casey 3f68f32abf Switch to using maven-distribution instead of maven-embedder, and stop using project.version references in the plugin configs, where the timestamp/buildnumber may be different between core-it-runner and -distribution.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649590 13f79535-47bb-0310-9956-ffa450edef68
2008-04-18 16:25:59 +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 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 3fbea1aad5 o creating a separate module for the distribution like there is in the 2.0.x branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648510 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 04:57:15 +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 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