Commit Graph

510 Commits

Author SHA1 Message Date
John Dennis Casey 51f23d93d9 Fixing NPE.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@328898 13f79535-47bb-0310-9956-ffa450edef68
2005-10-27 15:40:47 +00:00
Brett Leslie Porter 221ddfcd8b PR: MNG-1246
Submitted by: Allan Ramirez
add target/test-classes to the test classpath elements variable

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@328157 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 21:48:55 +00:00
Brett Leslie Porter 9deb44caaa update the descriptor after removing requirement
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327890 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 00:35:43 +00:00
Brett Leslie Porter d7c3795f1c remove unused code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327887 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 23:58:31 +00:00
Brett Leslie Porter 56f566e79e clean some imports and unused code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327885 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 23:50:38 +00:00
Brett Leslie Porter 772bf37124 PR: MNG-1223
error out if there are duplicate modules in the reactor


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327763 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 08:07:38 +00:00
Brett Leslie Porter f9e025dba8 merge from tag maven-2.0 up to rev 326624
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326633 13f79535-47bb-0310-9956-ffa450edef68
2005-10-19 18:31:30 +00:00
Brett Leslie Porter 63e7788945 try using repo1 again to see if it avoids the 503 errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326009 13f79535-47bb-0310-9956-ffa450edef68
2005-10-18 01:40:05 +00:00
Emmanuel Venisse 61aaa986c3 Add missing build method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321513 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 23:39:30 +00:00
Brett Leslie Porter b4c041a567 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321042 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:26:39 +00:00
Brett Leslie Porter d783c5fc41 [maven-release-plugin] prepare release maven-2.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321040 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:15:39 +00:00
Brett Leslie Porter 79058b9388 bundle javadoc with java source releases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320991 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 03:50:52 +00:00
Brett Leslie Porter ed22c950e8 add new methods to type handler:
- isAddedToClassPath (default false)
- language (default "none")

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320986 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 03:32:41 +00:00
Brett Leslie Porter 1c7c34f027 more error diagnostics improvements
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320869 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 18:49:19 +00:00
Brett Leslie Porter 1499b5dcd3 PR: MNG-122
finish cleanup of resolution exceptions

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320748 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 12:16:43 +00:00
Brett Leslie Porter 1f97932050 PR: MNG-122
cleanup artifact/plugin not found exception

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320704 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 09:51:36 +00:00
Brett Leslie Porter 562facf5d2 PR: MNG-122
cleanup artifact metadata retrieval exceptions

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320701 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 09:13:11 +00:00
Brett Leslie Porter 864371e12d change main repo until we stabilise maven.org
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320693 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 08:39:01 +00:00
Brett Leslie Porter 04e02209b1 PR: MNG-122
use real exceptions for repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320683 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 08:04:27 +00:00
Brett Leslie Porter 1901992586 PR: MNG-122
exception clean up phase 2

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320675 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 06:50:22 +00:00
Brett Leslie Porter 5de6418c69 PR: MNG-122
exception clean up phase 1

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320668 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 05:30:22 +00:00
Brett Leslie Porter 10a8e05df6 clean up project exception handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@314994 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 18:49:01 +00:00
Brett Leslie Porter da63e5c2af use common method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@312895 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 14:37:41 +00:00
Emmanuel Venisse 83b8cafc33 Add build method that can disable distributionManagement status for file that come from repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@312840 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 08:45:12 +00:00
John Dennis Casey f685d8605d Resolving: MNG-449, MNG-152, MNG-1090, MNG-1089, MNG-1122
o Removed -cpl and related command line switches for controlling use of LATEST metadata for resolving plugin versions
o Made LATEST the only metadata used to resolve plugin versions, since this is also available when releases are performed
o Added various error diagnostics for project build exceptions
o Enhanced artifact not found error diagnostics
o Removed maven-project and added maven-artifact to maven-surefire-plugin's pom
o Removed the stanza that added pluginArtifacts to the test-booter's classpath...they are already covered by the classpathElements
o Fixed ITs in connection to the removal of -cpl
o Changed the plugin manager to detect whether a plugin's artifact file has changed since the plugin container was created...if so, reload it.
o Took the projecthelp plugin out of the build until I can diagnose the problems with its build (probably tomorrow).



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@312827 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 07:35:33 +00:00
Brett Leslie Porter ac0cc23521 PR: MNG-1147
validate that resources have a directory

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@312528 13f79535-47bb-0310-9956-ffa450edef68
2005-10-10 02:16:39 +00:00
Brett Leslie Porter 13b0cf75e6 PR: MNG-864
reverting: Fail build if the model contains an expression that doesn't evaluate

(This is the desired behaviour, however there are too many crappy poms in the repo and an issue with the timing of executing the interpolation)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307315 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 17:16:12 +00:00
Brett Leslie Porter 2715208e74 PR: MNG-801
validate ids in model

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307314 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 17:12:41 +00:00
Brett Leslie Porter 3171417299 PR: MNG-864
Fail build if the model contains an expression that doesn't evaluate

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307311 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 16:48:21 +00:00
Brett Leslie Porter 84d1a85baf PR: MNG-738
indicate where the parent is coming from and for which project

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307310 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 16:36:11 +00:00
Brett Leslie Porter f8cbb08498 PR: MNG-616
improve version logging, use artifact.toString for textual logging

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307309 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 16:30:28 +00:00
Brett Leslie Porter 510de4fe54 upgrade plexus utils to 1.0.4-SNAPSHOT.
The group ID has changed, so add a bunch of exclusions to ensure the old is not picked up
fix bugs in mboot that wasn't honoring excludes.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307294 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 14:13:31 +00:00
Brett Leslie Porter cb259a7689 PR: MNG-950
use active project artifacts for extensions and plugin dependencies

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307245 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 03:06:54 +00:00
Brett Leslie Porter 5d3ae9656b PR: MNG-850
provide feedback when gathering projects, and list build order in reactor.
Also improve naming of projects that don't give a name

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307228 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 00:44:08 +00:00
Brett Leslie Porter 70ab341c64 PR: MNG-1108
don't resolve a default POM for a parent or dependency of type POM

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307047 13f79535-47bb-0310-9956-ffa450edef68
2005-10-07 08:03:25 +00:00
Brett Leslie Porter 3ad9ca72c5 validate repositories in the POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307035 13f79535-47bb-0310-9956-ffa450edef68
2005-10-07 06:47:28 +00:00
Brett Leslie Porter 245d512c4a PR: MNG-1110
differentiate between an artifact that is not found, and failure to obtain an artifact

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307034 13f79535-47bb-0310-9956-ffa450edef68
2005-10-07 06:44:59 +00:00
Brett Leslie Porter 5304aecb46 PR: MNG-1112
correct merging of profile reporting

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@306994 13f79535-47bb-0310-9956-ffa450edef68
2005-10-07 04:08:55 +00:00
Brett Leslie Porter 37f2a94bf2 PR: MNG-1088
if plugin is not built yet, go to the repository

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@306547 13f79535-47bb-0310-9956-ffa450edef68
2005-10-06 07:10:49 +00:00
Brett Leslie Porter 581b2ce871 PR: MNG-1094
unique version must be inherited

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@306518 13f79535-47bb-0310-9956-ffa450edef68
2005-10-06 03:42:52 +00:00
Brett Leslie Porter 24a5bf4525 PR: MNG-1094
unique version must be inherited

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@306504 13f79535-47bb-0310-9956-ffa450edef68
2005-10-06 02:55:39 +00:00
John Dennis Casey c66610a6e4 Resolving: MNG-1056...Added code to reconstruct the remote artifact repository list after the project has had profiles applied. This was already done for plugin repositories. Also, added null protection to DefaultLog per Chris Berry's suggestion.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@295111 13f79535-47bb-0310-9956-ffa450edef68
2005-10-05 20:43:06 +00:00
John Dennis Casey 79cad82736 Resolving: MNG-1021, MNG-1049
o Added check for projectArtifact.isResolved() before attempting to read the model from it within DefaultMavenProjectBuilder, otherwise, stub out a dummy model just like if an ArtifactResolutionException occurs.

