You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ke...@apache.org on 2007/01/06 05:03:25 UTC
svn commit: r493294 - in /maven/components/trunk: ./
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/
maven-embedder/ maven-embedder/src/main/java/org/apache/maven/embedder/
Author: kenney
Date: Fri Jan 5 20:03:24 2007
New Revision: 493294
URL: http://svn.apache.org/viewvc?view=rev&rev=493294
Log:
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.
Modified:
maven/components/trunk/build.properties
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.properties
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.properties?view=diff&rev=493294&r1=493293&r2=493294
==============================================================================
--- maven/components/trunk/build.properties (original)
+++ maven/components/trunk/build.properties Fri Jan 5 20:03:24 2007
@@ -1,5 +1,5 @@
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-utils.version=1.4-alpha-1
plexus-interactivity-api.version=1.0-alpha-4
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?view=diff&rev=493294&r1=493293&r2=493294
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Fri Jan 5 20:03:24 2007
@@ -308,7 +308,7 @@
classWorld.newRealm( "plexus.core", getClass().getClassLoader() );
- container = new DefaultPlexusContainer( null, null, null, classWorld );
+ container = new DefaultPlexusContainer( null, null, classWorld );
}
catch ( PlexusContainerException e )
Modified: maven/components/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?view=diff&rev=493294&r1=493293&r2=493294
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Fri Jan 5 20:03:24 2007
@@ -71,6 +71,10 @@
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-tools</artifactId>
<version>2.1-SNAPSHOT</version>
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?view=diff&rev=493294&r1=493293&r2=493294
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Fri Jan 5 20:03:24 2007
@@ -382,7 +382,7 @@
try
{
- container = new DefaultPlexusContainer( null, null, null, classWorld );
+ container = new DefaultPlexusContainer( null, null, classWorld );
}
catch ( PlexusContainerException e )
{
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?view=diff&rev=493294&r1=493293&r2=493294
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Fri Jan 5 20:03:24 2007
@@ -147,7 +147,7 @@
</modules>
<properties>
<wagonVersion>1.0-beta-2</wagonVersion>
- <plexusVersion>1.0-alpha-15</plexusVersion>
+ <plexusVersion>1.0-alpha-16-SNAPSHOT</plexusVersion>
</properties>
<dependencies>
<dependency>
@@ -172,7 +172,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
- <version>1.2-alpha-6</version>
+ <version>1.2-alpha-7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>