Commit Graph

81 Commits

Author SHA1 Message Date
Jason van Zyl cc1ca10d74 o separating out the MavenEmbedderProjectWithExtensionReadingTest which shows that the artifacts handlers must be loaded up-front
in the readProjectWithDependencies method because it is not being done in the core unless projects are executed. So Milos' assertion
  is correct. I'm now looking at a layered approach for project resolution and then execution so that the readProjectWithDependencies
  (which is essential for IDE integration) will yield something that can be pushed into the lifecycle executor. Right now there
  is much duplication which makes the IDE integration crappy.

  Another result of this is trying to create a simple IDE import model that gives back client code the fully resolved, topo sorted
  set of projects which point to binary dependencies outside the reactor, and to source folders inside the reactor. The result will
  be a useful model for all IDE integration, right now everyone is doing their own thing. This model will need hooks for customization
  to take into account turning "workspace resolution" on/off and allow easy overriding of this process.

o Fixed IT0035



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572366 13f79535-47bb-0310-9956-ffa450edef68
2007-09-03 15:42:29 +00:00
Jason van Zyl 5c5c39e8ec o use ${pom.version} and not just ${version}
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572213 13f79535-47bb-0310-9956-ffa450edef68
2007-09-03 02:25:41 +00:00
Jason van Zyl 9c88509721 o putting the old style assembly back as it is too much pain to for the uber jar
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571876 13f79535-47bb-0310-9956-ffa450edef68
2007-09-01 21:36:35 +00:00
Jason van Zyl 8b0aaef52f o creating two scripts for convenience for the IntelliJ and Eclipse IDE integrators
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571874 13f79535-47bb-0310-9956-ffa450edef68
2007-09-01 21:28:26 +00:00
Jason van Zyl 884f70085e o integrate changes made in maven-artifact for non fail-fast and request/result usage in the embedder for
use in IDE integration to provide as much feedback as possible.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571862 13f79535-47bb-0310-9956-ffa450edef68
2007-09-01 19:23:17 +00:00
Jason van Zyl a227a73569 o a little more documentation about the profile required for IntelliJ
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571375 13f79535-47bb-0310-9956-ffa450edef68
2007-08-31 04:48:02 +00:00
Jason van Zyl 34b4b59c7c o creating a profile for the embedder that needs to be created for IntelliJ
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571374 13f79535-47bb-0310-9956-ffa450edef68
2007-08-31 04:43:57 +00:00
John Dennis Casey 72f24cf693 Commenting assembly plugin version 2.2-beta-2-SNAPSHOT, adding 2.2-beta-1.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@570895 13f79535-47bb-0310-9956-ffa450edef68
2007-08-29 18:48:45 +00:00
Kenney Westerhof 50c099ba54 attach the shaded artifact instead of replacing it. When embedding maven or using another p-c-d or any other lib, those classes will be duplicated in the classpath, wreacking havoc.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@570281 13f79535-47bb-0310-9956-ffa450edef68
2007-08-28 00:41:25 +00:00
John Dennis Casey 0d38b157b0 Adding new assembly descritor to assemble a repository containing the dependencies for maven (pre-shaded), and adding a profile to the POM to allow us to trigger the creation of this new assembly. This is valuable for plugins and other components that list one or more maven artifacts as dependencies, so they can be built without rebuilding all of maven.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@564306 13f79535-47bb-0310-9956-ffa450edef68
2007-08-09 17:48:21 +00:00
Jason van Zyl 19ba741d4d we have to keep classwords in a separate jar and boot it by itself or we end up with everythign in the primordial classloade
which sucks ass. I didn't notice that until I ran a big slew of tests and the realm out put was entirely different. We defin
  definitely want to boot up with just classworlds in the primordial loader so we can do what we like with the rest  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561194 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 00:24:55 +00:00
