Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fix site deploy for svnpubsub

using site:stage with ${project.artifactId}-archives/${project.artifactId}-${project.version}
will expand values in addition of parent so sucks for multi modules projects.
  • Loading branch information...
commit 67ecba8ab9add07e623ae20f4b7078933d2914d3 1 parent fe5c033
@olamy olamy authored
Showing with 16 additions and 5 deletions.
  1. +1 −1  deploySite.sh
  2. +15 −4 pom.xml
View
2  deploySite.sh
@@ -19,4 +19,4 @@
# under the License.
#
-mvn clean site site:stage scm-publish:publish-scm $@
+mvn clean site-deploy scm-publish:publish-scm $@
View
19 pom.xml
@@ -114,14 +114,19 @@
<mavenVersion>2.0.9</mavenVersion>
<shadedVersion>2.12.4</shadedVersion>
<mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
+
+
<maven.site.cache>${user.home}/maven-sites</maven.site.cache>
- <maven.site.path>${project.artifactId}-archives/${project.artifactId}-${project.version}</maven.site.path>
+ <maven.surefire.siteFilePath>${maven.site.cache}/surefire-${project.version}</maven.surefire.siteFilePath>
+ <maven.surefire.siteUrlDeployment>file://${maven.surefire.siteFilePath}</maven.surefire.siteUrlDeployment>
+ <maven.surefire.scmPubCheckoutDirectory>${maven.site.cache}/maven-surefire-site-content-${project.version}</maven.surefire.scmPubCheckoutDirectory>
+ <maven.surefire.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/surefire-archives/maven-surefire-${project.version}</maven.surefire.scmPubUrl>
</properties>
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
+ <url>${maven.surefire.siteUrlDeployment}</url>
</site>
</distributionManagement>
@@ -302,7 +307,10 @@
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.0-beta-2</version>
<configuration>
- <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
+ <checkoutDirectory>${maven.surefire.scmPubCheckoutDirectory}</checkoutDirectory>
+ <pubScmUrl>scm:svn:${maven.surefire.scmPubUrl}</pubScmUrl>
+ <checkinComment>Apache Maven Surefire site deployment</checkinComment>
+ <content>${maven.surefire.siteFilePath}</content>
<tryUpdate>true</tryUpdate>
</configuration>
</plugin>
@@ -425,7 +433,10 @@
<profile>
<id>site-release</id>
<properties>
- <maven.site.path>${project.artifactId}</maven.site.path>
+ <maven.surefire.siteFilePath>${maven.site.cache}/surefire</maven.surefire.siteFilePath>
+ <maven.surefire.siteUrlDeployment>file://${maven.surefire.siteFilePath}</maven.surefire.siteUrlDeployment>
+ <maven.surefire.scmPubCheckoutDirectory>${maven.site.cache}/maven-surefire-site-content</maven.surefire.scmPubCheckoutDirectory>
+ <maven.surefire.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/surefire</maven.surefire.scmPubUrl>
</properties>
</profile>
</profiles>
Please sign in to comment.
Something went wrong with that request. Please try again.