You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2015/12/23 10:43:57 UTC
svn commit: r1721512 - in /axis/axis2/java/rampart/trunk: ./ apidocs/
code-coverage/ modules/distribution/ modules/rampart-core/
modules/rampart-integration/ modules/rampart-mar/ modules/rampart-policy/
modules/rampart-samples/ modules/rampart-tests/ m...
Author: veithen
Date: Wed Dec 23 09:43:57 2015
New Revision: 1721512
URL: http://svn.apache.org/viewvc?rev=1721512&view=rev
Log:
Automatically skip site:site/site:stage and bind site:stage to the site-deploy phase.
Modified:
axis/axis2/java/rampart/trunk/apidocs/pom.xml
axis/axis2/java/rampart/trunk/code-coverage/pom.xml
axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/apidocs/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/apidocs/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/apidocs/pom.xml Wed Dec 23 09:43:57 2015
@@ -112,21 +112,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>default-site</id>
- <phase>site</phase>
- <goals>
- <goal>site</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
Modified: axis/axis2/java/rampart/trunk/code-coverage/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/code-coverage/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/code-coverage/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/code-coverage/pom.xml Wed Dec 23 09:43:57 2015
@@ -175,12 +175,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/pom.xml Wed Dec 23 09:43:57 2015
@@ -95,12 +95,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml Wed Dec 23 09:43:57 2015
@@ -44,12 +44,6 @@
<target>1.5</target>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Wed Dec 23 09:43:57 2015
@@ -484,12 +484,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Wed Dec 23 09:43:57 2015
@@ -74,12 +74,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml Wed Dec 23 09:43:57 2015
@@ -44,12 +44,6 @@
<target>1.5</target>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml Wed Dec 23 09:43:57 2015
@@ -86,12 +86,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml Wed Dec 23 09:43:57 2015
@@ -61,12 +61,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml Wed Dec 23 09:43:57 2015
@@ -54,12 +54,6 @@
<moduleXmlFile>module.xml</moduleXmlFile>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml Wed Dec 23 09:43:57 2015
@@ -52,12 +52,6 @@
</includes>
</configuration-->
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1721512&r1=1721511&r2=1721512&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Wed Dec 23 09:43:57 2015
@@ -255,6 +255,21 @@
import java.text.MessageFormat
project.properties['release_date'] = MessageFormat.format("{0,date,MMMMM dd, yyyy}", new Date())
project.properties['release_version'] = project.version.replaceAll("-SNAPSHOT", "")
+ project.properties['skipSiteSite'] = String.valueOf(!new File(project.basedir, 'src/site/site.xml').exists())
+ </script>
+ </scripts>
+ </configuration>
+ </execution>
+ <execution>
+ <id>check-site</id>
+ <phase>post-site</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <scripts>
+ <script>
+ project.properties['skipSiteStage'] = String.valueOf(!new File(project.reporting.outputDirectory).exists())
</script>
</scripts>
</configuration>
@@ -353,6 +368,35 @@
</plugin>
<plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-site</id>
+ <phase>site</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ <configuration>
+ <skip>${skipSiteSite}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>site-stage</id>
+ <phase>site-deploy</phase>
+ <goals>
+ <goal>stage</goal>
+ </goals>
+ <configuration>
+ <skip>${skipSiteStage}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <!-- Don't deploy; we use maven-scm-publish-plugin -->
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.0-beta-2</version>