jvanzyl 2004/02/11 18:02:08
Modified: maven-plugins/maven-compiler-plugin/src/meta-inf
components.xml
maven-plugins/maven-jar-plugin/src/meta-inf components.xml
maven-plugins/maven-surefire-plugin project.xml
maven-plugins/maven-surefire-plugin/src/main/org/apache/maven/test
SurefirePlugin.java
Log:
Revision Changes Path
1.2 +15 -13
maven-components/maven-plugins/maven-compiler-plugin/src/meta-inf/components.xml
Index: components.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-compiler-plugin/src/meta-inf/components.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- components.xml 6 Feb 2004 23:34:32 -0000 1.1
+++ components.xml 12 Feb 2004 02:02:08 -0000 1.2
@@ -1,13 +1,15 @@
-<components>
- <component>
- <role>org.apache.maven.plugin.Plugin</role>
- <role-hint>compiler</role-hint>
- <implementation>org.apache.maven.plugin.CompilerPlugin</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.compiler.Compiler</role>
- <field>compilers</field>
- </requirement>
- </requirements>
- </component>
-</components>
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.plugin.Plugin</role>
+ <role-hint>compiler</role-hint>
+ <implementation>org.apache.maven.plugin.CompilerPlugin</implementation>
+ <requirements>
+ <requirement>
+ <role>org.codehaus.plexus.compiler.Compiler</role>
+ <field-name>compilers</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ </components>
+</component-set>
1.2 +2 -0
maven-components/maven-plugins/maven-jar-plugin/src/meta-inf/components.xml
Index: components.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-jar-plugin/src/meta-inf/components.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- components.xml 6 Feb 2004 23:34:32 -0000 1.1
+++ components.xml 12 Feb 2004 02:02:08 -0000 1.2
@@ -1,3 +1,4 @@
+<component-set>
<components>
<component>
<role>org.apache.maven.plugin.Plugin</role>
@@ -5,3 +6,4 @@
<implementation>org.apache.maven.plugin.JarPlugin</implementation>
</component>
</components>
+</component-set>
1.2 +132 -14 maven-components/maven-plugins/maven-surefire-plugin/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-surefire-plugin/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 6 Feb 2004 23:34:32 -0000 1.1
+++ project.xml 12 Feb 2004 02:02:08 -0000 1.2
@@ -1,37 +1,155 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
- <extend>../project.xml</extend>
<pomVersion>3</pomVersion>
<id>maven-surefire-plugin</id>
+ <groupId>maven</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <name>Maven SureFire Plug-in</name>
+ <name>Maven</name>
<currentVersion>1.0-SNAPSHOT</currentVersion>
- <description/>
- <shortDescription>Run JUnit tests</shortDescription>
- <url>http://maven.apache.org/reference/plugins/surefire/</url>
- <siteDirectory>/www/maven.apache.org/reference/plugins/surefire/</siteDirectory>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ <logo>/images/apache-maven-project.png</logo>
+ </organization>
+ <inceptionYear>2001</inceptionYear>
+ <package>org.apache.maven</package>
+ <logo>/images/maven.gif</logo>
+
+ <versions/>
+ <branches/>
+ <mailingLists/>
+ <developers/>
+ <contributors/>
+ <licenses/>
+
<repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven/src/plugins-build/surefire/</connection>
- <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/test/</url>
+ <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven-components/maven-core</connection>
+ <developerConnection>scm:cvs:ext:[EMAIL
PROTECTED]:/home/cvs:maven-components/maven-core</developerConnection>
+ <url>http://cvs.apache.org/viewcvs.cgi/maven/</url>
</repository>
- <developers>
- </developers>
+
+ <!-- Need to mark these as compile-time/run-time -->
+
<dependencies>
+
+ <dependency>
+ <groupId>surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-model-xpp3</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+
<dependency>
- <groupId>surefire</groupId>
- <artifactId>surefire-booter</artifactId>
- <version>1.0</version>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0-beta-2</version>
</dependency>
+
+ <!-- Plexus -->
+
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.3.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-i18n</artifactId>
+ <version>1.0-beta-2-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>classworlds</groupId>
+ <artifactId>classworlds</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>0.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-compiler</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
+
+ <build>
+ <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
+ <sourceDirectory>src/main</sourceDirectory>
+ <!--
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </unitTest>
+ -->
+ <resources>
+ <resource>
+ <directory>src/meta-inf</directory>
+ <targetPath>META-INF/plexus</targetPath>
+ </resource>
+ </resources>
+ </build>
+
+ <reports>
+ <!--
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-simian-plugin</report>
+ -->
+ <report>maven-jxr-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-changes-plugin</report>
+ <report>maven-changelog-plugin</report>
+ <!--
+ <report>maven-faq-plugin</report> will run by itself but won't register
+ <report>maven-file-activity-plugin</report> can't parse jelly script
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-tasklist-plugin</report> not quite right the report comes out
empty @tag problem?
+ <report>maven-jdepend-plugin</report> works itself but not with site, also it
uses maven-classpath which is really just maven_home/lib
+ <report>maven-jellydoc-plugin</report> ${genDocs} not available in jelly.plugin
+ <report>maven-pmd-plugin</report> classpath is borked because of
getDependencyPath("foo:foo")
+
+ We have different uses everywhere which is a result of no documenation.
+
+ -->
+ </reports>
+
</project>
1.2 +4 -9
maven-components/maven-plugins/maven-surefire-plugin/src/main/org/apache/maven/test/SurefirePlugin.java
Index: SurefirePlugin.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-surefire-plugin/src/main/org/apache/maven/test/SurefirePlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SurefirePlugin.java 6 Feb 2004 23:34:32 -0000 1.1
+++ SurefirePlugin.java 12 Feb 2004 02:02:08 -0000 1.2
@@ -1,5 +1,6 @@
package org.apache.maven.test;
+import org.apache.maven.plugin.AbstractPlugin;
import org.apache.maven.artifact.MavenArtifact;
import org.apache.maven.project.MavenProject;
import org.codehaus.surefire.SurefireBooter;
@@ -16,15 +17,9 @@
* @version $Id$
*/
public class SurefirePlugin
+ extends AbstractPlugin
{
- private MavenProject project;
-
- public void setProject( MavenProject project )
- {
- this.project = project;
- }
-
- public void execute()
+ public void execute( MavenProject project )
throws Exception
{
String mavenRepoLocal = project.getProperty( "maven.repo.local" );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]