You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/03/12 22:19:53 UTC
svn commit: r636513 - in /maven/site/trunk/src/site: apt/ apt/examples/
apt/guides/development/ apt/guides/getting-started/
apt/guides/introduction/ apt/guides/mini/
apt/guides/mini/guide-ide-netbeans/ apt/guides/plugin/
apt/plugin-developers/ fml/
Author: bentmann
Date: Wed Mar 12 14:19:43 2008
New Revision: 636513
URL: http://svn.apache.org/viewvc?rev=636513&view=rev
Log:
o Added <version> element to the POM snippets showing plugin configurations to illustrate best practice to users
Modified:
maven/site/trunk/src/site/apt/examples/injecting-properties-via-settings.apt
maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt
maven/site/trunk/src/site/apt/guides/getting-started/index.apt
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
maven/site/trunk/src/site/apt/guides/mini/guide-archive-configuration.apt
maven/site/trunk/src/site/apt/guides/mini/guide-assemblies.apt
maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt
maven/site/trunk/src/site/apt/guides/mini/guide-building-for-different-environments.apt
maven/site/trunk/src/site/apt/guides/mini/guide-configuring-plugins.apt
maven/site/trunk/src/site/apt/guides/mini/guide-generating-sources.apt
maven/site/trunk/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt
maven/site/trunk/src/site/apt/guides/mini/guide-manifest.apt
maven/site/trunk/src/site/apt/guides/mini/guide-releasing.apt
maven/site/trunk/src/site/apt/guides/mini/guide-site.apt
maven/site/trunk/src/site/apt/guides/mini/guide-using-ant.apt
maven/site/trunk/src/site/apt/guides/mini/guide-using-modello.apt
maven/site/trunk/src/site/apt/guides/mini/guide-using-one-source-directory.apt
maven/site/trunk/src/site/apt/guides/plugin/guide-ant-plugin-development.apt
maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt
maven/site/trunk/src/site/apt/plugin-developers/plugin-testing.apt
maven/site/trunk/src/site/apt/pom.apt
maven/site/trunk/src/site/fml/general.fml
Modified: maven/site/trunk/src/site/apt/examples/injecting-properties-via-settings.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/examples/injecting-properties-via-settings.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/examples/injecting-properties-via-settings.apt (original)
+++ maven/site/trunk/src/site/apt/examples/injecting-properties-via-settings.apt Wed Mar 12 14:19:43 2008
@@ -24,6 +24,7 @@
<plugin>
<groupId>org.myproject.plugins</groupId>
<artifactId>my-cool-maven-plugin</artifactId>
+ <version>1.0</version>
<configuration>
<deploymentDirectory>${application-home}/deploy</deploymentDirectory>
</configuration>
Modified: maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt (original)
+++ maven/site/trunk/src/site/apt/guides/development/guide-plugin-documentation.apt Wed Mar 12 14:19:43 2008
@@ -309,6 +309,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
<configuration>
<minmemory>128m</minmemory>
<maxmemory>512</maxmemory>
@@ -341,6 +342,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
</plugin>
</plugins>
</reporting>
Modified: maven/site/trunk/src/site/apt/guides/getting-started/index.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/getting-started/index.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/getting-started/index.apt (original)
+++ maven/site/trunk/src/site/apt/guides/getting-started/index.apt Wed Mar 12 14:19:43 2008
@@ -515,6 +515,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Modified: maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt (original)
+++ maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt Wed Mar 12 14:19:43 2008
@@ -53,7 +53,7 @@
...
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
-
+ <version>2.3</version>
<configuration>
...
<goalPrefix>somePrefix</goalPrefix>
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-archive-configuration.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-archive-configuration.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-archive-configuration.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-archive-configuration.apt Wed Mar 12 14:19:43 2008
@@ -27,6 +27,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>2.1-alpha-1</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-assemblies.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-assemblies.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-assemblies.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-assemblies.apt Wed Mar 12 14:19:43 2008
@@ -29,6 +29,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
<configuration>
<descriptor>src/main/assembly/dep.xml</descriptor>
</configuration>
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt Wed Mar 12 14:19:43 2008
@@ -8,7 +8,7 @@
Guide to using attached tests
- Many times you may want to resuse the tests that you have created for a project in another. For example if you have
+ Many times you may want to reuse the tests that you have created for a project in another. For example if you have
written <<<foo-core>>> and it contains test code in the <<<$\{basedir\}/src/test/java>>> it would be useful to package
up those compiled tests in a JAR and deploy them for general resuse. To do this you would configure the
<<<maven-jar-plugin>>> as follows:
@@ -21,6 +21,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
<executions>
<execution>
<goals>
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-building-for-different-environments.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-building-for-different-environments.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-building-for-different-environments.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-building-for-different-environments.apt Wed Mar 12 14:19:43 2008
@@ -99,7 +99,7 @@
</build>
</profile>
- .. Other profiles goes here ..
+ .. Other profiles go here ..
</profiles>
----
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-configuring-plugins.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-configuring-plugins.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-configuring-plugins.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-configuring-plugins.apt Wed Mar 12 14:19:43 2008
@@ -74,6 +74,7 @@
<plugins>
<plugin>
<artifactId>maven-myquery-plugin</artifactId>
+ <version>1.0</version>
<configuration>
<url>http://www.foobar.com/query</url>
<timeout>10</timeout>
@@ -186,6 +187,7 @@
<plugins>
<plugin>
<artifactId>maven-myanimal-plugin</artifactId>
+ <version>1.0</version>
<configuration>
<animals>
<animal>cat</animal>
@@ -319,6 +321,7 @@
<plugins>
<plugin>
<artifactId>maven-myquery-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<id>execution1</id>
@@ -449,6 +452,7 @@
<plugins>
<plugin>
<artifactId>maven-myquery-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<id>execution1</id>
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-generating-sources.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-generating-sources.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-generating-sources.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-generating-sources.apt Wed Mar 12 14:19:43 2008
@@ -9,7 +9,7 @@
Guide to generating sources
Let's run though a short example to try and help. To generate sources you must first have a plugin that
- participates in the generate-sources phase like the Antlr plugin:
+ participates in the <<<generate-sources>>> phase like the Antlr plugin:
%{snippet|id=generate-sources-0|url=http://svn.codehaus.org/mojo/trunk/mojo/antlr-maven-plugin/src/main/java/org/codehaus/mojo/antlr/AntlrPlugin.java}
@@ -28,6 +28,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antlr-plugin</artifactId>
+ <version>2.0-beta-1</version>
<configuration>
<grammars>java.g</grammars>
</configuration>
@@ -46,8 +47,8 @@
+----+
- If you then type "mvn compile" m2 will walk through the {{{../introduction/introduction-to-the-lifecycle.html}lifecycle}}
+ If you then type "mvn compile" Maven will walk through the {{{../introduction/introduction-to-the-lifecycle.html}lifecycle}}
and will eventually hit the <<<generate-sources>>> phase and see you have a plugin configured that
- wants to participate in that phase and the antlr plugin is executed with
+ wants to participate in that phase and the Antlr plugin is executed with
your given configuration.
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt Wed Mar 12 14:19:43 2008
@@ -212,6 +212,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>netbeans-freeform-maven-plugin</artifactId>
+ <version>2.0</version>
<configuration>
<additionalGoals>source:jar</additionalGoals>
</configuration>
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-manifest.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-manifest.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-manifest.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-manifest.apt Wed Mar 12 14:19:43 2008
@@ -21,6 +21,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
<configuration>
<archive>
<manifestEntries>
@@ -71,6 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
<configuration>
<archive>
<!--
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-releasing.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-releasing.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-releasing.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-releasing.apt Wed Mar 12 14:19:43 2008
@@ -88,6 +88,7 @@
...
<plugin>
<artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
<configuration>
...
<tagBase>
@@ -125,6 +126,7 @@
...
<plugin>
<artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
<configuration>
...
<tagBase>
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-site.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-site.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-site.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-site.apt Wed Mar 12 14:19:43 2008
@@ -210,6 +210,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
</plugin>
</plugins>
</reporting>
@@ -243,6 +244,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-6</version>
<configuration>
<locales>en,fr</locales>
</configuration>
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-using-ant.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-using-ant.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-using-ant.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-using-ant.apt Wed Mar 12 14:19:43 2008
@@ -22,6 +22,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -61,6 +62,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-using-modello.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-using-modello.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-using-modello.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-using-modello.apt Wed Mar 12 14:19:43 2008
@@ -41,6 +41,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
+ <version>1.0-alpha-18</version>
<executions>
<execution>
<goals>
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-using-one-source-directory.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-using-one-source-directory.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/mini/guide-using-one-source-directory.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-using-one-source-directory.apt Wed Mar 12 14:19:43 2008
@@ -120,6 +120,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<includes><include>**/core/**</include></includes>
</configuration>
Modified: maven/site/trunk/src/site/apt/guides/plugin/guide-ant-plugin-development.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/plugin/guide-ant-plugin-development.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/plugin/guide-ant-plugin-development.apt (original)
+++ maven/site/trunk/src/site/apt/guides/plugin/guide-ant-plugin-development.apt Wed Mar 12 14:19:43 2008
@@ -187,10 +187,9 @@
<plugin>
<!-- NOTE: We don't need groupId if the plugin's groupId is
org.apache.maven.plugins OR org.codehaus.mojo.
- We also don't have to specify a version, since Maven can
- automatically resolve the newest one.
-->
<artifactId>maven-plugin-plugin</artifactId>
+ <version>2.3</version>
<!-- Add the Ant plugin tools -->
<dependencies>
@@ -558,6 +557,7 @@
<plugin>
<groupId>org.myproject.plugins</groupId>
<artifactId>hello-plugin</artifactId>
+ <version>1.0</version>
<configuration>
<name>John</name>
Modified: maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt (original)
+++ maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt Wed Mar 12 14:19:43 2008
@@ -257,6 +257,7 @@
<plugin>
<groupId>sample.plugin</groupId>
<artifactId>maven-hello-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
<executions>
<execution>
<phase>compile</phase>
@@ -346,6 +347,7 @@
<plugin>
<groupId>sample.plugin</groupId>
<artifactId>maven-hello-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
<configuration>
<greeting>Welcome</greeting>
</configuration>
Modified: maven/site/trunk/src/site/apt/plugin-developers/plugin-testing.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugin-developers/plugin-testing.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/plugin-developers/plugin-testing.apt (original)
+++ maven/site/trunk/src/site/apt/plugin-developers/plugin-testing.apt Wed Mar 12 14:19:43 2008
@@ -305,6 +305,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.2</version>
<executions>
<execution>
<id>it-test</id>
@@ -418,6 +419,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.2</version>
<executions>
<execution>
<id>it-test</id>
Modified: maven/site/trunk/src/site/apt/pom.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/pom.apt?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/pom.apt (original)
+++ maven/site/trunk/src/site/apt/pom.apt Wed Mar 12 14:19:43 2008
@@ -780,7 +780,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
-
+ <version>1.1</version>
<executions>
<execution>
<id>echodir</id>
@@ -848,7 +848,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
<executions>
<execution>
<id>pre-process-classes</id>
@@ -985,6 +985,7 @@
<plugin>
<outputDirectory>${basedir}/target/site</outputDirectory>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
<reportSets>
<reportSet></reportSet>
</reportSets>
Modified: maven/site/trunk/src/site/fml/general.fml
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/fml/general.fml?rev=636513&r1=636512&r2=636513&view=diff
==============================================================================
--- maven/site/trunk/src/site/fml/general.fml (original)
+++ maven/site/trunk/src/site/fml/general.fml Wed Mar 12 14:19:43 2008
@@ -95,10 +95,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
</plugin>
</plugins>
...
@@ -232,6 +233,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-6</version>
<configuration>
<outputEncoding>UTF-8</outputEncoding>
</configuration>