Author: dennisl
Date: Mon Nov 8 10:00:58 2010
New Revision: 1032512
URL: http://svn.apache.org/viewvc?rev=1032512&view=rev
Log:
o Replace all references to 2.2-beta-6 with 2.2
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1032512&r1=1032511&r2=1032512&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
Mon Nov 8 10:00:58 2010
@@ -83,7 +83,7 @@ public class AssemblyProxyArchiver
private final String assemblyWorkPath;
/**
- * @since 2.2-beta-6
+ * @since 2.2
*/
private boolean useJvmChmod;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1032512&r1=1032511&r2=1032512&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Mon Nov 8 10:00:58 2010
@@ -327,7 +327,7 @@ public abstract class AbstractAssemblyMo
* This will cause the assembly to only update an existing archive, if it
exists.
*
* @parameter expression="${assembly.updatOnly}" default-value="false"
- * @since 2.2-beta-6
+ * @since 2.2
*/
private boolean updateOnly;
@@ -337,7 +337,7 @@ public abstract class AbstractAssemblyMo
* </p>
*
* @parameter expression="${assembly.useJvmChmod}" default-value="false"
- * @since 2.2-beta-6
+ * @since 2.2
*/
private boolean useJvmChmod;
@@ -352,7 +352,7 @@ public abstract class AbstractAssemblyMo
* </p>
*
* @parameter expression="${assembly.ignorePermissions}"
default-value="false"
- * @since 2.2-beta-6
+ * @since 2.2
*/
private boolean ignorePermissions;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?rev=1032512&r1=1032511&r2=1032512&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Mon
Nov 8 10:00:58 2010
@@ -595,7 +595,7 @@
<description>
If set to true, the plugin will include all projects in the current
reactor for processing
in this ModuleSet. These will be subject to include/exclude rules.
- Default value is true. (Since 2.2-beta-6)
+ Default value is true. (Since 2.2)
</description>
</field>
<field>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=1032512&r1=1032511&r2=1032512&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Mon
Nov 8 10:00:58 2010
@@ -698,7 +698,7 @@
<description>
If set to true, the plugin will include all projects in the current
reactor for processing
in this ModuleSet. These will be subject to include/exclude rules.
- Default value is true. (Since 2.2-beta-6)
+ Default value is true. (Since 2.2)
</description>
</field>
<field>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt?rev=1032512&r1=1032511&r2=1032512&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt Mon Nov 8
10:00:58 2010
@@ -129,7 +129,7 @@ The Maven Assembly Plugin
* Assembly Descriptor Schemas (XSD)
- *
{{{http://maven.apache.org/xsd/assembly-1.1.1.xsd}http://maven.apache.org/xsd/assembly-1.1.2.xsd}}
(for version 2.2-beta-6 and higher)
+ *
{{{http://maven.apache.org/xsd/assembly-1.1.1.xsd}http://maven.apache.org/xsd/assembly-1.1.2.xsd}}
(for version 2.2 and higher)
*
{{{http://maven.apache.org/xsd/assembly-1.1.1.xsd}http://maven.apache.org/xsd/assembly-1.1.1.xsd}}
(for version 2.2-beta-5 and lower)
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml?rev=1032512&r1=1032511&r2=1032512&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml Mon Nov 8
10:00:58 2010
@@ -95,7 +95,7 @@ under the License.
in your assembly-child POM (normally to the <code>package</code>
phase) using the <code>single</code> goal. When you execute the build from the
top-level POM,
Maven should generated your assembly in the new child project.
</p>
- <p><b>NOTE:</b> The useAllReactorProjects flag is only available in
version 2.2-beta-6 and higher.</p>
+ <p><b>NOTE:</b> The useAllReactorProjects flag is only available in
version 2.2 and higher.</p>
</answer>
</faq>
</part>
