You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2005/10/07 18:05:41 UTC
svn commit: r307161 - in /maven/components/trunk/maven-embedder: pom.xml
run.sh src/main/java/org/apache/maven/embedder/MavenEmbedder.java
src/main/resources/META-INF/plexus/components.xml
src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Author: jvanzyl
Date: Fri Oct 7 09:05:30 2005
New Revision: 307161
URL: http://svn.apache.org/viewcvs?rev=307161&view=rev
Log:
o make the reactor fail fast or exceptions seem to be lost
Modified:
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/run.sh
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Modified: maven/components/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/pom.xml?rev=307161&r1=307160&r2=307161&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Fri Oct 7 09:05:30 2005
@@ -2,13 +2,13 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
<name>Maven Embedder</name>
- <version>2.0-beta-3-SNAPSHOT</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
<build>
<plugins>
<plugin>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -50,22 +50,22 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-profile</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -75,17 +75,17 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-registry</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -95,12 +95,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -110,17 +110,17 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-descriptor</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
Modified: maven/components/trunk/maven-embedder/run.sh
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/run.sh?rev=307161&r1=307160&r2=307161&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/run.sh (original)
+++ maven/components/trunk/maven-embedder/run.sh Fri Oct 7 09:05:30 2005
@@ -2,7 +2,7 @@
m2 clean:clean assembly:assembly
-CLASSPATH=target/maven-embedder-2.0-beta-3-SNAPSHOT-dep.jar
+CLASSPATH=target/maven-embedder-2.0-beta-4-SNAPSHOT-dep.jar
javac -classpath $CLASSPATH Plugin.java
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=307161&r1=307160&r2=307161&view=diff
==============================================================================
--- 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 Oct 7 09:05:30 2005
@@ -240,6 +240,11 @@
return localRepositoryDirectory;
}
+ public ArtifactRepository getLocalRepository()
+ {
+ return localRepository;
+ }
+
public MavenEmbedderLogger getLogger()
{
return logger;
@@ -392,7 +397,11 @@
eventDispatcher.addEventMonitor( eventMonitor );
- rm.setFailureBehavior( ReactorManager.FAIL_AT_END );
+ // If this option is set the exception seems to be hidden ...
+
+ //rm.setFailureBehavior( ReactorManager.FAIL_AT_END );
+
+ rm.setFailureBehavior( ReactorManager.FAIL_FAST );
MavenSession session = new MavenSession( embedder.getContainer(),
settings,
@@ -435,7 +444,7 @@
if ( response.isExecutionFailure() )
{
- throw new MojoExecutionException( "Integration test failed" );
+ throw new MojoExecutionException( "Project failed to build.", response.getException() );
}
}
@@ -574,8 +583,6 @@
if ( logger != null )
{
- System.out.println( "logger = " + logger );
-
embedder.setLoggerManager( new MavenEmbedderLoggerManager( new PlexusLoggerAdapter( logger ) ) );
}
Modified: maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml?rev=307161&r1=307160&r2=307161&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml Fri Oct 7 09:05:30 2005
@@ -289,11 +289,13 @@
<component>
<role>org.apache.maven.project.MavenProjectHelper</role>
<implementation>org.apache.maven.project.DefaultMavenProjectHelper</implementation>
+ <!--
<requirements>
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
</requirement>
</requirements>
+ -->
</component>
<!--
|
@@ -880,6 +882,7 @@
<component>
<role>org.codehaus.plexus.components.inputhandler.InputHandler</role>
+ <role-hint>default</role-hint>
<implementation>org.codehaus.plexus.components.inputhandler.DefaultInputHandler</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
</component>
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=307161&r1=307160&r2=307161&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java Fri Oct 7 09:05:30 2005
@@ -123,6 +123,19 @@
}
// ----------------------------------------------------------------------
+ // Repository
+ // ----------------------------------------------------------------------
+
+ public void testLocalRepositoryRetrieval()
+ throws Exception
+ {
+ System.out.println( "maven.getLocalRepository() = " + maven.getLocalRepository() );
+
+ assertNotNull( maven.getLocalRepository().getBasedir() );
+ }
+
+
+ // ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------