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/11/04 18:12:35 UTC
svn commit: r330845 - in /maven/components/trunk/maven-embedder: pom.xml
run.sh src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Author: jvanzyl
Date: Fri Nov 4 09:12:29 2005
New Revision: 330845
URL: http://svn.apache.org/viewcvs?rev=330845&view=rev
Log:
o clean up the dependencies in the POM, i really only need to depend on the
core and everything else will come in transitively
o rolling things back to use the 2.0 release maven artifacts, i can
subsequently, deploy 2.0.1-SNAPSHOTs and when 2.0.1 is released I will
release 2.0.1 of the embedder. I think the releases of the embedder must
follow closely on the heels of Maven itself.
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
Modified: maven/components/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/pom.xml?rev=330845&r1=330844&r2=330845&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Fri Nov 4 09:12:29 2005
@@ -8,10 +8,10 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
<name>Maven Embedder</name>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<properties>
- <mavenVersion>2.0.1-SNAPSHOT</mavenVersion>
+ <mavenVersion>2.0</mavenVersion>
</properties>
<build>
@@ -26,116 +26,10 @@
</build>
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
- <version>1.0-alpha-4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <version>1.0-alpha-4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-profile</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-repository-metadata</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-registry</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-input-handler-api</artifactId>
- <version>1.0-alpha-3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-descriptor</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>1.0-alpha-4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>jsch</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.21</version>
- </dependency>
</dependencies>
<reporting>
<plugins>
Modified: maven/components/trunk/maven-embedder/run.sh
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/run.sh?rev=330845&r1=330844&r2=330845&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/run.sh (original)
+++ maven/components/trunk/maven-embedder/run.sh Fri Nov 4 09:12:29 2005
@@ -1,8 +1,8 @@
#!/bin/sh
-m2 clean:clean assembly:assembly
+mvn clean:clean assembly:assembly
-CLASSPATH=target/maven-embedder-2.0-beta-4-SNAPSHOT-dep.jar
+CLASSPATH=target/maven-embedder-2.0-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=330845&r1=330844&r2=330845&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 Nov 4 09:12:29 2005
@@ -32,7 +32,6 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.RuntimeInfo;
@@ -381,7 +380,7 @@
TransferListener transferListener,
Properties properties,
File executionRootDirectory )
- throws CycleDetectedException, LifecycleExecutionException, BuildFailureException, DuplicateProjectException
+ throws CycleDetectedException, LifecycleExecutionException, BuildFailureException
{
execute( Collections.singletonList( project ), goals, eventMonitor, transferListener, properties, executionRootDirectory );
}
@@ -392,7 +391,7 @@
TransferListener transferListener,
Properties properties,
File executionRootDirectory )
- throws CycleDetectedException, LifecycleExecutionException, BuildFailureException, DuplicateProjectException
+ throws CycleDetectedException, LifecycleExecutionException, BuildFailureException
{
ReactorManager rm = new ReactorManager( projects );