Commit Graph

2809 Commits

Author SHA1 Message Date
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
Brett Leslie Porter 4a094fd1f1 fix bugs in detecting resolution so that correct repo is checked
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226805 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 14:44:46 +00:00
Emmanuel Venisse c8ce1a91b5 Unallowed release in snapshot repos
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226783 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 12:35:27 +00:00
Brett Leslie Porter a86724e657 turn off report conversion
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226782 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 12:33:16 +00:00
Brett Leslie Porter 905befa4c8 snapshot repo separation for mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226763 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 08:28:32 +00:00
Brett Leslie Porter 2b93fb8cc7 snapshot repo separation for mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226761 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 08:23:33 +00:00
Brett Leslie Porter 5aacdad52f snapshot repo separation for mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226760 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 08:17:12 +00:00
Brett Leslie Porter fea880dce0 put nice back in the script instead of crontab
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226759 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 08:02:26 +00:00
Brett Leslie Porter f9251857f3 remove empty directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226758 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 06:59:18 +00:00
Brett Leslie Porter 08239ecc19 - put back to model.v3_0_0 and generate a new JAR from maven-model (M 1.1's version includes a v3 under the o.a.m.model directory as well as o.a.m.project)
- update to 2.0-beta-1 JARs and resulting cleanup
- don't copy snapshots by default

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226756 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 06:42:18 +00:00
Brett Leslie Porter c897ac5f3b add profile for building all
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226755 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 06:39:59 +00:00
Brett Leslie Porter 34e0267062 some minor cleanups
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226729 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 03:52:42 +00:00
Brett Leslie Porter b147d6329b PR: MRM-8
switch generated sources for the maven-model-3.0.0 JAR

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226727 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 03:39:36 +00:00
Brett Leslie Porter 9a662b5292 get repoclean compiling again, add assembly descriptor in place of install script
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226715 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 02:12:11 +00:00
Brett Leslie Porter 5354706f05 cleanup it0043
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226711 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 01:05:38 +00:00
Kenney Westerhof e300b10792 Removed unused imports and added package declarations to maven-plugin-tools-java
test resources (to stop eclipse from complaining).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226699 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 22:12:34 +00:00
Kenney Westerhof f84a2ce8ec Add interface method - makes this compile again (it isn't included
in the bootstrap).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226697 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 21:23:36 +00:00
Kenney Westerhof 64887493fe o When eclipse files are created in another location, add a link to the pom;
o Fixed some coding style errors;


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226695 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 21:10:36 +00:00
Jason van Zyl 33ee96ceb9 o http://jira.codehaus.org/browse/MNG-420
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226683 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 19:20:33 +00:00
Kenney Westerhof b294585343 o Project references are now written to .project, so that eclipse
can calculate the build order - no more rebuilds needed to fix this!

o Added a switch -Declipse.workpace=/path/to/workspace that allows for the
  .classpath and .project files to be written to a new directory:
  - For each project a new directory is created.
  - Eclipse 'Links' are created to the original project location for the
    sources and resources directories.
  - The target directory will be in the new workspace location, not in
    the original project tree.
  
  This offers the following advantages:
  
  - Project trees that normally couldn't be imported into eclipse
  because of the overlap error now can be imported succesfully
  (m2 works now!)

  - Projects that reside on a ClearCase SMB mounted drive (which are
  very slow) can now have a target directory on a local drive without
  modifying the pom, greatly improving build speed in eclipse.

o Fixed some minor bugs where the wrong project instance was used.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226669 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 18:00:13 +00:00
Kenney Westerhof d09c2affad Tests wheter override of the 'central' and 'central-plugins' builtin
repositories work.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226656 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 16:02:31 +00:00
John Dennis Casey dc719a450f Adding profiles doco.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226590 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 00:45:33 +00:00
John Dennis Casey 5622a00ef1 Adding plugin-prefix mapping doco.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226568 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 19:24:43 +00:00
Brett Leslie Porter 13c5bc0df8 PR: MNG-608
diagnose place this change needs to occur

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226544 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 16:26:02 +00:00
Brett Leslie Porter d978e51dc6 write out the generated POM to avoid a waster URL connection next time
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226541 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 16:10:01 +00:00
Brett Leslie Porter 47744229e8 correct no project handling (eg archetype:create)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226540 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 16:04:02 +00:00
Brett Leslie Porter 5e75912ed1 licenses and intention changes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226538 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 15:52:15 +00:00
Brett Leslie Porter b8d98d1cff PR: MNG-678
update to latest jsch, has improved session closing handling



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226532 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 15:20:01 +00:00
Brett Leslie Porter 8cb9563692 fix this once and for all. This covers the case of having a local snapshot that was not found remotely, as well as the previous case it was reverted for - avoiding creating the metadata when it didn't exist remotely.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226512 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 13:32:41 +00:00
Vincent Massol d82808fe0c - Percentage is a string with a percent symbol.
- Modified code under test so that TPC is 66,66% and not 100% (just because I can). Added a conditional statement.
- The clover:check still fails but I've pinpointed it to the fact that the surefire plugin does not fork tests and thus the coverage database is empty when the check occurs (that's because by default clover re-initializes the database upon a new instrumentation - Using a span attribute makes it work but that's not what we want).

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226510 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 13:25:39 +00:00