o Disabled metadata handling for AttachedArtifact...attachments should be slaves to the main artifact, deriving version info and metadata from it.

o Cleaned up entry for it2003 in maven-core-it/README.txt...that test has been removed.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@295069 13f79535-47bb-0310-9956-ffa450edef68
2005-10-05 18:31:37 +00:00
Brett Leslie Porter 192de6841a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293588 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:13:52 +00:00
Brett Leslie Porter b4e4a1f375 [maven-release-plugin] prepare release maven-2.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293584 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:02:48 +00:00
Brett Leslie Porter ba94b208d7 PR: MNG-922
allow the disablement of timestamping snapshots, reusing the same file in the remote repo


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293570 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 08:43:36 +00:00
Brett Leslie Porter d8875a4f7d PR: MNG-818
allow a certain artifact type to designate it includes its dependencies already, disabling transitivity



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293535 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 05:25:40 +00:00
Jason van Zyl 38269cca84 o A change that eliminates the use of System.properties from the core in an
attempt to move toward true embeddability. 

 - System properties are still populated in the CLI to make sure that the 
   system property profile activator functions and the settings are dealt with
   correctly. I will look at each of those shortly but this is a first step.
   


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293504 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 03:31:35 +00:00
John Dennis Casey 53ccb4ffb0 Resolving: MNG-1021
o Added AttachedArtifact, and changed the DefaultMavenProjectHelper to create and attach artifacts of this type. AttachedArtifact uses a parent artifact (constructor parameter) for versioning and basic identity attributes, but requires the user to specify a type and classifier specific to the new artifact. We may want to add flexibility for artifactId, too...though I have reservations on that score.

o See it0079 for a test.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293497 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 02:54:49 +00:00
John Dennis Casey def783e4cf Resolving: MNG-934, MNG-669
o Changed default value for usePluginRegistry to 'false' in settings.mdo
o Changed default value for updateInterval to 'never' in plugin-registry.mdo
o Added ActivationOS in settings.mdo, profiles.mdo, maven.mdo
o Added code to the conversion utilities for Settings and Profiles to corresponding maven-model classes for ActivationOS
o Added OS activator for profiles which allows architecture, name, family, and version (with '!' negation of any of these)
o Added ActivationFile to settings.mdo, along with conversion code in the Settings->Model conversion utility
o Added packageWithVersion configuration to the modello plugin definition in maven-settings (this is apparently required now)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293479 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 01:07:36 +00:00
John Dennis Casey 805a5952eb Resolving: MNG-1052
o Added pluginManagement injection to MavenProject.addPlugin(..) so that no Plugin definition added to the project can go without having managed info injected into it.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293454 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 21:38:35 +00:00
Brett Leslie Porter 9f52ee0fcf PR: MNG-644
put back code that was hiding in a method with a name unrelated to it

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293357 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 14:16:16 +00:00
Brett Leslie Porter c532572152 PR: MNG-644
remove deprecated methods

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293341 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:28:25 +00:00
Brett Leslie Porter 4afb4ba351 PR: MNG-644
remove deprecated method

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293340 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:27:48 +00:00
Brett Leslie Porter fa65152c43 PR: MNG-644
remove deprecated repository settings

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293335 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:20:49 +00:00
Brett Leslie Porter 4b6babfbf7 PR: MNG-644
remove deprecated goal syntax

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293332 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:13:44 +00:00
Brett Leslie Porter 85fe459856 PR: MNG-644
remove deprecated goal syntax

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293328 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:10:39 +00:00
Brett Leslie Porter cc96c2bc38 PR: MNG-1041
don't use active project if it is not the same dependency


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293225 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 03:51:48 +00:00
Brett Leslie Porter 598cd29727 PR: MNG-895
revert to previous inheritence behaviour - only do it for profiles

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293213 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 02:34:41 +00:00
Brett Leslie Porter 41c129e593 PR: MNG-895
merge resource lists

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293205 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 02:09:04 +00:00
Brett Leslie Porter a922450b0b PR: MNG-1045
ensure parent always come first, but doesn't introduce a cycle


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293200 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 01:34:26 +00:00
Brett Leslie Porter c5acaded88 upgrade to plexus 1.0-alpha-7 container, switching to new group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293193 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 00:54:01 +00:00
Brett Leslie Porter 09a35f3c38 PR: MNG-1060
fix basedir translation on windows

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293190 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 00:42:27 +00:00
Brett Leslie Porter 9382b9c8d9 PR: MNG-1060, 1061
corrections to the model used for the release plugin

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293076 13f79535-47bb-0310-9956-ffa450edef68
2005-10-02 06:12:03 +00:00
John Dennis Casey 47d9a60537 Working on: MNG-786
o Changed the profile activation in it0075 to use a system property which is not always present

o Added projecthelp:active-profiles, package, and clean:clean to the goals list, in case it was only happening with the clean plugin

o Fixed the projecthelp mojos to be aggregators where appropriate