Kenney Westerhof 335a6fd250 fix the build - replacing project.file with a file in another dir fscks' up the alignment
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561177 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 22:55:13 +00:00
Jason van Zyl 6583991465 o updating to the new version of plexus which is the unified JAR once again. I can now move on
to doxia and attempt to use the same container for the trunk and branch.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@560496 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 04:57:37 +00:00
Jason van Zyl c3272e9284 o put the shader in the package phase and order the plugins so that the shading happens first and then the assembly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@548224 13f79535-47bb-0310-9956-ffa450edef68
2007-06-18 05:38:33 +00:00
Jason van Zyl cc5f2f954b Reverting the package changes
Issue id: MNG-2943


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543753 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 15:35:57 +00:00
John Dennis Casey 10febbbda0 Replaced old build-plan mess with a single recursive plan instance that tracks direct invocation forks as well as lifecycle forks. All unit tests run, and I'm running integration tests now, to see if this fixes it0013.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541938 13f79535-47bb-0310-9956-ffa450edef68
2007-05-26 21:06:12 +00:00
Jason van Zyl 1e87b8acd8 o using a new plexus release, have to setting for the two jar plexus setup, i can't get the single jar
to work right now


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532065 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 20:09:40 +00:00
Jason van Zyl 906e4a2f74 o state requirement of the mr file wagon
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532026 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 17:46:48 +00:00
Jason van Zyl e095f2ffff o update shade
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@531928 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 13:28:20 +00:00
Jason van Zyl 93c8d30067 o lock verison of shade
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@530963 13f79535-47bb-0310-9956-ffa450edef68
2007-04-21 01:21:05 +00:00
Andrew Williams 589c23e289 Erm, jvanzyl, I don't think you meant to commit this change, it stopped maven from bootstrapping a usable application
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@521647 13f79535-47bb-0310-9956-ffa450edef68
2007-03-23 09:38:52 +00:00
Jason van Zyl 05162de0d0 o bits for mng-1577
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@521543 13f79535-47bb-0310-9956-ffa450edef68
2007-03-23 00:11:31 +00:00
Jason van Zyl 17a7a726c5 MNG-2868 The behavior in MNG-1577 is now available on the trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@520923 13f79535-47bb-0310-9956-ffa450edef68
2007-03-21 16:00:17 +00:00
Jason van Zyl f03d8d662f o testing repeatedly with an empty repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@516820 13f79535-47bb-0310-9956-ffa450edef68
2007-03-11 00:48:53 +00:00
Jason van Zyl badcd2287f o roll back to wagon beta-2 to fix the rash of problems with m2eclipse plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@516654 13f79535-47bb-0310-9956-ffa450edef68
2007-03-10 05:38:50 +00:00
Jason van Zyl ebb699fe5f o the minijar plugin is now on central
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514450 13f79535-47bb-0310-9956-ffa450edef68
2007-03-04 18:07:44 +00:00
Jason van Zyl 9ae91863b4 o moving assembly descriptor to src/main/assembly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514305 13f79535-47bb-0310-9956-ffa450edef68
2007-03-04 01:07:00 +00:00
Jason van Zyl 3bd3bb5b79 o moving over the stuff required for the CLI here
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514296 13f79535-47bb-0310-9956-ffa450edef68
2007-03-04 00:48:55 +00:00
Jason van Zyl 2ccc760685 updating license headers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513028 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 22:50:21 +00:00
Jason van Zyl d3deb61421 o remove maven-tools and put the utility code in the only module that now depends on it, maven-project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512763 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 14:20:13 +00:00
Jason van Zyl f37ff7ef4d o use FileUtils for copying the POM.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512749 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 13:17:02 +00:00
Jason van Zyl e981109693 o updating the example
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512583 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 02:54:07 +00:00
Jason van Zyl afc8c1ac11 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512555 13f79535-47bb-0310-9956-ffa450edef68 2007-02-28 01:33:00 +00:00
Jason van Zyl d4c28b894d MNG-2847 close up the reader properly when reading model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@511342 13f79535-47bb-0310-9956-ffa450edef68
2007-02-24 20:39:48 +00:00
Jason van Zyl 1ff7c5a235 o renaming the embedder request to embedder configuration which is more appropropriate
o move toward using one constructor which takes a configuration for session wide configuration, the execution still 
  takes an execution request as per usual



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505664 13f79535-47bb-0310-9956-ffa450edef68
2007-02-10 09:20:11 +00:00
Jason van Zyl 5288374ef1 o fixes to the embedder for finding settings and cleaning up embedder initialization
Submitted by: Eugene Kuleshov


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505612 13f79535-47bb-0310-9956-ffa450edef68
2007-02-10 02:01:42 +00:00
Joakim Erdfelt 33f23db7de * Migrating to wagon-manager 1.0-beta-3-SNAPSHOT
* Created org.apache.maven.artifact.manager.ArtifactManager
* Deprecated org.apache.maven.artifact.manager.WagonManager in favor of new ArtifactManager
* Updated the rest of maven to utilize this new ArtifactManager.
* The default wagon providers list is now managed from within wagon-manager's dependency list.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505520 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 21:53:27 +00:00
Kenney Westerhof b7ae6feb1c Enable all tests again
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497810 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 13:43:11 +00:00
Jason van Zyl e2e634d16c git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497176 13f79535-47bb-0310-9956-ffa450edef68 2007-01-17 21:19:32 +00:00
Jason van Zyl 990f9a55c9 o update bundle
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@495102 13f79535-47bb-0310-9956-ffa450edef68
2007-01-11 03:39:55 +00:00
Jason van Zyl 241652c45f o clean up distribution management
o going to just use my manifest with filtering, the assembly plugin doesn't work and neither does the 
  the felix plugin. they just crap out or don't work. this works and does the job just fine



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@493929 13f79535-47bb-0310-9956-ffa450edef68
2007-01-08 03:41:56 +00:00
Jason van Zyl 72e7a4df53 o lining up all the uses of modello and using 1.0-alpha-13 of the modello plugin everywhere
o add the generation of a JDOMWriter for use in the embedder so that working with models doesn't                                    
  completely whack the existing XML, and allow for outputting the namespace declarations                                            
