brett 2005/04/12 22:11:49
Modified: . pom.xml
maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources
pom.xml
maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources
pom.xml
maven-core pom.xml
maven-core/src/main/java/org/apache/maven/plugin
DefaultPluginManager.java
MavenPluginDiscoverer.java
maven-core/src/main/resources/org/apache/maven/project
pom-4.0.0.xml
maven-core-it README.txt
maven-core-it/it0010 pom.xml
maven-core-it/it0011 pom.xml
maven-core-it/it0012 pom.xml
maven-core-it/it0013 pom.xml
maven-core-it/it0015 pom.xml
maven-core-it/it0016 pom.xml
maven-core-it/it0017 pom.xml
maven-mboot2/src/main/java MBoot.java
maven-plugin-tools/maven-plugin-tools-java pom.xml
maven-plugin-tools/maven-plugin-tools-marmalade pom.xml
maven-plugins pom.xml
maven-plugins/maven-clean-plugin pom.xml
maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin
CompilerMojo.java
maven-plugins/maven-deploy-plugin pom.xml
maven-plugins/maven-ejb-plugin pom.xml
maven-plugins/maven-hello-plugin pom.xml
maven-plugins/maven-install-plugin pom.xml
maven-plugins/maven-jar-plugin pom.xml
maven-plugins/maven-plugin-plugin pom.xml
maven-plugins/maven-resources-plugin pom.xml
maven-plugins/maven-surefire-plugin pom.xml
maven-plugins/maven-war-plugin pom.xml
maven-script/maven-script-marmalade pom.xml
maven-site/src/site/xdoc configuration.xml
Removed: maven-plugin .cvsignore pom.xml
maven-plugin/src .cvsignore
maven-plugin/src/main/java/org/apache/maven/plugin
AbstractPlugin.java FailureResponse.java
Plugin.java PluginExecutionException.java
PluginExecutionRequest.java
PluginExecutionResponse.java PluginTestCase.java
maven-plugin/src/main/java/org/apache/maven/plugin/descriptor
Dependency.java MojoDescriptor.java Parameter.java
PluginDescriptor.java PluginDescriptorBuilder.java
maven-plugin/src/main/java/org/apache/maven/plugin/script
MojoScript.java
maven-plugin/src/main/java/org/apache/maven/plugin/util/scan
AbstractSourceInclusionScanner.java
InclusionScanException.java
SourceInclusionScanner.java StaleSourceScanner.java
maven-plugin/src/main/java/org/apache/maven/plugin/util/scan/mapping
SourceMapping.java SuffixMapping.java
maven-plugin/src/test/java/org/apache/maven/plugin/util/scan
StaleSourceScannerTest.java
maven-plugin/src/test/java/org/apache/maven/plugin/util/scan/mapping
SuffixMappingTest.java
maven-plugin/src/test/resources/org/apache/maven/plugin/util/scan
StaleSourceScanner-testMarker.txt
Log:
split the plugin API and the plugin descriptor code
Revision Changes Path
1.31 +2 -1 maven-components/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/pom.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pom.xml 11 Apr 2005 07:28:50 -0000 1.30
+++ pom.xml 13 Apr 2005 05:11:48 -0000 1.31
@@ -89,7 +89,8 @@
<module>maven-artifact-test</module>
<module>maven-model</module>
<module>maven-monitor</module>
- <module>maven-plugin</module>
+ <module>maven-plugin-api</module>
+ <module>maven-plugin-descriptor</module>
<module>maven-core</module>
<module>maven-settings</module>
<module>maven-script</module>
1.2 +1 -1
maven-components/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-archetype/maven-archetypes/maven-archetype-marmalade-mojo/src/main/resources/archetype-resources/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pom.xml 7 Apr 2005 21:25:01 -0000 1.1
+++ pom.xml 13 Apr 2005 05:11:48 -0000 1.2
@@ -7,7 +7,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
1.3 +1 -1
maven-components/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pom.xml 7 Apr 2005 15:42:46 -0000 1.2
+++ pom.xml 13 Apr 2005 05:11:48 -0000 1.3
@@ -7,7 +7,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
1.33 +6 -1 maven-components/maven-core/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/pom.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pom.xml 13 Apr 2005 01:09:02 -0000 1.32
+++ pom.xml 13 Apr 2005 05:11:48 -0000 1.33
@@ -35,7 +35,12 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-descriptor</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
1.76 +5 -3
maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Index: DefaultPluginManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- DefaultPluginManager.java 5 Apr 2005 08:17:28 -0000 1.75
+++ DefaultPluginManager.java 13 Apr 2005 05:11:48 -0000 1.76
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.MavenMetadataSource;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -701,9 +702,10 @@
{
// TODO: configure this from bootstrap or scan lib
artifactFilter = new ExclusionSetFilter( new String[]{"maven-core",
"maven-artifact", "maven-model",
-
"maven-settings", "maven-monitor", "maven-plugin",
-
"plexus-container-default", "plexus-artifact-container",
-
"wagon-provider-api", "classworlds"} );
+
"maven-settings", "maven-monitor", "maven-plugin-api",
+
"maven-plugin-descriptor", "plexus-container-default",
+
"plexus-artifact-container", "wagon-provider-api",
+ "classworlds"}
);
}
// ----------------------------------------------------------------------
1.6 +3 -3
maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java
Index: MavenPluginDiscoverer.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MavenPluginDiscoverer.java 15 Mar 2005 02:50:58 -0000 1.5
+++ MavenPluginDiscoverer.java 13 Apr 2005 05:11:48 -0000 1.6
@@ -66,8 +66,8 @@
}
//
----------------------------------------------------------------------
- // We take the plugin descriptor as it has been built by the
maven-plugin
- // code. This descriptor is specific to maven-plugin and we are now
+ // We take the plugin descriptor as it has been built by the
maven-plugin-descriptor
+ // code. This descriptor is specific to maven-plugin-descriptor and
we are now
// going to adapt it into a ComponentSetDescriptor that can be
// utlized by Plexus.
//
----------------------------------------------------------------------
1.18 +8 -8
maven-components/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Index: pom-4.0.0.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pom-4.0.0.xml 13 Apr 2005 01:54:15 -0000 1.17
+++ pom-4.0.0.xml 13 Apr 2005 05:11:48 -0000 1.18
@@ -49,17 +49,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<configuration>
<includes>
<include
implementation="java.lang.String">**/*Test.java</include>
@@ -72,27 +72,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pom-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</plugin>
</plugins>
</pluginManagement>
1.27 +1 -0 maven-components/maven-core-it/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/maven-components/maven-core-it/README.txt,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- README.txt 11 Apr 2005 12:27:13 -0000 1.26
+++ README.txt 13 Apr 2005 05:11:48 -0000 1.27
@@ -36,6 +36,7 @@
will check this, by depending on classworlds, which is a dependency
of
maven-component, which is the parent of maven-plugin, which is an
explicit dependency of this test.
+ # TODO: must correct the assumptions of this test
it0011: Test specification of dependency versions via
<dependencyManagement/>.
1.5 +1 -1 maven-components/maven-core-it/it0010/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core-it/it0010/pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pom.xml 23 Mar 2005 06:52:53 -0000 1.4
+++ pom.xml 13 Apr 2005 05:11:48 -0000 1.5
@@ -7,7 +7,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<version>2.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
1.7 +2 -2 maven-components/maven-core-it/it0011/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core-it/it0011/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pom.xml 23 Mar 2005 06:52:53 -0000 1.6
+++ pom.xml 13 Apr 2005 05:11:48 -0000 1.7
@@ -7,7 +7,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -22,7 +22,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<version>2.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
1.6 +1 -1 maven-components/maven-core-it/it0012/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core-it/it0012/pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pom.xml 23 Mar 2005 06:52:53 -0000 1.5
+++ pom.xml 13 Apr 2005 05:11:48 -0000 1.6
@@ -7,7 +7,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<version>2.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
1.7 +1 -1 maven-components/maven-core-it/it0013/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core-it/it0013/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pom.xml 23 Mar 2005 06:52:53 -0000 1.6
+++ pom.xml 13 Apr 2005 05:11:48 -0000 1.7
@@ -7,7 +7,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<version>2.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
1.10 +1 -1 maven-components/maven-core-it/it0015/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core-it/it0015/pom.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pom.xml 8 Apr 2005 04:48:04 -0000 1.9
+++ pom.xml 13 Apr 2005 05:11:48 -0000 1.10
@@ -7,7 +7,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
1.6 +1 -1 maven-components/maven-core-it/it0016/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core-it/it0016/pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pom.xml 23 Mar 2005 06:52:53 -0000 1.5
+++ pom.xml 13 Apr 2005 05:11:48 -0000 1.6
@@ -10,7 +10,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</plugin>
</plugins>
</build>
1.4 +1 -1 maven-components/maven-core-it/it0017/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core-it/it0017/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pom.xml 23 Mar 2005 06:52:53 -0000 1.3
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.4
@@ -10,7 +10,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</plugin>
</plugins>
</build>
1.96 +4 -11 maven-components/maven-mboot2/src/main/java/MBoot.java
Index: MBoot.java
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot2/src/main/java/MBoot.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- MBoot.java 12 Apr 2005 21:13:24 -0000 1.95
+++ MBoot.java 13 Apr 2005 05:11:49 -0000 1.96
@@ -35,9 +35,9 @@
public class MBoot
{
- String[] builds = new String[]{"maven-model", "maven-settings",
"maven-monitor", "maven-plugin", "maven-artifact",
- "maven-script/maven-script-marmalade",
"maven-core", "maven-archiver",
-
"maven-plugin-tools/maven-plugin-tools-api",
+ String[] builds = new String[]{"maven-model", "maven-settings",
"maven-monitor", "maven-plugin-api",
+ "maven-plugin-descriptor",
"maven-artifact", "maven-script/maven-script-marmalade",
+ "maven-core", "maven-archiver",
"maven-plugin-tools/maven-plugin-tools-api",
"maven-plugin-tools/maven-plugin-tools-java",
"maven-plugin-tools/maven-plugin-tools-pluggy",
"maven-plugin-tools/maven-plugin-tools-marmalade", "maven-core-it-verifier"};
@@ -617,14 +617,7 @@
String artifactId = reader.getArtifactId();
- if ( !artifactId.equals( "maven-plugin" ) && artifactId.endsWith(
"plugin" ) )
- {
- install( basedir, localRepository, reader, "maven-plugin" );
- }
- else
- {
- install( basedir, localRepository, reader, "jar" );
- }
+ install( basedir, localRepository, reader, reader.getPackaging() );
return reader;
}
1.7 +1 -1
maven-components/maven-plugin-tools/maven-plugin-tools-java/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugin-tools/maven-plugin-tools-java/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pom.xml 8 Apr 2005 07:50:53 -0000 1.6
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.7
@@ -15,7 +15,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-descriptor</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
1.16 +1 -1
maven-components/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pom.xml 8 Apr 2005 07:50:53 -0000 1.15
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.16
@@ -20,7 +20,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-descriptor</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
1.27 +1 -1 maven-components/maven-plugins/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/pom.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pom.xml 12 Apr 2005 21:41:25 -0000 1.26
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.27
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
1.12 +2 -2 maven-components/maven-plugins/maven-clean-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-clean-plugin/pom.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pom.xml 8 Apr 2005 10:03:53 -0000 1.11
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.12
@@ -2,12 +2,12 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-clean-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Clean Plugin</name>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<inceptionYear>2001</inceptionYear>
</project>
1.28 +5 -5
maven-components/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
Index: CompilerMojo.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- CompilerMojo.java 5 Apr 2005 08:17:28 -0000 1.27
+++ CompilerMojo.java 13 Apr 2005 05:11:49 -0000 1.28
@@ -14,10 +14,10 @@
* the License.
*/
-import org.apache.maven.plugin.util.scan.InclusionScanException;
-import org.apache.maven.plugin.util.scan.SourceInclusionScanner;
-import org.apache.maven.plugin.util.scan.StaleSourceScanner;
-import org.apache.maven.plugin.util.scan.mapping.SuffixMapping;
+import org.codehaus.plexus.compiler.util.scan.InclusionScanException;
+import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner;
+import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner;
+import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping;
import org.codehaus.plexus.compiler.Compiler;
import org.codehaus.plexus.compiler.CompilerConfiguration;
import org.codehaus.plexus.compiler.CompilerError;
1.13 +3 -3
maven-components/maven-plugins/maven-deploy-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-deploy-plugin/pom.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pom.xml 8 Apr 2005 10:03:53 -0000 1.12
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.13
@@ -2,19 +2,19 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-deploy-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Deploy Plugin</name>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<inceptionYear>2004</inceptionYear>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
1.7 +2 -2 maven-components/maven-plugins/maven-ejb-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-ejb-plugin/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pom.xml 8 Apr 2005 10:03:53 -0000 1.6
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.7
@@ -2,13 +2,13 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-ejb-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven EJB Plugin</name>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
1.2 +0 -1 maven-components/maven-plugins/maven-hello-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-hello-plugin/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pom.xml 8 Apr 2005 05:34:41 -0000 1.1
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.2
@@ -9,7 +9,6 @@
<packaging>maven-plugin</packaging>
<name>Maven Hello World Plugin</name>
<version>1.0-SNAPSHOT</version>
-
<build>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<resources>
1.14 +3 -3
maven-components/maven-plugins/maven-install-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-install-plugin/pom.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pom.xml 8 Apr 2005 10:03:53 -0000 1.13
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.14
@@ -2,19 +2,19 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-install-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Install Plugin</name>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<inceptionYear>2004</inceptionYear>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
1.19 +3 -3 maven-components/maven-plugins/maven-jar-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-jar-plugin/pom.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pom.xml 8 Apr 2005 10:03:54 -0000 1.18
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.19
@@ -2,13 +2,13 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-jar-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Jar Plugin</name>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
</model>
1.16 +5 -5
maven-components/maven-plugins/maven-plugin-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-plugin-plugin/pom.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pom.xml 8 Apr 2005 10:03:54 -0000 1.15
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.16
@@ -2,30 +2,30 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-plugin-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven PLUGIN Plugin</name>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<inceptionYear>2001</inceptionYear>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-java</artifactId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-marmalade</artifactId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
1.19 +2 -2
maven-components/maven-plugins/maven-resources-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-resources-plugin/pom.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pom.xml 8 Apr 2005 10:03:54 -0000 1.18
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.19
@@ -2,13 +2,13 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-resources-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Resources Plugin</name>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
1.14 +2 -2
maven-components/maven-plugins/maven-surefire-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-surefire-plugin/pom.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pom.xml 8 Apr 2005 10:03:54 -0000 1.13
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.14
@@ -2,13 +2,13 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-surefire-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Surefire Plugin</name>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>surefire</groupId>
1.11 +2 -2 maven-components/maven-plugins/maven-war-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-war-plugin/pom.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pom.xml 8 Apr 2005 10:03:54 -0000 1.10
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.11
@@ -2,13 +2,13 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-alpha-1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-war-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven War Plugin</name>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
1.12 +1 -1
maven-components/maven-script/maven-script-marmalade/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-script/maven-script-marmalade/pom.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pom.xml 8 Apr 2005 07:50:53 -0000 1.11
+++ pom.xml 13 Apr 2005 05:11:49 -0000 1.12
@@ -10,7 +10,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
+ <artifactId>maven-plugin-descriptor</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
1.3 +1 -1
maven-components/maven-site/src/site/xdoc/configuration.xml
Index: configuration.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-site/src/site/xdoc/configuration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configuration.xml 12 Apr 2005 01:44:37 -0000 1.2
+++ configuration.xml 13 Apr 2005 05:11:49 -0000 1.3
@@ -83,7 +83,7 @@
<proxy>
<active>true</active>
<protocol>http</protocol>
- <host>http://proxy.somewhere.com</host>
+ <host>proxy.somewhere.com</host>
<port>8080</port>
<username>proxyuser</username>
<password>somepassword</password>
