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/19 15:58:23 UTC
svn commit: r1374755 - in
/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src:
it/003-lifecycle/ it/005-site-lifecycle/
main/java/org/apache/maven/plugins/scmpublish/
main/resources/META-INF/plexus/ site/apt/
Author: hboutemy
Date: Sun Aug 19 13:58:22 2012
New Revision: 1374755
URL: http://svn.apache.org/viewvc?rev=1374755&view=rev
Log:
promote publish-scm goal at end over 2-phase prepare at beginning then publish at end
Added:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/invoker.properties (with props)
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/pom.xml (with props)
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/setup.bsh (with props)
Modified:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/003-lifecycle/pom.xml
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/resources/META-INF/plexus/components.xml
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/003-lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/003-lifecycle/pom.xml?rev=1374755&r1=1374754&r2=1374755&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/003-lifecycle/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/003-lifecycle/pom.xml Sun Aug 19 13:58:22 2012
@@ -42,9 +42,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
- <configuration>
- <stagingDirectory>target/scmpublish-checkout</stagingDirectory>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Added: 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=1374755&view=auto
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/invoker.properties (added)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/invoker.properties Sun Aug 19 13:58:22 2012
@@ -0,0 +1 @@
+invoker.goals = site site:stage scm-publish:publish-scm
Propchange: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/invoker.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: 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=1374755&view=auto
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/pom.xml (added)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/pom.xml Sun Aug 19 13:58:22 2012
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin-005-site-lifecycle</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>maven-scm-publish-plugin-004-005-site-lifecycle</name>
+ <url>http://people.apache.org/~bimargulies/site-test</url>
+
+ <distributionManagement>
+ <site>
+ <id>perform-002</id>
+ <url>file:target/dummy</url>
+ </site>
+ </distributionManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>stage-for-scm-publish</id>
+ <phase>post-site</phase>
+ <goals>
+ <goal>stage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>@pom.version@</version>
+ <configuration>
+ <pubScmUrl>scm:svn:file://${basedir}/target/svn-root</pubScmUrl>
+ </configuration>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <phase>site-deploy</phase>
+ <goals>
+ <goal>scm-publish</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ <configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/setup.bsh
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/setup.bsh?rev=1374755&view=auto
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/setup.bsh (added)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/setup.bsh Sun Aug 19 13:58:22 2012
@@ -0,0 +1,6 @@
+import java.io.*;
+import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
+
+SvnScmTestUtils.initializeRepository( new File( basedir, "target/svn-root" ) );
+
+return true;
\ No newline at end of file
Propchange: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/setup.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/it/005-site-lifecycle/setup.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java?rev=1374755&r1=1374754&r2=1374755&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java Sun Aug 19 13:58:22 2012
@@ -51,6 +51,7 @@ import org.apache.maven.scm.command.remo
* @goal publish
* @phase post-site
* @aggregate
+ * @deprecated superseded by publish-scm which does the same in on step only and has more features
*/
public class ScmPublishPublishMojo
extends AbstractScmPublishMojo
Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1374755&r1=1374754&r2=1374755&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/resources/META-INF/plexus/components.xml Sun Aug 19 13:58:22 2012
@@ -28,7 +28,6 @@
<configuration>
<phases>
<scmpublish-prepare>
- org.apache.maven.plugins:maven-site-scm-publish-plugin:${project.version}:prepare
</scmpublish-prepare>
<scmpublish-site>
org.apache.maven.plugins:maven-site-plugin:3.1:site
@@ -37,7 +36,7 @@
org.apache.maven.plugins:maven-site-plugin:3.1:stage
</scmpublish-post-site>
<scmpublish-publish>
- org.apache.maven.plugins:maven-site-scm-publish-plugin:${project.version}:publish
+ org.apache.maven.plugins:maven-site-scm-publish-plugin:${project.version}:publish-scm
</scmpublish-publish>
</phases>
</configuration>
@@ -56,7 +55,6 @@
</phases>
<default-phases>
<scmpublish-prepare>
- org.apache.maven.plugins:maven-site-scm-publish-plugin:${project.version}:prepare
</scmpublish-prepare>
<scmpublish-site>
org.apache.maven.plugins:maven-site-plugin:3.1:site
@@ -65,7 +63,7 @@
org.apache.maven.plugins:maven-site-plugin:3.1:stage
</scmpublish-post-site>
<scmpublish-publish>
- org.apache.maven.plugins:maven-site-scm-publish-plugin:${project.version}:publish
+ org.apache.maven.plugins:maven-site-scm-publish-plugin:${project.version}:publish-scm
</scmpublish-publish>
</default-phases>
</configuration>
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=1374755&r1=1374754&r2=1374755&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 19 13:58:22 2012
@@ -57,7 +57,7 @@ Usage
With a little configuration in your POM,
+---------+
- mvn maven-scm-publish:scmpublish
+ mvn scm-publish:scmpublish
+---------+
will do all the work.
@@ -68,13 +68,6 @@ Usage
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <stagingDirectory>target/scmpublish-checkout</stagingDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>@pom.version@</version>
<extensions>true</extensions>
@@ -98,18 +91,6 @@ Usage
+-----+
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <stagingDirectory>target/scmpublish-checkout</stagingDirectory>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -133,17 +114,10 @@ Usage
</configuration>
<executions>
<execution>
- <id>prepare</id>
- <phase>pre-site</phase>
- <goals>
- <goal>prepare</goal>
- </goals>
- </execution>
- <execution>
- <id>perform</id>
+ <id>scm-publish</id>
<phase>site-deploy</phase>
<goals>
- <goal>publish</goal>
+ <goal>publish-scm</goal>
</goals>
</execution>
</executions>