Author: dennisl Date: Mon Jul 21 09:25:19 2008 New Revision: 678459 URL: http://svn.apache.org/viewvc?rev=678459&view=rev Log: o Make sure that the documentation always has up-to-date <version> elements in POM snippets in the documentation. o Fix headings. o Fix typos.
Added: maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm (contents, props changed) - copied, changed from r678455, maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt.vm - copied, changed from r678455, maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt Removed: maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml maven/plugins/trunk/maven-shade-plugin/src/site/apt/index.apt Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=678459&r1=678458&r2=678459&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Mon Jul 21 09:25:19 2008 @@ -122,4 +122,8 @@ </plugin> </plugins> </build> + + <properties> + <currentVersion>${project.version}</currentVersion> + </properties> </project> Copied: maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm (from r678455, maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm?p2=maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm&p1=maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt&r1=678455&r2=678459&rev=678459&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt (original) +++ maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm Mon Jul 21 09:25:19 2008 @@ -1,8 +1,10 @@ ------ - Maven 2 Shade Plugin + Examples ------ Mauro Talevi ------ + 2008-07-21 + ------ ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file @@ -21,7 +23,9 @@ ~~ specific language governing permissions and limitations ~~ under the License. - * Shade Plugin with no relocation +Examples + +* Shade Plugin with no relocation +----- <project> @@ -31,6 +35,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> + <version>${currentVersion}</version> <executions> <execution> <phase>package</phase> @@ -59,7 +64,7 @@ </project> +----- - * Shade Plugin with shaded relocation +* Shade Plugin with shaded relocation +----- <project> @@ -69,6 +74,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> + <version>${currentVersion}</version> <executions> <execution> <phase>package</phase> @@ -107,7 +113,7 @@ </project> +----- - * Shade Plugin with renamed but unattached artifact +* Shade Plugin with renamed but unattached artifact +----- <project> @@ -117,6 +123,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> + <version>${currentVersion}</version> <executions> <execution> <phase>package</phase> @@ -155,7 +162,7 @@ </project> +----- - * Shade Plugin with renamed and attached artifact +* Shade Plugin with renamed and attached artifact +----- <project> @@ -165,6 +172,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> + <version>${currentVersion}</version> <executions> <execution> <phase>package</phase> @@ -205,7 +213,7 @@ </project> +----- - * Shade Plugin with artifact filtering using includes +* Shade Plugin with artifact filtering using includes +----- <project> @@ -215,6 +223,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> + <version>${currentVersion}</version> <executions> <execution> <phase>package</phase> @@ -241,7 +250,7 @@ </project> +----- - * Shade Plugin with artifact filtering using includes and excludes +* Shade Plugin with artifact filtering using includes and excludes +----- <project> @@ -251,6 +260,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> + <version>${currentVersion}</version> <executions> <execution> <phase>package</phase> @@ -281,7 +291,7 @@ </project> +----- - * Shade Plugin with artifact filtering using excludes only +* Shade Plugin with artifact filtering using excludes only +----- <project> @@ -291,6 +301,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> + <version>${currentVersion}</version> <executions> <execution> <phase>package</phase> @@ -320,7 +331,7 @@ </project> +----- - * Shade Plugin with where a Main-Class is added to the MANIFEST.MF +* Shade Plugin with where a Main-Class is added to the MANIFEST.MF +----- <project> @@ -330,7 +341,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>1.2</version> + <version>${currentVersion}</version> <executions> <execution> <phase>package</phase> @@ -354,7 +365,7 @@ </project> +----- - * Shade Plugin with where a set of arbitrary attributes are added to the MANIFEST.MF +* Shade Plugin with where a set of arbitrary attributes are added to the MANIFEST.MF +----- <project> @@ -364,7 +375,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>1.2</version> + <version>${currentVersion}</version> <executions> <execution> <phase>package</phase> Propchange: maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/plugins/trunk/maven-shade-plugin/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/apt/index.apt?rev=678459&r1=678458&r2=678459&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/site/apt/index.apt (original) +++ maven/plugins/trunk/maven-shade-plugin/src/site/apt/index.apt Mon Jul 21 09:25:19 2008 @@ -3,6 +3,8 @@ ------ Mauro Talevi ------ + 2008-07-21 + ------ ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file @@ -23,7 +25,7 @@ Maven 2 Shade Plugin - This plugin provides the capability to package the artifact in a uber-jar, including its dependencies and + This plugin provides the capability to package the artifact in an uber-jar, including its dependencies and to <shade> - i.e. rename - the packages of some of the dependencies. * Goals Overview @@ -41,5 +43,5 @@ * Examples To provide you with better understanding on some usages of the Shade - Plugin, you can take a look {{{examples.html}examples}} page. + Plugin, you can take a look at the {{{examples.html}examples}} page. Copied: maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt.vm (from r678455, maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt.vm?p2=maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt.vm&p1=maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt&r1=678455&r2=678459&rev=678459&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-shade-plugin/src/site/apt/usage.apt.vm Mon Jul 21 09:25:19 2008 @@ -3,6 +3,8 @@ ------ Mauro Talevi ------ + 2008-07-21 + ------ ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file @@ -42,7 +44,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>1.0.1</version> + <version>${currentVersion}</version> <configuration> <!-- put your configurations here --> </configuration>