You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/08/26 22:47:16 UTC
svn commit: r1377515 - in
/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src:
it/002-perform/pom.xml it/005-site-lifecycle/invoker.properties
it/005-site-lifecycle/pom.xml site/apt/index.apt site/apt/usage.apt.vm
Author: hboutemy
Date: Sun Aug 26 20:47:16 2012
New Revision: 1377515
URL: http://svn.apache.org/viewvc?rev=1377515&view=rev
Log:
skip m-site-p:deploy in site-deploy phase to avoid collision with scm-publish:publish-scm
Modified:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/002-perform/pom.xml
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/invoker.properties
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/pom.xml
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/site/apt/index.apt
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/site/apt/usage.apt.vm
Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/002-perform/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/002-perform/pom.xml?rev=1377515&r1=1377514&r2=1377515&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/002-perform/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/002-perform/pom.xml Sun Aug 26 20:47:16 2012
@@ -43,6 +43,7 @@
<version>3.0</version>
<configuration>
<stagingDirectory>target/scmpublish-checkout</stagingDirectory>
+ <skipDeploy>true</skipDeploy>
</configuration>
</plugin>
</plugins>
Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/invoker.properties
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/invoker.properties?rev=1377515&r1=1377514&r2=1377515&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/invoker.properties (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/invoker.properties Sun Aug 26 20:47:16 2012
@@ -1 +1 @@
-invoker.goals = site site:stage scm-publish:publish-scm
+invoker.goals = site-deploy
Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/pom.xml?rev=1377515&r1=1377514&r2=1377515&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/pom.xml Sun Aug 26 20:47:16 2012
@@ -41,6 +41,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -75,7 +78,7 @@
<id>scm-publish</id>
<phase>site-deploy</phase>
<goals>
- <goal>scm-publish</goal>
+ <goal>publish-scm</goal>
</goals>
</execution>
</executions>
Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/site/apt/index.apt?rev=1377515&r1=1377514&r2=1377515&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/site/apt/index.apt (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/site/apt/index.apt Sun Aug 26 20:47:16 2012
@@ -79,7 +79,7 @@ mvn scm-publish:publish-scm -Dscmpublish
Known Limitations
- There are 3 known limitations:
+ There are 2 known limitations:
* <<the plugin doesn't create the initial SCM directory>>, it just updates content from an
existing SCM directory. Then you need to manually create the empty directory first
@@ -90,10 +90,6 @@ Known Limitations
its content to the same directory (like Surefire or Enforcer, which have a
base directory and one plugin in <<</plugins/>>>), this staging area can't be simply imported,
- * site is deployed by maven-site-plugin to distributionManagement.site.url in parallel to
- scm-publish publication, then you need to configure a fake file url to your pom to avoid
- collision between the 2 plugins.
-
[]
Future Dreams
Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/site/apt/usage.apt.vm
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/site/apt/usage.apt.vm?rev=1377515&r1=1377514&r2=1377515&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/site/apt/usage.apt.vm Sun Aug 26 20:47:16 2012
@@ -85,12 +85,29 @@ Usage
* Using the Site Lifecycle
- The alternative is to attach the necessary activities to the site lifecycle. This requires more
- XML in the POM, but it may be easier to use if you already customize the site lifecycle
- for other reasons.
+ The alternative is to attach the necessary activities to the site lifecycle and deactivate
+ maven-site-plugin's site deploy goal. This requires more XML in the POM, but it may be easier
+ to use if you already customize the site lifecycle for other reasons.
+-----+
+ <distributionManagement>
+ <site>
+ <id>site</id>
+ <url>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/bimargulies/site-test</url>
+ </site>
+ </distributionManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -109,9 +126,6 @@ Usage
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>@pom.version@</version>
- <configuration>
- <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/bimargulies/site-test</pubScmUrl>
- </configuration>
<executions>
<execution>
<id>scm-publish</id>