Commit Graph

2688 Commits

Author SHA1 Message Date
John Dennis Casey acf7e6f1f8 Correcting problem with originalModel being reset inside processProjectLogic(..) in DefaultMavenProjectBuilder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231121 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 21:44:54 +00:00
John Dennis Casey 9b92bf860e Adding better handling for originalModel in MavenProject.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231112 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 20:56:12 +00:00
John Dennis Casey 0f9196a83d Resolving: MNG-608 (deprecate for now, remove later...notes in TODOs)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231084 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 19:26:24 +00:00
Trygve Laugstol ec2da14433 o Setting svn ignores.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231065 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 17:13:40 +00:00
Trygve Laugstol 0afba79871 o Updating WRT the latest plexus-api.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231064 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 17:03:55 +00:00
John Dennis Casey 1e1efffcba Resolving: MNG-592 (again)
o Modified the PluginMappingDeployMojo in maven-plugin-plugin to always deploy the plugins.xml regardless. This may be a bit heavy, but it avoids the snag with the plugins.xml being detected in the local repository after the install phase runs...plugin mappings weren't making it to the repository during deploy.

o Added a new series of IT: it2xxx which will be tests that require more than a single maven invocation, and will be run via shell script, at least for now. This one builds and deploys a plugin, then attempts to use the plugin by referencing the prefix mapping in the (non-central) remote repository.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231058 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 16:11:40 +00:00
Brett Leslie Porter 70eadfd14d if a version part has a leading 0, fallback to string comparison but to retain the extra 0.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231016 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 09:18:08 +00:00
Trygve Laugstol 16bbbbdd91 o Adding a piece about dependency management.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230934 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 00:20:31 +00:00
Trygve Laugstol 80c945fd82 o Setting ignores.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230933 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 00:20:09 +00:00
John Dennis Casey 09ebb0f615 Resolving: MNG-163
Use MavenProject.addResource(..) and .addTestResource(..) to perform this function. I've built a BuildOverlay to insulate the interpolated, initialized Model's Build instance from runtime changes to these, in a similar fashion to addCompileSourceRoots(..), because I wanted to preserve some compat with plugins using ${project.build.resources}.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230920 13f79535-47bb-0310-9956-ffa450edef68
2005-08-08 23:06:48 +00:00
Trygve Laugstol daba7dca27 Resolving http://jira.codehaus.org/browse/MNG-710: "Add ability to fork the
maven-compiler-plugin".
o Applying Rod Coffin's patch. Removed the basedir as a configurable argument.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230869 13f79535-47bb-0310-9956-ffa450edef68
2005-08-08 19:58:32 +00:00
Kenney Westerhof 2823fe4711 Solving MNG-711:
o Added a check in MavenProject.getArtifacts() to never return null,
  but an empty Set, since there's almost no checking.

o Added requiresDependencyResolution test to SurefirePlugin.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230827 13f79535-47bb-0310-9956-ffa450edef68
2005-08-08 17:55:21 +00:00
Vincent Siveton 08da2ff248 MNG-695: Added more tests on anonymousConnection, devConnection and scmUrl to prevent NPE. Added the test case num 11.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230612 13f79535-47bb-0310-9956-ffa450edef68
2005-08-07 00:07:50 +00:00
Vincent Siveton f862da60b6 Added methods to repeat arguments (for group, tag, link and linkoffline options provided by the Javadoc standard doclet). Added plexus-utils as transitive dep.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230549 13f79535-47bb-0310-9956-ffa450edef68
2005-08-06 14:32:43 +00:00
Trygve Laugstol b4cbc02567 o Adding parameters:
- Show deprecation
 - Show warnings
o Using the setters on the configuration object instead of passing them in
  their raw format (eg -target 1.1).

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@230547 13f79535-47bb-0310-9956-ffa450edef68
2005-08-06 12:36:48 +00:00
Trygve Laugstol b1b01a6c94 o Adding support for selecting the Plexus compiler implementation. Configure
the compiler plugin with <compilerId>, both "javac" and "eclipse" will work.
  The default value is still "javac" so this shouldn't break anything.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227494 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 21:23:32 +00:00
John Dennis Casey b69490b828 Resolving: MNG-95
o Added --fail-fast --fail-at-end --fail-never CLI options, with appropriate summary and exclusion of dependent projects from the build when --fail-at-end is specified. Also, implemented it0046 and it1011 to test it.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227490 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 21:14:51 +00:00
Vincent Siveton 7020caf8ee Put plexus-utils dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227345 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 11:17:50 +00:00
Emmanuel Venisse 8400eeeefe oopps, bad test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227331 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 09:42:09 +00:00
Emmanuel Venisse 98066ab241 Allowed user to defined maven.repo.local if settings.xml file exist
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227310 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 06:30:13 +00:00
John Dennis Casey c6dad78398 Re-adding the lifecyclePhase/phase tag for mojo metadata.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227296 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 03:04:33 +00:00
John Dennis Casey d4dfd0934b Re-adding this...never should've been deleted.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227294 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 02:59:54 +00:00
John Dennis Casey bedfb04220 ...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227293 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 02:51:00 +00:00
John Dennis Casey 22744c798d trying to resurrect this one...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227292 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 02:31:33 +00:00
Brett Leslie Porter 2b1be3e2ff update roadmap
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227290 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 02:03:04 +00:00
Brett Leslie Porter 0a637acedd rollback last set of changes, and fix the bug in the existing revision by storing the filenames in a list rather than the identical keys in a set
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227282 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 00:35:39 +00:00
John Dennis Casey 71cb5dc399 Resolving: MNG-282
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227259 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 20:43:58 +00:00
John Dennis Casey 395fe63613 Resolving: MNG-557
o Added new CLI switch {--settings,-s} for alternate user settings path.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227250 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 19:26:20 +00:00
John Dennis Casey 25f83d1033 Fixing problem where release:prepare was only going to add the top-level release-pom.xml...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227234 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 16:57:54 +00:00
Vincent Siveton 4f34ea4f93 Rolling back to still allow exception on duplicate files and some small improvements.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227216 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 13:11:10 +00:00
Kenney Westerhof a8229d20f5 Add missing )
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227200 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 11:38:25 +00:00
Kenney Westerhof 7a69f15c15 o Resolved MNG-692, although I think a more general solution is required;
o Fixed another boolean-logic error in the ear plugin.
  Stephane: (x != a) || (x != b) is always true, unless a == b.. ;-)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227198 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 11:29:36 +00:00
