Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Kenney Westerhof 2007-01-06 04:03:24 +00:00
parent 4d0e8b9806
commit 4be6542867
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -1,5 +1,5 @@
classworlds.version=1.2-alpha-6 classworlds.version=1.2-alpha-6
plexus.version=1.0-alpha-15 plexus.version=1.0-alpha-16-SNAPSHOT
plexus-archiver.version=1.0-alpha-8 plexus-archiver.version=1.0-alpha-8
plexus-utils.version=1.4-alpha-1 plexus-utils.version=1.4-alpha-1
plexus-interactivity-api.version=1.0-alpha-4 plexus-interactivity-api.version=1.0-alpha-4

2
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
View File

@ -308,7 +308,7 @@ public abstract class AbstractArtifactTask
classWorld.newRealm( "plexus.core", getClass().getClassLoader() ); classWorld.newRealm( "plexus.core", getClass().getClassLoader() );
container = new DefaultPlexusContainer( null, null, null, classWorld ); container = new DefaultPlexusContainer( null, null, classWorld );
} }
catch ( PlexusContainerException e ) catch ( PlexusContainerException e )

4
maven-embedder/pom.xml
View File

@ -70,6 +70,10 @@
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.1-SNAPSHOT</version> <version>2.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-tools</artifactId> <artifactId>maven-tools</artifactId>

2
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
View File

@ -382,7 +382,7 @@ public class MavenEmbedder
try try
{ {
container = new DefaultPlexusContainer( null, null, null, classWorld ); container = new DefaultPlexusContainer( null, null, classWorld );
} }
catch ( PlexusContainerException e ) catch ( PlexusContainerException e )
{ {

4
pom.xml
View File

@ -147,7 +147,7 @@
</modules> </modules>
<properties> <properties>
<wagonVersion>1.0-beta-2</wagonVersion> <wagonVersion>1.0-beta-2</wagonVersion>
<plexusVersion>1.0-alpha-15</plexusVersion> <plexusVersion>1.0-alpha-16-SNAPSHOT</plexusVersion>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@ -172,7 +172,7 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId> <artifactId>plexus-classworlds</artifactId>
<version>1.2-alpha-6</version> <version>1.2-alpha-7-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>