o Updated site
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@892666 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 60121b4..5c88887 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.0</version>
+ <version>2.3</version>
<configuration>
<!-- For JIRA-report -->
<columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix Version</columnNames>
diff --git a/src/site/apt/examples/deploy-ftp.apt b/src/site/apt/examples/deploy-ftp.apt
index 75adb35..e7654b3 100644
--- a/src/site/apt/examples/deploy-ftp.apt
+++ b/src/site/apt/examples/deploy-ftp.apt
@@ -34,45 +34,25 @@
+----+
<project>
- <parent>
- <groupId>com.stchome</groupId>
- <artifactId>mavenFull</artifactId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.mycompany</groupId>
- <artifactId>my-app</artifactId>
- <packaging>jar</packaging>
- <version>1.1-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <!-- Enabling the use of FTP -->
+ ...
<distributionManagement>
<repository>
- <id>ftp-repository</id>
- <url>ftp://repository.mycompany.com/repository</url>
+ <id>ftp-repository</id>
+ <url>ftp://repository.mycompany.com/repository</url>
</repository>
</distributionManagement>
<build>
<extensions>
+ <!-- Enabling the use of FTP -->
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
- <version>1.0-alpha-6</version>
+ <version>1.0-beta-6</version>
</extension>
</extensions>
</build>
-
+ ...
</project>
+----+
@@ -81,20 +61,15 @@
+----+
<settings>
-
...
-
<servers>
<server>
<id>ftp-repository</id>
<username>user</username>
<password>pass</password>
</server>
-
</servers>
-
...
-
</settings>
+----+
@@ -104,4 +79,4 @@
+----+
mvn deploy
-+----+
\ No newline at end of file
++----+
diff --git a/src/site/apt/examples/deploy-ssh-external.apt b/src/site/apt/examples/deploy-ssh-external.apt
index dba8435..65f3f45 100644
--- a/src/site/apt/examples/deploy-ssh-external.apt
+++ b/src/site/apt/examples/deploy-ssh-external.apt
@@ -35,28 +35,7 @@
+----+
<project>
- <parent>
- <groupId>com.stchome</groupId>
- <artifactId>mavenFull</artifactId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.mycompany</groupId>
- <artifactId>my-app</artifactId>
- <packaging>jar</packaging>
- <version>1.1-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <!-- Enabling the use of FTP -->
+ ...
<distributionManagement>
<repository>
<id>ssh-repository</id>
@@ -66,14 +45,15 @@
<build>
<extensions>
+ <!-- Enabling the use of FTP -->
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
- <version>1.0-alpha-5</version>
+ <version>1.0-beta-6</version>
</extension>
</extensions>
</build>
-
+ ..
</project>
+----+
@@ -108,9 +88,7 @@
using Maven:
+----+
-
mvn deploy
-
+----+
Sometimes you may have permissions problems deploying and if so you can set the file and directory permissions
@@ -143,4 +121,5 @@
<<NOTE:>> If you are using Putty it will expect the private key to be in the <<<PPK>>> format and not the standard
format so make sure you use <<<puttygen>>> to convert your openssh format key to <<<PPK>>> format or generate another
- one. Windows users can find the Putty tools {{{http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html}here}}.
+ one. Windows users can find the Putty tools on the
+ {{{http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html}PuTTY Download Page}}.
diff --git a/src/site/apt/examples/deploying-in-legacy-layout.apt b/src/site/apt/examples/deploying-in-legacy-layout.apt
index 58c4b05..46b86dd 100644
--- a/src/site/apt/examples/deploying-in-legacy-layout.apt
+++ b/src/site/apt/examples/deploying-in-legacy-layout.apt
@@ -54,7 +54,7 @@
of repository, set the <<repositoryLayout>> parameter to <<<legacy>>> value.
+---+
-mvn deploy:deploy-file -Durl=file://C:\m2-repo \
+mvn deploy:deploy-file -Durl=file:///C:/m2-repo \
-DrepositoryId=some.id \
-Dfile=your-artifact-1.0.jar \
-DpomFile=your-pom.xml \
diff --git a/src/site/apt/examples/deploying-with-classifiers.apt b/src/site/apt/examples/deploying-with-classifiers.apt
index c966cdd..b1fb5ce 100644
--- a/src/site/apt/examples/deploying-with-classifiers.apt
+++ b/src/site/apt/examples/deploying-with-classifiers.apt
@@ -49,7 +49,7 @@
To add classifier into your artifact for your deployment, set the text to the <<classifier>> parameter.
+---+
-mvn deploy:deploy-file -Durl=file://C:\m2-repo \
+mvn deploy:deploy-file -Durl=file:///C:/m2-repo \
-DrepositoryId=some.id \
-Dfile=path-to-your-artifact-jar \
-DpomFile=path-to-your-pom.xml \
diff --git a/src/site/apt/examples/deploying-with-customed-pom.apt b/src/site/apt/examples/deploying-with-customed-pom.apt
index 024fdc8..61d004e 100644
--- a/src/site/apt/examples/deploying-with-customed-pom.apt
+++ b/src/site/apt/examples/deploying-with-customed-pom.apt
@@ -32,7 +32,7 @@
set the <<pomFile>> parameter to the path of the pom.xml.
+---+
-mvn deploy:deploy-file -Durl=file://C:\m2-repo \
+mvn deploy:deploy-file -Durl=file:///C:/m2-repo \
-DrepositoryId=some.id \
-Dfile=path-to-your-artifact-jar \
-DpomFile=path-to-your-pom.xml
diff --git a/src/site/apt/examples/disabling-generic-pom.apt b/src/site/apt/examples/disabling-generic-pom.apt
index 44d2d5d..cd1f6a7 100644
--- a/src/site/apt/examples/disabling-generic-pom.apt
+++ b/src/site/apt/examples/disabling-generic-pom.apt
@@ -33,7 +33,7 @@
<<generatePom>> parameter to <<<false>>>.
+---+
-mvn deploy:deploy-file -Durl=file://C:\m2-repo \
+mvn deploy:deploy-file -Durl=file:///C:/m2-repo \
-DrepositoryId=some.id \
-Dfile=path-to-your-artifact-jar \
-DgroupId=your.groupId \
diff --git a/src/site/apt/examples/disabling-timestamps-suffix.apt b/src/site/apt/examples/disabling-timestamps-suffix.apt
index 706f8eb..5a15b85 100644
--- a/src/site/apt/examples/disabling-timestamps-suffix.apt
+++ b/src/site/apt/examples/disabling-timestamps-suffix.apt
@@ -32,7 +32,7 @@
To disable the addition of timestamp to the artifact, set the <<uniqueVersion>> parameter to <<<false>>>.
+---+
-mvn deploy:deploy-file -Durl=file://C:\m2-repo \
+mvn deploy:deploy-file -Durl=file:///C:/m2-repo \
-DrepositoryId=some.id \
-Dfile=your-artifact-1.0.jar \
-DpomFile=your-pom.xml \
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index 03ad5e0..3538972 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -43,6 +43,10 @@
Maven 2 installation.
</p>
<p>
+ As an alternative to placing the wagon provider into the Maven distribution, you can also create a dummy
+ POM that declares the required wagon as an <code><extension></code> inside the current directory.
+ </p>
+ <p>
If the error description is something like this:
</p>
<p>
@@ -60,7 +64,7 @@
<question>I don't want to deploy one of the artifacts in my multi-module build. Can I skip deployment?</question>
<answer>
<p>
- Yes, you can skip deployment of individual modules by configuring the deploy plugin as follows:
+ Yes, you can skip deployment of individual modules by configuring the Deploy Plugin as follows:
</p>
<p>
<source>
diff --git a/src/site/site.xml b/src/site/site.xml
index 1927716..e467eda 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -22,7 +22,7 @@
<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd"
- name="Maven Deploy plugin">
+ name="Maven Deploy Plugin">
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
