Commit Graph

698 Commits

Author SHA1 Message Date
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 99a040d047 Adding ability to directly specify parameters that conflict with reserve expression roots.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280660 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 21:15:31 +00:00
Kenney Westerhof 4aa55430cf o Put modello-maven-plugin under dependencyManagement and chose version
1.0-alpha-5-SNAPSHOT for all so they're all the same.
  
o Updated modello plugin invocations in all poms to by adding execution elements
  and fixing goals section to get rid of deprecated notation.
  
o Removed dependency on modello-core in maven-plugin-tools; it seems it
  was there because maven-plugin-tools-java used StringUtils from modello -
  changed that to use the plexus-utils version.

o Reversed commons-cli version back to 1.0 (brett asked me to, a few days back).

o Updated all models to use fully qualified classnames - do not assume
  java.util.* is included! (it won't be anymore from modello 
  1.0-alpha-5-SNAPSHOT onward).

o Added some <?xml processing instructions to some models that didn't have them
  - vim now recognizes these files as XML (so I get syntax highlighting :))




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280539 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 11:41:52 +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
Kenney Westerhof 570bc62482 fix MNG-755 (MNG-720). GnuParser's interpretation of the commandline conforms
to m2's idea about options; PosixParser doesn't.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279574 13f79535-47bb-0310-9956-ffa450edef68
2005-09-08 15:22:01 +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
Kenney Westerhof 69c6305347 Changed ReactorManager's api for blackList and other methods that require
an 'id' to use MavenProject instead. 
In some parts of the code a DAG is constructed using a version-less key,
and in the api what the id should be is unspecified.
This could result in NPE's (it does!) because the code in plexus-utils
assumes a known id (vertex in the DAG) is supplied.

So, moved the project.getId() calls outside of ReactorManager into the
ReactorManager, so that there's just one place where the decision is made on
how to generate an id (DAG vertex label) from a project. This centralizes
that knowledge for increased maintainability and reduced chances on NPE's.




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279334 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 14:57:24 +00:00
Brett Leslie Porter 2464320d3a aggregator must resolve deps
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279053 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 18:19:43 +00:00
Brett Leslie Porter 8f3c207194 PR: MNG-613
changes versioning to use repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278881 13f79535-47bb-0310-9956-ffa450edef68
2005-09-05 23:12:55 +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
Trygve Laugstol aa526b6050 o Fixing a potential bug where the unresolved artifact List was passed in as
the remote repository List causing a ClassCastException.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278602 13f79535-47bb-0310-9956-ffa450edef68
2005-09-04 15:44:37 +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
Kenney Westerhof c23770947f o Finished MNG-632.
Note: I'm not sure wheter my tmpDir approach is the best.
  It's certain to work all the time (depending on FileUtils.createTempFile),
  but it may leave a lot of 'garbage' in target/.

o Updated maven-core's assembly descriptor to make use
  of new line endings functionality.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267344 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 23:01:56 +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
Brett Leslie Porter 9b6a7939db rename group metadata
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@265618 13f79535-47bb-0310-9956-ffa450edef68
2005-09-01 01:56:04 +00:00
Brett Leslie Porter c991b41571 refactoring towards similar pattern of artifact metadata
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264967 13f79535-47bb-0310-9956-ffa450edef68
2005-08-31 08:11:47 +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
Brett Leslie Porter 5d3ebf4434 avoid NPE if there are no parameters in the mojo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234155 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 07:27:29 +00:00
Brett Leslie Porter 34e167076d make sure to load extensions from all projects, not just the root in a reactor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@234149 13f79535-47bb-0310-9956-ffa450edef68
2005-08-21 05:16:28 +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 4935728ade Adding warning output for when a mojo is scrubbed from a forked lifecycle, as in MNG-709.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233260 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 20:50:27 +00:00
John Dennis Casey fcc893a626 Resolving: MNG-709...scrubbing caller from forked lifecycle, and letting it run in the main lifecycle after the fork returns.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233259 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 20:45:31 +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 2adbbad9da Throwing exception if infinite loop detected in phase vs. executePhase...this is probably not optimal, but it's a start.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233104 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 02:05:04 +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
Vincent Massol 1fe703883e MNG-150: Create a rar mojo. Applied on behalf of snicoll.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232602 13f79535-47bb-0310-9956-ffa450edef68
2005-08-14 13:19:12 +00:00
Kenney Westerhof 1311273aa6 Made buildTopDownMergedConfiguration really recursive - in most cases it didn't.
Fixed a merge problem where only direct children of <configuration> in the POM
appeared in the merged configuration.

