Updated Branches: refs/heads/master fe5c0331b -> 67ecba8ab
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. Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/67ecba8a Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/67ecba8a Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/67ecba8a Branch: refs/heads/master Commit: 67ecba8ab9add07e623ae20f4b7078933d2914d3 Parents: fe5c033 Author: olivier lamy <ol...@apache.org> Authored: Sat Dec 22 00:28:08 2012 +0100 Committer: olivier lamy <ol...@apache.org> Committed: Sat Dec 22 00:28:08 2012 +0100 ---------------------------------------------------------------------- deploySite.sh | 2 +- pom.xml | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/67ecba8a/deploySite.sh ---------------------------------------------------------------------- diff --git a/deploySite.sh b/deploySite.sh index be6bc26..b6517a2 100644 --- a/deploySite.sh +++ b/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 $@ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/67ecba8a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c2ac28d..2cfff35 100644 --- a/pom.xml +++ b/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>