You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/06/10 22:27:50 UTC
cvs commit: maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar JarMojo.java
jvanzyl 2004/06/10 13:27:50
Modified: . pom.xml
maven-core pom.xml
maven-mboot pom.xml
maven-meeper pom.xml
maven-model pom.xml
maven-plugin pom.xml
maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar
JarMojo.java
Added: maven-core/src/main/java/org/apache/maven/lifecycle/phase
InheritanceAssemblyPhase.java
Log:
o moving core deps into top-level pom.xml to be shared by all the
component builds.
Revision Changes Path
1.2 +28 -0 maven-components/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pom.xml 9 Jun 2004 03:10:49 -0000 1.1
+++ pom.xml 10 Jun 2004 20:27:50 -0000 1.2
@@ -55,6 +55,34 @@
</developer>
</developers>
+ <dependencies>
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>classworlds</groupId>
+ <artifactId>classworlds</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ </dependencies>
+
<build>
<nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
<sourceDirectory>src/main/java</sourceDirectory>
1.2 +0 -21 maven-components/maven-core/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pom.xml 9 Jun 2004 03:10:49 -0000 1.1
+++ pom.xml 10 Jun 2004 20:27:50 -0000 1.2
@@ -36,31 +36,10 @@
<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>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ognl</groupId>
1.1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/InheritanceAssemblyPhase.java
Index: InheritanceAssemblyPhase.java
===================================================================
package org.apache.maven.lifecycle.phase;
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
import org.apache.maven.lifecycle.MavenLifecycleContext;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id: InheritanceAssemblyPhase.java,v 1.1 2004/06/10 20:27:50 jvanzyl Exp $
*/
public class InheritanceAssemblyPhase
extends AbstractMavenLifecyclePhase
{
public void execute( MavenLifecycleContext context )
throws Exception
{
}
}
1.2 +0 -1 maven-components/maven-mboot/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pom.xml 9 Jun 2004 03:10:49 -0000 1.1
+++ pom.xml 10 Jun 2004 20:27:50 -0000 1.2
@@ -8,7 +8,6 @@
</parent>
<name>Maven MBoot</name>
<groupId>maven</groupId>
- <id>maven-mboot</id>
<artifactId>maven-mboot</artifactId>
<version>2.0-SNAPSHOT</version>
<description>Tool used to bootstrap m2.</description>
1.2 +0 -7 maven-components/maven-meeper/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-meeper/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pom.xml 9 Jun 2004 03:10:50 -0000 1.1
+++ pom.xml 10 Jun 2004 20:27:50 -0000 1.2
@@ -11,11 +11,4 @@
<artifactId>maven-meeper</artifactId>
<version>0.1-SNAPSHOT</version>
<description></description>
- <dependencies>
- <dependency>
- <groupId>maven</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
</project>
1.2 +0 -8 maven-components/maven-model/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-model/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pom.xml 9 Jun 2004 03:10:50 -0000 1.1
+++ pom.xml 10 Jun 2004 20:27:50 -0000 1.2
@@ -8,16 +8,8 @@
</parent>
<name>Maven Model</name>
<groupId>maven</groupId>
- <id>maven-model</id>
<artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version>
<description>Maven Model</description>
<shortDescription>Maven Model</shortDescription>
- <dependencies>
- <dependency>
- <artifactId>xpp3</artifactId>
- <groupId>xpp3</groupId>
- <version>1.1.3.3</version>
- </dependency>
- </dependencies>
</project>
1.2 +0 -15 maven-components/maven-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugin/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pom.xml 9 Jun 2004 03:10:50 -0000 1.1
+++ pom.xml 10 Jun 2004 20:27:50 -0000 1.2
@@ -17,21 +17,6 @@
<version>1.2</version>
</dependency>
<dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.3</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
<groupId>modello</groupId>
<artifactId>modello</artifactId>
<version>1.0-SNAPSHOT</version>
1.2 +4 -1 maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
Index: JarMojo.java
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JarMojo.java 10 Jun 2004 18:58:38 -0000 1.1
+++ JarMojo.java 10 Jun 2004 20:27:50 -0000 1.2
@@ -17,6 +17,9 @@
*/
import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.plugin.AbstractPlugin;
+import org.apache.maven.plugin.PluginExecutionRequest;
+import org.apache.maven.plugin.PluginExecutionResponse;
import java.io.File;
import java.io.FileInputStream;