(like maven-antrun-plugin, the 'tasks' configuration tag didn't have any
value, but has children. After the merge, the children were gone,
and it was marked as having no value, and hence the field was not updated.)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232281 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 12:44:22 +00:00
John Dennis Casey 0b4aa2dc41 Resolving: MNG-715
PluginParameterExpressionEvaluator now has two static final Maps - BANNED_EXPRESSIONS and DEPRECATED_EXPRESSIONS, each of which contain mappings of restricted expressions to the preferred alternative.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232200 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 04:03:33 +00:00
John Dennis Casey cb41f94717 Resolving: MNG-652
o Adding it1012 that should express the throwing of LifecycleExecutionException for unknown packaging.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232189 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 03:02:35 +00:00
John Dennis Casey 26de9f77d0 Fixing problem with mojo configuration merges between parameter configuration keyed by alias and by name within the POM, along with configuration within the MojoDescriptor.
Also adding an IT that will indirectly test that default parameter values are not being disturbed during the merge process.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232185 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 02:25:26 +00:00
John Dennis Casey 3c53a1305d Resolving: MNG-674
o Added it0049 to prevent further regressions. ;)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231393 13f79535-47bb-0310-9956-ffa450edef68
2005-08-11 04:38:46 +00:00
Kenney Westerhof 309f26b810 Sometimes plugins get added in an unofficial way - the pluginDiscovererManager
sees the plugin and marks it as 'installed' (it's in a hashtable somewhere).
The official way is to go through verifyPlugin. That gets called later on
for that plugin, which only calls addPlugin (that registers, resolves,
and, most importantly, creates a childContainer for that plugin!) IF
the plugin is NOT yet registered.

Since it is registered in the hashtable, but no childRealm was made there,
addPlugin doesn't get called. Added a simple check to ALSO call 'addPlugin'
if it was added to the hashtable. Side effect is that the version that
was normally going to be used is now used and overrides the other version.

This really needs a cleanup!

Committing anyway:

01:26<trygvis> right now I think we're allowed to push over old ladies and
               steal candy from small children to get this to work



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231353 13f79535-47bb-0310-9956-ffa450edef68
2005-08-10 23:31:40 +00:00
John Dennis Casey 0f9196a83d Resolving: MNG-608 (deprecate for now, remove later...notes in TODOs)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231084 13f79535-47bb-0310-9956-ffa450edef68
2005-08-09 19:26:24 +00:00
John Dennis Casey b69490b828 Resolving: MNG-95
o Added --fail-fast --fail-at-end --fail-never CLI options, with appropriate summary and exclusion of dependent projects from the build when --fail-at-end is specified. Also, implemented it0046 and it1011 to test it.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227490 13f79535-47bb-0310-9956-ffa450edef68
2005-08-04 21:14:51 +00:00
John Dennis Casey 71cb5dc399 Resolving: MNG-282
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227259 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 20:43:58 +00:00
John Dennis Casey 395fe63613 Resolving: MNG-557
o Added new CLI switch {--settings,-s} for alternate user settings path.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227250 13f79535-47bb-0310-9956-ffa450edef68
2005-08-03 19:26:20 +00:00
John Dennis Casey 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
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 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
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 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
John Dennis Casey 2b8143ef42 Resolving: MNG-250
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226334 13f79535-47bb-0310-9956-ffa450edef68
2005-07-29 03:47:07 +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
Emmanuel Venisse d59f6aed16 use the new snapshot of plexus-utils
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225755 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 11:57:34 +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 bf7390cde7 PR: MNG-548
expose ${reactorProjects} variable

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225720 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 07:28:19 +00:00
Brett Leslie Porter 5d46a03299 allow version spec/release version of an extension
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225480 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 08:27:48 +00:00