o Changed the ordering of modules in the profile injector (used to be that profile modules were prepended; now, they're appended)

NOTE: I still cannot reproduce the described behavior. Dan: Am I missing something WRT the test setup? I changed the activation trigger to be non-inherent, and I'm not using a boolean string to trigger the profile. What am I doing wrong??



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292781 13f79535-47bb-0310-9956-ffa450edef68
2005-09-30 15:45:20 +00:00
Brett Leslie Porter 638088b075 don't need to depend on parent, it no longer needs to execute first due to reactor handling. can avoid cycles.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292419 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 11:34:02 +00:00
Brett Leslie Porter 52e8a216ef PR: MNG-1011
add default goal handling

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292411 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 09:55:25 +00:00
Brett Leslie Porter 30adf31194 PR: MNG-915
alloow plugin to include itself

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292406 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 09:11:10 +00:00
Brett Leslie Porter 36fbe930d7 PR: MNG-915
report plugins can be included in the current plugin

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292404 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 09:08:35 +00:00
John Dennis Casey 03b6c44316 Resolving: MNG-985...simply fixed merging of plugins from PluginManagement to happen on a plugin-by-plugin basis using individual merge logic from ModelUtils, rather than the wholesale merge logic for plugin lists.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292255 13f79535-47bb-0310-9956-ffa450edef68
2005-09-28 18:57:22 +00:00
Brett Leslie Porter c5d1b378f2 PR: MNG-677
default output directory should be set in reporting

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292103 13f79535-47bb-0310-9956-ffa450edef68
2005-09-28 03:14:06 +00:00
John Dennis Casey e41222abd0 Resolving: MNG-1008...DependencyManagement can now inject exclusions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291806 13f79535-47bb-0310-9956-ffa450edef68
2005-09-27 02:31:33 +00:00
John Dennis Casey b1c59f6d19 Resolving: MNG-1022...Adding TestProfileInjector to avoid injecting profiles for tests, and still guard against NPEs when profiles exist.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291751 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 21:27:00 +00:00
John Dennis Casey da33bafe84 Resolving: MNG-885
o Extracting basedir from the project instance when PluginParameterExpressionEvaluator is init'ed if project != null...otherwise, using ${user.dir} from sysprops.

o Extracting values for resolution from POM properties before POM instance during POM interpolation, and adding checks to guard against self-reference of POM elements.

o Added three ITs (one contra) to test these resolutions.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291735 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 20:29:20 +00:00
Brett Leslie Porter 27bc0aea4d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291643 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:30:36 +00:00
Brett Leslie Porter 80c8e188b8 [maven-release-plugin] prepare release maven-2.0-beta-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291641 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:18:55 +00:00
Brett Leslie Porter 883e9e53db avoid NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291582 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 08:23:08 +00:00
Brett Leslie Porter 99db09fcac PR: MNG-947
add optional attribute to a dependency

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291508 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 01:23:13 +00:00
Brett Leslie Porter f3932e47fa PR: MNG-947
add optional attribute to a dependency

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291507 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 01:17:59 +00:00
Jason van Zyl 853028dfab o adding method to the maven project builder that takes a transfer listener
as a parameter. this method is currently being used in the embedder

o see MNG-1015 for notes on where the monitor may be bested placed. if
everything eventually uses the embedder then it won't matter so much.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291499 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 00:23:33 +00:00
Brett Leslie Porter 3e264f80ba PR: MNG-208
flag project that was the root of execution

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291236 13f79535-47bb-0310-9956-ffa450edef68
2005-09-24 02:18:54 +00:00
John Dennis Casey 24a108a674 Resolving: MNG-767, MNG-768
o We should have a viable offline mode now. Plugin sensitivity updates to follow.

o See it0069 and it1014 for offline mode tests.

o Brett, building maven-plugins in offline mode with org/apache/maven/plugin/* removed will now give a nice error message. :)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291124 13f79535-47bb-0310-9956-ffa450edef68
2005-09-23 14:23:08 +00:00
Brett Leslie Porter cebbdaf1ce PR: MNG-870
MAke plugin discovery reactor aware



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290887 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 04:34:41 +00:00
Brett Leslie Porter cbcf2d48e1 PR: MNG-788
add filtering to the build element


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290877 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 02:52:39 +00:00
John Dennis Casey a67d232228 Resolving: MNG-930
o Fixed profile properties cloning in ModelUtils
o Added properties to the test profile in it2002
o Moved the checkout dir for it2002 to be under target, to make it easier to clean.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290552 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 20:05:08 +00:00
John Dennis Casey ec8d262f16 Resolving: MNG-878, MNG-921
o Verified that plugins are added to the list in the model when invoked from the command line (878)
o Reformatted ModelUtils after the profiles-cloning addition
o Added cache-flush for the plugin map in MavenProject
o Moved dependencies for subproject/subproject2 into the parent-project POM, inside a profile
o Added activation property for this new profile into the test.sh script
o Added explicit activation inside of release:perform's m2 invocation for all profile-ids active in the release-plugin's execution.
o Added code to remove the dynamic parts of the POM from the release-pom.xml...it's not meant to be a dynamic version of a POM.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290336 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 02:59:44 +00:00
John Dennis Casey 74de0709de Resolving: MNG-920, and setting the version of maven-release-plugin to a rev of -beta-1 instead of -SNAPSHOT, to allow locally installed versions to work without tweaking the version locally.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290276 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 21:24:40 +00:00
Brett Leslie Porter 386cc730ed allow creation without a file (purely repository)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290083 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 07:51:38 +00:00
Brett Leslie Porter 33dfc5fb1c PR: MNG-881
ensure resources are merged if empty.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290053 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 03:24:28 +00:00
John Dennis Casey 66dddfc944 Resolving: MNG-881. This had to do with resource-list merging when the performRelease profile was activated. See MNG-895 for full resolution (this is a stop-gap solution for now).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289599 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 16:27:33 +00:00
Brett Leslie Porter 06ab86cb54 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289368 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:57:16 +00:00
Brett Leslie Porter 5632e45815 [maven-release-plugin] prepare release maven-2.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289366 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:50:12 +00:00
Brett Leslie Porter 139efa3bdf finish correcting spelling of prerequisites
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289355 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 01:11:42 +00:00
John Dennis Casey dca4ae4518 Resolving: MNG-886
o Added complex test case for the release plugin, called it2002.
o Added copying of reportArtifacts and extensionArtifacts sets when one MavenProject is constructed with another.
o Added some logging statements to PrepareReleaseMojo, which I will remove later when I'm done with this rash of bugfixes.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289294 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 19:21:28 +00:00
Brett Leslie Porter b0c3a2fedc PR: MNG-753
use an ordered set so that insertion order is preserved

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289259 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 15:29:02 +00:00
Brett Leslie Porter a72cf986ac updated repository ids
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289180 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 08:42:04 +00:00
Brett Leslie Porter 1863f47493 switch plugin repo back to main
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289179 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 08:36:32 +00:00
John Dennis Casey 22adefde14 Fixing case where non-POM artifacts are passed to the project builder for parsing...doing defensive construction of POM artifacts inside the project builder, and fixed the call in the DependenciesReport.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280903 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 18:38:54 +00:00
John Dennis Casey 30ee4ffdcd Cleaning up faulty logic in MavenMetadataSource related to the last commit, and updating the it2001 test to (hopefully) straighten out the repository definitions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280761 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 04:13:38 +00:00
John Dennis Casey 2f2db94232 Re-resolving: MNG-757
o Added it0068 to guard against regressions of the type causing MNG-836

o Added it2001, which must be run manually, to verify the test case laid out in MNG-757

o Reinstated the repository accumulation for successive traversal down the transitivity chain, so that transitively resolved artifacts can be found in repositories declared by POMs up the chain.

o Added a check for 'file:' at the beginning of the Settings.getLocalRepository() result, before prepending 'file://' to allow for relative definition of the local repository in test cases



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280755 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 03:40:17 +00:00
John Dennis Casey 37d3fd3fdd Resolving: MNG-814. Enabled import of explicit activation and deactivation of profileIds from the external profile manager to the project-level profile manager. See it0067.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280629 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 19:27:34 +00:00
John Dennis Casey 159b48c4e7 Resolving: MNG-815. Added unit test to guard against regressions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280616 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 18:32:58 +00:00
Kenney Westerhof 2af27a640f Fix missing 'groupId' tag in parent model, for instance
when the parent model also has a <parent> and doesn't specify a groupId.

This would also be resolved if maven-model would just have getVersion
and getGroupId implementations that check for the <parent> tag's 
versions of these attributes when the current ones are null.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280537 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 11:22:39 +00:00
Brett Leslie Porter c27e88fd79 correct what is cached
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280487 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 04:13:00 +00:00
John Dennis Casey c9b6d83c57 Resolving: MNG-835. Using activateByDefault within activation in the profile.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280476 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 03:23:16 +00:00
Brett Leslie Porter 1398c7c6af PR: MNG-680
find the file for a parent that was cached

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280347 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 14:45:27 +00:00
Brett Leslie Porter 8948d497ce PR: MNG-680
set file in USD, don't return a dummy basedir if it is in the repository

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280333 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 12:47:29 +00:00
Brett Leslie Porter 107a2deafd PR: MNG-798
disable daily update of poms with dodgy metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280264 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 05:42:32 +00:00
Brett Leslie Porter 6d41274595 clean up unused code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280237 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 02:11:12 +00:00
Brett Leslie Porter ba1cb58030 don't recheck "deployed" metadata
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280234 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 01:42:15 +00:00
Brett Leslie Porter 3a4b91b310 PR: MNG-613
push shared code into metadata manager

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280232 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 01:23:23 +00:00
Brett Leslie Porter 285d97d93c PR: MNG-847
merge metadata if it is duplicated

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280086 13f79535-47bb-0310-9956-ffa450edef68
2005-09-11 07:08:55 +00:00
Brett Leslie Porter 9c060b192a PR: MNG-613
Completion of the version selection from a range.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279720 13f79535-47bb-0310-9956-ffa450edef68
2005-09-09 06:49:59 +00:00
John Dennis Casey 6d4537dc97 Adding POM-level properties.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279572 13f79535-47bb-0310-9956-ffa450edef68
2005-09-08 15:08:57 +00:00
Emmanuel Venisse 0dbb8eeda8 Add packaging in clone method.
There are some other fields that don't have cloned

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279308 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 12:29:48 +00:00
Brett Leslie Porter 7117fdf396 copy group too
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279259 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 06:32:41 +00:00
Brett Leslie Porter 434ec90fa6 fix issues with cloning appending extra paths
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279237 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 04:08:30 +00:00
Brett Leslie Porter 42fbee9910 clone bugfix
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279052 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 18:19:06 +00:00
Brett Leslie Porter 3a4efa1029 PR: MNG-613
make sure versions are aggregated

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278961 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 09:52:37 +00:00
Brett Leslie Porter cb2370199b PR: MNG-613
deploy snapshot information to the correct directory and fix some other minor issues

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278930 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 06:58:44 +00:00
Brett Leslie Porter 1129522bd7 PR: MNG-836
rolled back rev #239243


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278895 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 00:37:48 +00:00
Kenney Westerhof 3b56df09be Fixed MNG-805. It's a bit of a workaround but fits nicely with the
workaround style already in place.

Modified it0012 to be useful (it always succeeded!) and added a child
project to demonstrate this commit fixes MNG-805.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278741 13f79535-47bb-0310-9956-ffa450edef68
2005-09-05 14:12:07 +00:00
Kenney Westerhof 6f72bd51df o Fixed MNG-836
o Added some more debug messages that aided me in finding this bug.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278736 13f79535-47bb-0310-9956-ffa450edef68
2005-09-05 13:39:32 +00:00
Brett Leslie Porter 31e79ea14f minor clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278662 13f79535-47bb-0310-9956-ffa450edef68
2005-09-05 02:12:44 +00:00
Brett Leslie Porter 6a5e89785e PR: MNG-639
Separate local metadata by repository to ensure it remains consistent

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267466 13f79535-47bb-0310-9956-ffa450edef68
2005-09-03 14:38:13 +00:00
Brett Leslie Porter 7aed0b1617 PR: MNG-821
Submitted by: Jesse McConnell
Reviewed by:  Brett Porter
commit missing file for file based profile activation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267432 13f79535-47bb-0310-9956-ffa450edef68
2005-09-03 07:09:27 +00:00
Brett Leslie Porter d3cd4ef4b4 add description of artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267431 13f79535-47bb-0310-9956-ffa450edef68
2005-09-03 07:05:42 +00:00
Brett Leslie Porter 6d3dbc96c7 PR: MNG-821
Submitted by: Jesse McConnell
Reviewed by:  Brett Porter
Add file existence based profile activation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267429 13f79535-47bb-0310-9956-ffa450edef68
2005-09-03 06:59:07 +00:00
Trygve Laugstol f895e06d85 o Organizing imports.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267176 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 10:29:02 +00:00
Brett Leslie Porter c7aa0230e6 fix regression - activate artifacts need no resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@266730 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 08:21:14 +00:00
Brett Leslie Porter abd4ae6018 PR: MNG-613
make repository metadata behave more like snapshots with daily updates.
next step is to move the version checking to use that instead and fallback to the old files

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@266298 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 07:16:16 +00:00
John Dennis Casey 8201bb9d18 Adding system scope...uses scope == 'system' and systemPath in dependency. SystemPath was chosen over mappings inside the setings.xml for scalability, heritability, and injectability (via managed deps).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264960 13f79535-47bb-0310-9956-ffa450edef68
2005-08-31 07:39:01 +00:00
Brett Leslie Porter e0457b0204 PR: MNG-613
reorganise in preparation for generalised repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264091 13f79535-47bb-0310-9956-ffa450edef68
2005-08-29 06:37:33 +00:00
John Dennis Casey 4ccb9068fb Resolving: MNG-717
o Dependencies don't have a default scope value, to allow DependencyManagement to set the scope if null...then, the metadata source sets the scope to 'compile' when it constructs the artifacts from deps that still have a null scope. Oh, and it will at that point back-propagate the 'compile' scope to these dependency instances, for later reference...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240428 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 15:44:48 +00:00
Brett Leslie Porter 0481c45fc9 repair snapshot build numbering (previous code makes it get stuck at 1).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240405 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 11:42:30 +00:00
Brett Leslie Porter ffb317c27d PR: MNG-790
trace was too verbose for a warning

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240374 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 02:04:14 +00:00
Brett Leslie Porter cddc9df70e PR: MNG-753
add a missing need for the super repository

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240218 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 12:23:20 +00:00
Brett Leslie Porter d466205274 PR: MNG-753
correct ordering of repositories in POM (also fixed problem of not correctly overriding "central" - properly this time!)
took note of a simpler way to ensure this is correct in future

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240204 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 11:24:11 +00:00
Brett Leslie Porter c945c27bff PR: MNG-693
added tests for reporting inheritence to mirror plugin inheritence, cleanup and utilise executions element

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240197 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 09:29:05 +00:00
Brett Leslie Porter fcd86eff85 update inline with surefire plugin - *TestCase are included, Abstract*TestCase are not
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240178 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 07:31:18 +00:00
Brett Leslie Porter 1b81c99d57 PR: MNG-789
interpolate ${basedir} in the model


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240177 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 07:30:21 +00:00
Brett Leslie Porter 294199b388 PR: MNG-761
fallback to deployment repository for snapshots when there is no snapshot repository


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240175 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 07:26:03 +00:00
John Dennis Casey da3aa1090f Resolving: MNG-666
If a v3 POM is encountered (or any POM where modelVersion is != '4.0.0'), an InvalidModelException is thrown.
This exception extends ProjectBuildingException, to enable piggybacking on the same catch() clause.
When the MavenMetadataSource catches InvalidModelException, it returns a ResolutionGroup with the pomArtifact and empty collections for the pom dependency artifacts and the repository list with which to resolve the empty artifacts set.

Also, added it0059 to test builds where a dependency POM is a v3 pom (missing <modelVersion/>).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239981 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 03:08:10 +00:00
John Dennis Casey f437fb5dc2 Resolving: MNG-773
o Separated profile injection logic from the inheritance assembly. While they look similar superficially, the
  merge-out vs. merge-in semantics make it pretty complex to put this logic together in the same methods. It's
  easier to understand what's going on if they remain similar but separate code...

o Added it0058 to test that application of a profile from settings.xml doesn't transport module lists from POM
  to POM inside of a reactor build.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239918 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 20:31:29 +00:00
John Dennis Casey 252b151052 Resolving: MNG-766.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239464 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 22:11:07 +00:00
John Dennis Casey 5d0298a942 Resolving: MNG-757 according to the comments in the issue.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239243 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 20:31:24 +00:00
John Dennis Casey 146e022327 Resolving: MNG-251
o Added transformation manager
o snapshot timestamp/buildnumber is now managed from the transformation rather than the metadata
o maven-archiver now clones the MavenProject and resolves snapshot versions for introduction into manifest and exported pom.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239219 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 19:00:51 +00:00
Brett Leslie Porter 932caa362a PR: MNG-729
fix artifact handler instantiation when the plugin extension is declared in a project that uses that packaging itself

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233480 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 13:15:07 +00:00
John Dennis Casey 659a1f4736 Fixing some things:
o Artifact attachment via MavenProjectHelper was using string literals of the variables I was trying to use to fill in type and classifier (dumb, I know!)

o Source plugin didn't have an @phase for the JarSourceMojo...added, then added the goal configuration in the release profile in the super-pom

o Removed the source plugin bindings for the lifecycle mappings in maven-core

o Re-added [deprecated] method MavenProjectBuilder.build( File, ArtifactRepository, List )...you should use MavenProjectBuilder.build( File, ArtifactRepository, ProfileManager ) instead.

o Added profile handling/injection for the super-pom in two places: in buildStandaloneSuperPom() and in private build(..). This enables injection of the release profile which is provided in the super-pom.

o Added integration test to verify that using -DperformRelease=true results in the sources being attached...to override this behavior, another profile keyed on -DperformRelease could turn the 'attach' param for the source plugin off.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233245 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 19:23:45 +00:00
John Dennis Casey 9a3085813d Working on MNG-483
o Added @requiresDirectInvocation (was: @cliOnly, but this implies m2 is run from CLI...counter-intuitive for embedding)

o Added handling for new @requiresDirectInvocation (generation/parsing, MojoDescriptor support, etc.)

o Added check in DefaultLifecycleExecutor to throw a LifecycleExecutionException if a mojo specified in a lifecycle binding is marked as direct-invocation only.

o Added MavenProjectHelper/DefaultMavenProjectHelper to provide convenience methods for manipulating MavenProject instances (for example, attaching artifacts or adding resources)

o Removed maven-artifact dependency from maven-source-plugin, and added dependency on maven-plugin-api (should've been there)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233021 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 18:03:20 +00:00
John Dennis Casey fe5a91b0d6 Working on: MNG-483
Fixing profile application to separate profiles discovered in and around POM from those in settings.xml, and apply them separately in the order: 

for-each-project-in-inheritance:{POM, profiles.xml}, settings.xml

Added common interface for accumulating, explicitly activating and deactivating, and retrieving profiles to be applied to a given project. This manager interface (ProfileManager) is general enough to be applicable to both the project-level and settings-level profiles.

Added 'performRelease'-keyed profile to super-POM which will be used by the release plugin and anyone using a parallel process, and which will enable '-DupdateReleaseInfo=true' for the deploy mojo, along with enabling the source attachment for the project.

Added 'attach' parameter to JarSourceMojo to allow local POM to turn off source attachments, overriding release profile in super-pom.

Updated the release:perform mojo to use '-DperformRelease=true' for switching on the new release profile, rather than just using '-DupdateReleaseInfo=true'...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233013 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 16:31:02 +00:00
John Dennis Casey 88d49cb04f o Improving toString for Dependency in the 4.0.0 version codeSegment in maven.mdo
o Improving error messages for ResourceDoesNotExistException in the transformations
o Adding specificity to the dependency validation stuff, to output which dependency is offending...
o Added it1013 to show off the new dependency validation stuff.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232399 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 21:55:00 +00:00
John Dennis Casey 155c0a69a7 Resolving: MNG-686...Moving <directory/> specification from Build to BuildBase to allow profiles inline within the POM to change this setting.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232336 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 17:06:38 +00:00
John Dennis Casey 86321f4163 Adding comment to discourage re-adding the status inheritance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232178 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 01:43:36 +00:00
John Dennis Casey 0db68a8c2e Removing inheritance of status in distributionManagement.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231555 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 01:36:55 +00:00
John Dennis Casey 3408c163dc o Removed it0048, and replaced it with a unit test for the DefaultProfileInjector.
o Reverted the logic of the DefaultProfileInjector to merge-and-override the model, with the profile being dominant
o Added merging for distributionManagement and modules (conditionally, based on flag) in the modelBase merge
o Refactored the override logic into a couple of methods in ModelUtils to make it easier to understand what's going on here.
o Verified that both the build and the model itself are being merged correctly during profile injection, with profile dominance, but persistence of changes to the model.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231481 13f79535-47bb-0310-9956-ffa450edef68
2005-08-11 16:46:19 +00:00
Kenney Westerhof c897fa04c1 After r231121 the <modules/> in poms were ignored. I tracked the changes,
and it was obvious: merge code didn't merge the Modules section, and possibly
other sections aswell. Also putting all normal model build info in a profile and
then copying profile data back to the model seemed odd to me. Now only
data from profiles that actually get merged is merged.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231470 13f79535-47bb-0310-9956-ffa450edef68
2005-08-11 14:35:20 +00:00
John Dennis Casey 013d4039fb Resolving: MNG-684
o Split profile injection out into its own component away from the defaults assembler
o Moved code common to the defaults assembler and the profile injector into ModelUtils
o Removed the profile-related method from ModelIntheritanceAssembler
o added it0048 to test that profile values will override POM values.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231294 13f79535-47bb-0310-9956-ffa450edef68
2005-08-10 19:21:34 +00:00
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 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
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
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 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 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 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
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 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 44abb5383a don't need to check for updates on snapshot poms - that happens anyway
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226464 13f79535-47bb-0310-9956-ffa450edef68
2005-07-30 02:18:01 +00:00
John Dennis Casey dad9ebc577 o Fixing DoxiaMojo (there was an API incompatibility there, having to do with FileUtils...not sure if there is something that didn't get deployed, or what)
o Adding cli-options.txt for three ITs that failed when I cleaned out the local repo

o Fixing the setFile(..) method of ActiveProjectArtifact (hopefully) for Emmanuel's continuum build problem...




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226426 13f79535-47bb-0310-9956-ffa450edef68
2005-07-29 23:26:42 +00:00
John Dennis Casey a6891c4e25 Adding resolved flag to Artifact.
This is done to counter the possibility that an artifact's file is set without the artifact actually being resolved, as in the case where the artifact is a snapshot version, but no snapshot-enabled repositories exist (think plugin resolution). This also has the beneficial side-effect of providing a more intuitive method of checking whether an artifact has been resolved (rather than artifact.getFile() != null).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226333 13f79535-47bb-0310-9956-ffa450edef68
2005-07-29 03:41:02 +00:00
Brett Leslie Porter 15fef60915 helps to pass on parameters
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225784 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 14:38:18 +00:00
Brett Leslie Porter 78770ba39f ensure it gets checked
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225782 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 14:26:41 +00:00
Brett Leslie Porter 5d82fcb8a6 PR: MNG-249
also recognise transitive projects



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225780 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 14:19:03 +00:00
Brett Leslie Porter 9a86709abd PR: MNG-249
make compile and package reactor aware



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225731 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 09:32:32 +00:00
Brett Leslie Porter 85b30cf43d PR: MNG-326
take plugins, reports and extensions into account when sorting modules for reactor build

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225717 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 06:52:04 +00:00
Brett Leslie Porter 7a90482fda ibiblio only has releases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225715 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 06:38:25 +00:00
Brett Leslie Porter 231c6a7a1d PR: MNG-615
implement repository confidence levels. currently updates poms daily if they are not deployed or verified

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225714 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 06:35:47 +00:00
Brett Leslie Porter 3288b82caa PR: MNG-664
license should be inherited

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225534 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 15:07:47 +00:00
Brett Leslie Porter 24e9ecf4a0 PR: MNG-226
make sure to merge in extension field (eg pluginManagement)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225530 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 14:46:54 +00:00
Brett Leslie Porter eedd050414 PR: MNG-649
add classifier to dependency. it becomes part of the dependency key along with type when not null

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225524 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 14:17:41 +00:00
Brett Leslie Porter 826413b74a PR: MNG-598
allow type handlers to be specified by plugin extensions



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225477 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 08:03:33 +00:00
Brett Leslie Porter b42c7d3c66 PR: MNG-479
child repositories have precedence over parents with the same ID

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225465 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 06:20:40 +00:00
Brett Leslie Porter 8b01ca10f7 PR: MNG-226
implement extension mechanism

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225463 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 06:14:20 +00:00
John Dennis Casey 31ac06f7e2 Working on: MNG-521
o Cleaned up output from discovery of MavenProjectBuilder instance in MavenProjectTestCase.
o Added <relativePath/> to parent in maven.mdo (default value is '../pom.xml')
o Added filesystem parent-POM search using <relativePath/>...if discovered pom doesn't match the parent specification (g🅰️v), then it's not used - the parent is resolved - and search for ancestor POMs on disk goes no further.

NOTE: Next thing is to reactor-ize the release plugin, then MNG-521 should be implemented.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225379 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 19:45:45 +00:00
John Dennis Casey 73e549b231 o Fixing resolution of LATEST in plugin-versions, when <useLatest/> is enabled in plugin-registry.xml, or when --check-plugin-latest is specified on the command line.
o Fixing core-library resolution for expression: ${plugin.artifacts} and ${plugin.artifactMap} (latter is keyed by g:a)

o Modified maven-core-it-plugin to accept something like "-DartifactToFile=org.apache.maven:maven-artifact"...it'll lookup that artifact in ${plugin.artifactMap}, and touch a file that's a mutation of the abs. path for that artifact.

o Added pomArtifact to ResolutionGroup, since the MavenMetadataSource ALWAYS creates a new Artifact for a pom...this allows us to retrieve the resolved Artifact for that pom.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225234 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 05:54:24 +00:00
Brett Leslie Porter 086463b5b4 PR: MNG-456
allow separate snapshot and release repositories
deprecate existing snapshotPolicy and checksumPolicy in favour of updatePolicy and checksumPolicy within the <releases> and <snapshots> elements in the <repository> element.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224707 13f79535-47bb-0310-9956-ffa450edef68
2005-07-25 09:51:12 +00:00
John Dennis Casey 701ef520a3 Working on MNG-607
o Changed MavenMetadataSource to a component, to avoid having to lookup artifactFactory and projectBuilder in order to 
  construct it.

o Added add(..) method to ScmBean in the release plugin to allow addition of release-pom.xml

o Changed the PrepareReleaseMojo to resolve ONLY version and parent-version for the normal pom.xml, and fully resolve all
  artifacts used in the release-pom.xml, including version, parent-version, dependency closure (given by project.getArtifacts()), plugins, and reports. It will then add the release-pom.xml, and (attempt to) delete it before performing the final commit for next development version.

o Added some mapping methods to ArtifactUtils, to key by artifact.getId, and to create an Artifact.getId()-compatible string from parameters.

o Added TestProjectBuilder to remove the requirement in ProjectClasspathTest to modify the fields of the project builder directly.

o Cleaned up the AbstractReleaseMojo and PrepareReleaseMojo to avoid container lookups...they're now mojo parameters with the 'component.' prefix.

NOTE: Next step is to figure out how to use maven-scm to remove an SCM resource, to enable the prepare mojo to take the release-pom.xml back out of HEAD after the tag is complete.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224413 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 22:07:28 +00:00
Brett Leslie Porter 17fa8ba4ea PR: MNG-581
Submitted by: Kris Bravo
Reviewed by:  Brett Porter
add classes directory to compile classpath as some classes are produced during generate-sources to pass to the compiler for XML beans


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224367 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 17:00:22 +00:00
Brett Leslie Porter fd615cbeea PR: MNG-579
correct inclusion of tlds

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224365 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 16:51:09 +00:00
Brett Leslie Porter bb79e8614d tidy up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220350 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 15:42:16 +00:00
Brett Leslie Porter 8c3bbcc397 PR: MNG-593
ensure there are no duplicates in the assembled model's dependency list

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220344 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 15:36:34 +00:00
Brett Leslie Porter 36d0a854e1 PR: MNG-518
fix up validation

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220318 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 13:42:55 +00:00
Brett Leslie Porter 64399eb8e3 TODOs and cleanup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220314 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 12:50:26 +00:00
Brett Leslie Porter 418f58e393 fix typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220253 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 07:05:14 +00:00
Brett Leslie Porter 70f2351610 PR: MNG-461
warn, but don't fail, when a POM is not in the repository

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220250 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 06:32:06 +00:00
Brett Leslie Porter b82151f013 PR: MNG-479
Submitted by: Rahul Thakur
Reviewed by:  Brett Porter
if you define a repository it should override anything in the parent with the same ID
Also, cleaned up logic in assembler based on intentions

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220240 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 05:24:19 +00:00
Brett Leslie Porter a4343cf767 PR: MNG-625
allow a plugin to specify the minimum Maven version (will apply for both building and its execution - this should be separated later).

If you are running an older version then it will not prompt to update when found, and will fail if it is encountered with a hardcoded version.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220239 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 05:07:47 +00:00
Brett Leslie Porter a7bae20ee8 add a little more space
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220225 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 01:02:15 +00:00
Brett Leslie Porter bc2211c160 actually output the warning message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220221 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:37:22 +00:00
Brett Leslie Porter aa59559efb PR: MNG-507
implement repository relocation of an artifact


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220220 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:31:44 +00:00
Brett Leslie Porter 6aa208414f PR: MNG-229
- always use super POM's repository for parent resolution
- use correct repository set for plugin dependency resolution

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220102 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 15:15:54 +00:00
Brett Leslie Porter 511af3d3e2 PR: MNG-596
add XSD definition to m2 poms and archetypes



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220079 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 13:58:42 +00:00
Brett Leslie Porter edbc07c3fb copy constructor needs to copy artifact reference
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220068 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 13:40:20 +00:00
John Dennis Casey 99bdd48d92 Bumping plexus-utils version to 1.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219984 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 02:17:16 +00:00
Brett Leslie Porter cbf519695c PR: MNG-558
use modello alpha-4: corrected parsing


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219950 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 17:11:13 +00:00
Brett Leslie Porter 6e87ae8941 must copy the repository list as it may be modified
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219861 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 08:44:39 +00:00
Brett Leslie Porter 685bfbcb12 apply some inspections
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219826 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 01:24:35 +00:00
Brett Leslie Porter ee31f9650f apply some inspections
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219824 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 01:03:25 +00:00
Brett Leslie Porter 27cdfc3cd1 PR: MNG-505
use comparable versions in ranges

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219630 13f79535-47bb-0310-9956-ffa450edef68
2005-07-19 08:23:01 +00:00
Brett Leslie Porter 810d4a3276 PR: MNG-505
artifact refactoring to facilitate version ranges



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219616 13f79535-47bb-0310-9956-ffa450edef68
2005-07-19 05:04:39 +00:00
Brett Leslie Porter 4c45989dcb PR: MNG-404
add ability to have a minimum Maven version for a project build

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219473 13f79535-47bb-0310-9956-ffa450edef68
2005-07-18 11:57:29 +00:00
John Dennis Casey 7bc8cf9fb1 Modified to check for duplicate repository entries in the aggregated remote repository list as the lineage of projects is built.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219278 13f79535-47bb-0310-9956-ffa450edef68
2005-07-16 02:05:03 +00:00
John Dennis Casey c7d5e83520 Resolving: MNG-397
o Added ResolutionGroup class which contains a set of artifacts and a list of repositories to resolve them.
o Made the ResolutionNode a standalone class, and added the remote repositories to it
o Changed ArtifactMetadataSource.retrieve(..) to return ResolutionGroup rather than Set, in order to help keep track of the repositories which should be used to resolve the retrieved artifacts.

We need some tests for this...


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219276 13f79535-47bb-0310-9956-ffa450edef68
2005-07-16 01:24:13 +00:00
John Dennis Casey 21e050e5fa Attempting to fix problem with resolution of parent-poms for plugins, but continuing the use of the plugin repository when assembling the plugin-pom's lineage.
NOTE: I have not bootstrapped with this fix in place (I'm in the middle of something else right now), so BEWARE!



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219252 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 22:13:10 +00:00
John Dennis Casey 2c80da6ba4 Resolving: MNG-482
To use the new artifact map for either the project or the current plugin from your mojo, simply use one of the following expressions:

  ${plugin.artifactMap}
  ${project.artifactMap}

The artifacts in these maps are keyed using org.apache.maven.artifact.ArtifactUtils.versionlessKey( String groupId, String artifactId ) (found in the maven-artifact project).



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219234 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 19:04:20 +00:00
John Dennis Casey beff5623f2 Resolved: MNG-502
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@216279 13f79535-47bb-0310-9956-ffa450edef68
2005-07-13 22:34:40 +00:00
John Dennis Casey cb257db78e Resolving:
MNG-511
MNG-513

Working on:

MNG-449

o Added code to stop the version manager from prompting the user for unregistered plugins; it will simply register them with the resolved version.

o Added failover fourth plugin-version resolution option, which is a plugin-specific artifact metadata called LATEST.version.txt, and will be published with each install/deployment

o Added MavenProject.get/setArtifact(..) to handle a single artifact instance for a project (allows injection of artifact metadata without having to handle it all within the install/deploy mojos).

o Changed plugin-version resolution to only use MavenMetadataSource rather than resolving the whole plugin artifact.

o Changed the install and deploy mojos to only use ${project.artifact} rather than constructing their own, so they can take advantage of metadata added elsewhere in the build.

o Factored the "RELEASE".equals(..) check in the DefaultRepositoryLayout to use new metadata method storedInArtifactDirectory() instead, since RELEASE and LATEST both share this characteristic.


NOTE: I'm not going to resolve MNG-449 yet, because I'm not sure what else Brett had in mind related to the plugin-development-without-release use case...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@215919 13f79535-47bb-0310-9956-ffa450edef68
2005-07-12 04:13:40 +00:00
John Dennis Casey 91dfd62176 Working on: MNG-377
o Normalized all references to plugins to use either o.a.m.model.Plugin or o.a.m.plugin.PluginDescriptor instances

o Changed DefaultLifecycleExecutor, PluginManager, DefaultPluginManager, MavenPluginCollector, and DoxiaMojo to reflect the above

o Added mapped-plugin resolution of goal prefixes to the DefaultLifecycleExecutor

o Added caching of PluginMappingManager instance inside of MavenSession

o Modified SettingsUtils to be more resistant to null String-Lists for pluginGroups and activeProfiles during merge.

o Added checks to MavenProject.addPlugin(..) to only add if the plugin doesn't already exist in the model.

Next step is to modify installation and deployment process for plugins to publish plugins.xml repository metadata.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209677 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 23:50:25 +00:00
Emmanuel Venisse a029d766ce Update all versions to beta-1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202001 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 15:29:14 +00:00
Emmanuel Venisse 89d5337816 [MNG-520]. copy artifactId when we clone a model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201990 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 13:50:07 +00:00
Emmanuel Venisse ad7daa5d18 [MNG-520]. copy artifactId when we clone a model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201989 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 13:49:24 +00:00
John Dennis Casey 3a0bdc3c4b Fixing version...again.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201756 13f79535-47bb-0310-9956-ffa450edef68
2005-06-25 15:37:43 +00:00
John Dennis Casey 59e7f83588 bumping version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201711 13f79535-47bb-0310-9956-ffa450edef68
2005-06-25 02:49:26 +00:00
John Dennis Casey e4083dcdea Resolving issue: MNG-522
o Added check for null child pluginManagement section, and setting to parent value if null.
o Added integration test for parent->child pluginManagement inheritance and injection, to prevent regressions.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201693 13f79535-47bb-0310-9956-ffa450edef68
2005-06-25 00:00:05 +00:00
John Dennis Casey af50188487 Upating repository id for super-pom pluginRepository.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193085 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:08:23 +00:00
John Dennis Casey fcbc5e7d6f Resolving: MNG-495
o Pressing [ENTER] at a plugin update prompt should result in the plugin being registered, as indicated by the prompt.
o Use CLI switch '--no-plugin-updates' to suppress usage of the plugin registry
o Use CLI switch '--update-plugins' to force updated/resolved plugin versions to be registered
o Neither of these has a short CLI option, since we're starting to run out of sensible char options for these types of things.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193082 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:03:10 +00:00
John Dennis Casey 78be40776c Changing DefaultPluginManager to lookup a plugin's artifact from pluginRepositories, and changing the location of the super-pom's pluginRepository.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193081 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:00:33 +00:00
John Dennis Casey 6100b37321 Updating non-maven, non-modello deps to get rid of snapshots. Also removed marmalade stuff from mboot.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193052 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 02:31:28 +00:00
Brett Leslie Porter 777cbc968c ensure failed artifact path is passed through to all resolution exceptions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191953 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 14:27:35 +00:00
Brett Leslie Porter 5c1fb112b9 avoid circular dependency in test cases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191833 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 13:25:06 +00:00
Brett Leslie Porter 677a0dd7d5 fix NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191800 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 11:24:31 +00:00
Brett Leslie Porter c3d0ba0846 use managed versions for project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191783 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 08:25:34 +00:00
Brett Leslie Porter 3f2f0d50a3 simplify the resolveTransitively API, and implement the new collector up to the level of functionality of the original.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191773 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 06:46:26 +00:00
Brett Leslie Porter 3bee4a55c1 change artifact resolution result to have a set of artifacts instead of a map, as everything dealt with them as a collection anyway.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191748 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 00:31:33 +00:00
John Dennis Casey fd3e9fe9e2 Fixing artifact handling to only process the runtime artifacts, and select out the tld's from that. This is for the war mojo, BTW. :)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191688 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 17:13:24 +00:00
John Dennis Casey 05892c489f Dressing up the execution collision error some more for non -X output.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191670 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 15:45:51 +00:00
John Dennis Casey 9dfc1f9962 Improving error reporting when execution id's collide.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191669 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 15:36:00 +00:00
Brett Leslie Porter 6cd2e31078 refactoring of the resolveTransitiveDependencies call.
simplified by removing a bunch of duplicated code in addArtifacts - no need to merge, you have the full list. 
separated the original artifacts (dependency artifacts) from the resolved artifacts (getArtifacts)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191667 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 15:32:02 +00:00
Brett Leslie Porter f017c2ed9c add missing '.' (thanks Kenney!)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191638 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 08:00:00 +00:00
Brett Leslie Porter 26d36d8959 PR: MNG-140
split artifact impl from api so that dep resolution can be used independently of wagon
only the first step in making maven-artifact more useful as a public api - more changes to be made


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191634 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 06:49:49 +00:00
John Dennis Casey 7acd75ed8a Forcing collision of plugin-execution id's in non-inherited, direct-goal invocation scenarios.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191621 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 04:20:18 +00:00
John Dennis Casey 07dda3c3ae Resolving issue: MNG-271
o Added method to MavenProject called writeModel( Writer ) 
o Added code in MavenArchiver to export the full effective POM to ${project.build.directory}/exported-pom.xml and then embed that in the archive, rather than simply embedding ${project.file}.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191588 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 23:34:34 +00:00
John Dennis Casey fda77afb12 Resolving issue: MNG-339
o Added checksumPolicy to artifact repository construction, which meant changing all the places where the factory was called.

o Added two command-line switches (-C=strict-checksum-checking, -c=lax-checksum-checking, or warning)

o Added checksum policy to all repository definitions (profiles.mdo, settings.mdo, maven.mdo)

o Changed the maven-artifact-ant stuff to use a Repository definition with checksumPolicy added to it

NOTE: I just realized that I haven't touched the inheritance/conversion of repository stuff from profiles/settings.xml to the model. I'll do this, and commit the additional changes.

Currently, the default checksum policy is to warn, since there are still bad checksums out there that prevent bootstrapping. Once we chase these down, we can change to default-strict checking. When verifying checksums, SHA-1 is attempted first, with MD5 acting as a backup verification method. If the checksum verification fails legitimately (not related to the process of retrieving/reading the checksum file), then the verification process is repeated ONCE ONLY.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191536 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 18:53:53 +00:00
Brett Leslie Porter 8dec28247b PR: MNG-471
implemented cloned lifecycle, project and tests. update mojos accordingly


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191476 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 14:42:56 +00:00
Brett Leslie Porter 86e4a5647c fix pom formats as parsing is now stricter
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191392 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 04:29:46 +00:00
Brett Leslie Porter 1a63032af4 PR: MNG-469
configure reports according to spec:
- <reporting> section affects reports run through site and standalone
- <build> section affects reports run standalone and overrides anything already in <reporting>
- command line parameters rule all



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191298 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 16:21:49 +00:00
Brett Leslie Porter a9f174c834 Clean up of the lifecycle executor, simplify configuration and push back into the plugin manager.
This fixed a couple of bugs along the way.

One change that this has brought to bear from the document is you now must specify a goal for it to be bound to the LC
(see it0008)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191285 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 13:01:26 +00:00
John Dennis Casey fdfb9d5a2d Changing <reporter/> to <plugin/> in the reporting section.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191266 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 04:23:20 +00:00