o add a security manager to the embedder which is off by default but will barf if someone                                           
  tries to set system properties. you have to specifically turn this on because it will more then                                   
  likely break tons of code like xerces setting a system property named "version", nice.       



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@493811 13f79535-47bb-0310-9956-ffa450edef68
2007-01-07 19:13:33 +00:00
Kenney Westerhof 4be6542867 Update dependency on plexus-container-default to 1.0-alpha-16-SNAPSHOT to fix child
container issues when maven builds use extensions;

Update dependency on plexus-classworlds to 1.0-alpha-7-SNAPSHOT to fix child container
plexus-bootstrap.xml loading problems.

Define p-c-d as a direct dep for maven-embedder; if not, an older version can be used
than is specified in the parent pom (dependencyManagement is not applied to transitive deps,
which is a bug (right?)).

Alter AbstractArtifactTask.java and MavenEmbedder.java to call the proper constructor
in DefaultPlexusContainer.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@493294 13f79535-47bb-0310-9956-ffa450edef68
2007-01-06 04:03:24 +00:00
Jason van Zyl 23e2504d23 MNG-2733 When request.setPomFile( file ) is used, takes its basedir for the execution request so that request.getBasedir() doesn't NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@491524 13f79535-47bb-0310-9956-ffa450edef68
2007-01-01 02:52:56 +00:00
Jason van Zyl 8f4a420c8d MNG-2728 return a MavenExecutionResult from Maven.execute( request )
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@491512 13f79535-47bb-0310-9956-ffa450edef68
2007-01-01 00:18:12 +00:00
Jason van Zyl 622f014e0d MNG-2724: Create a component in the embedder who's responsibility is to configure an execution request
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@491487 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 21:04:13 +00:00
Jason van Zyl e259065562 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@491373 13f79535-47bb-0310-9956-ffa450edef68 2006-12-31 03:24:59 +00:00
Jason van Zyl df12fcab5d o restoring assembly descriptor so that I can actually build from within this module
o all the use of an embedder request with no settings file information and have the defaults just kick in



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@491334 13f79535-47bb-0310-9956-ffa450edef68
2006-12-30 22:21:18 +00:00
Andrew Williams 2d9fc16efb revert the revert of r480835 - there must be an inconsistency in my home repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@483399 13f79535-47bb-0310-9956-ffa450edef68
2006-12-07 09:52:49 +00:00
Andrew Williams 7897be76b4 Goodness me this file was missed too, apologies again. Everything builds again now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@483313 13f79535-47bb-0310-9956-ffa450edef68
2006-12-07 00:39:30 +00:00