Vincent Siveton 9508fdde65 Refactored the ScmReport class to handle the SCMs with the maven-scm component. Generates reports for all SCMs supported by the maven-scm-provider component: ClearCase, CVS, Perforce, Starteam and SVN.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227197 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 11:25:33 +00:00
Kenney Westerhof d031f4309a Bumping version of plexus-compiler-(api|javac) to 1.5-SNAPSHOT:
o Resolves MNG-689

	o Improved parsing of compiler output


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227187 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 09:28:03 +00:00
Kenney Westerhof bf93930cf9 Forgot to remove the module package.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227177 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 07:21:15 +00:00
Brett Leslie Porter b072910ab3 make sure plugin repositories don't get used to resolve parents and dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227164 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 05:11:16 +00:00
John Dennis Casey 786091aa6c Working on: MNG-662
o Cleaned up resume functionality, and checkpointing for the release:prepare mojo.

TODO:

- Add testing of some sort
- Verify that maven-scm's checkin function is recursive (suspect it's not)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227150 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 03:11:03 +00:00
John Dennis Casey 8f4b0deaaf Working on: MNG-662
o Moved release.properties management to a helper class
o Created a helper class for caching/prompting for project-versions
o Created a helper class for managing SCM info updates during the release:prepare process
o Moved as many of the shared fields out of AbstractReleaseMojo as possible, given the refactor to reactorized processing
o Refactored the PrepareReleaseMojo to process a list of projects, and resolve inter-dependencies during transforms, etc.
o Refactored the PerformReleaseMojo to adjust to the new helper classes.
o Removed the old transformers, since MavenProject.writeOriginalModel() can be used instead, using the modello writer
o Bumped the maven-scm versions up to 1.0-alpha-2-SNAPSHOT, and added maven-scm-manager-plexus.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227148 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 02:36:14 +00:00
John Dennis Casey 094a5a4312 Working on: MNG-662
o Moved extension-artifact creation and caching to MavenProject, initialized by MavenProjectBuilder, just like plugin-artifacts is.

o Added extension-artifact and report-artifact creation (and initialization in MavenProject) to MavenProjectBuilder, for consistency with plugin-artifacts

o Removed dependency on ArtifactFactory in DefaultExtensionManager (extension artifacts are reachable from MavenProject now)

This makes the process of resolving all artifacts referenced by a project much simpler and more consistent (namely, for the release plugin)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227147 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 02:30:21 +00:00
Brett Leslie Porter 2b4a78632c not ready for this yet
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227109 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 23:16:03 +00:00
Kenney Westerhof 6508398316 o Bumped version of plexus-container-default to 1.0-alpha-6-SNAPSHOT
o Committed changes to the EAR plugin on behalf of Stephane Nicoll,
  awaiting his commit privileges.
  Resolves MNG-621 and MNG-622.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227088 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 21:47:50 +00:00
Kenney Westerhof d396f24642 o Put all m2 core dependencies (plexus-container-default and plexus-utils)
under dependencyManagement of m2 and maven-plugins, and removed
  versions in all poms having either as a parent.
  Used version 1.0.2-SNAPSHOT for plexus-utils as that was used in maven-core
  and is not overridable.

o Bumped maven-archiver version to 2.0-beta-1-SNAPSHOT for maven-ear-plugin


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227084 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 21:34:54 +00:00
Kenney Westerhof 6da771ab70 Fix MNG-508: make mboot use dependencyManagement.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227079 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 20:36:02 +00:00
Kenney Westerhof 5a99a71bcb Fixes MNG-514: ScopeArtifactFilter will also include PROVIDED artifacts
when resolving for TEST. They are enabled for dependency resolution,
  but NOT added to any classloader.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227022 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 15:16:39 +00:00
Kenney Westerhof 869525558b Fixed MNG-687:
MavenProject( MavenProject ) constructor creates an unmodifyable
	attachedArtifacts, making it impossible for plugins to attach artifacts.

	This constructor is only referenced from DefaultLifeCycleExecutor
	in forkLifeCycle, so it's a safe change.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226989 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 12:27:20 +00:00
Kenney Westerhof 872e0972c8 Replacing all \ to / in paths - Eclipse writes windows paths with / and can't
read windows-native paths like C:\Documents and Settings\.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226987 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 11:52:22 +00:00
Vincent Siveton 2639914fee Correct a JS method name and format JS script
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226900 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 22:30:26 +00:00
Brett Leslie Porter ec22f0087f missed inheritence
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226819 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 15:22:47 +00:00
Brett Leslie Porter 6f0d8c58d7 improve reporting of scope
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226814 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 15:09:39 +00:00
Brett Leslie Porter acdef905ac correctly align versions during mediation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226813 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 15:02:43 +00:00